colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform/trivial: fix name of enum value OBJECT_TYPE_UNKNOWN

Browse Source 
Fixes: 518cf76de7
This commit is contained in:
Thomas Haller
2015-06-24 15:29:01 +02:00
parent b6061b3cd5
commit 7bd3b0b304
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nm-types.h
View File

@@ -121,14 +121,14 @@ typedef enum {
} NMLinkType; } NMLinkType;
typedef enum { typedef enum {
OBJECT_TYPE_UNKNOWN, NMP_OBJECT_TYPE_UNKNOWN,
NMP_OBJECT_TYPE_LINK, NMP_OBJECT_TYPE_LINK,
NMP_OBJECT_TYPE_IP4_ADDRESS, NMP_OBJECT_TYPE_IP4_ADDRESS,
NMP_OBJECT_TYPE_IP6_ADDRESS, NMP_OBJECT_TYPE_IP6_ADDRESS,
NMP_OBJECT_TYPE_IP4_ROUTE, NMP_OBJECT_TYPE_IP4_ROUTE,
NMP_OBJECT_TYPE_IP6_ROUTE, NMP_OBJECT_TYPE_IP6_ROUTE,
__OBJECT_TYPE_LAST, __NMP_OBJECT_TYPE_LAST,
OBJECT_TYPE_MAX = __OBJECT_TYPE_LAST - 1, NMP_OBJECT_TYPE_MAX = __NMP_OBJECT_TYPE_LAST - 1,
} NMPObjectType; } NMPObjectType;
/* settings */ /* settings */

10
src/platform/nm-linux-platform.c
View File

@@ -764,7 +764,7 @@ _nlo_get_object_type (const struct nl_object *object)
const char *type_str; const char *type_str;
if (!object || !(type_str = nl_object_get_type (object))) if (!object || !(type_str = nl_object_get_type (object)))
return OBJECT_TYPE_UNKNOWN; return NMP_OBJECT_TYPE_UNKNOWN;
if (!strcmp (type_str, "route/link")) if (!strcmp (type_str, "route/link"))
return NMP_OBJECT_TYPE_LINK; return NMP_OBJECT_TYPE_LINK;
@@ -775,7 +775,7 @@ _nlo_get_object_type (const struct nl_object *object)
case AF_INET6: case AF_INET6:
return NMP_OBJECT_TYPE_IP6_ADDRESS; return NMP_OBJECT_TYPE_IP6_ADDRESS;
default: default:
return OBJECT_TYPE_UNKNOWN; return NMP_OBJECT_TYPE_UNKNOWN;
} }
} else if (!strcmp (type_str, "route/route")) { } else if (!strcmp (type_str, "route/route")) {
switch (rtnl_route_get_family ((struct rtnl_route *) object)) { switch (rtnl_route_get_family ((struct rtnl_route *) object)) {
@@ -784,10 +784,10 @@ _nlo_get_object_type (const struct nl_object *object)
case AF_INET6: case AF_INET6:
return NMP_OBJECT_TYPE_IP6_ROUTE; return NMP_OBJECT_TYPE_IP6_ROUTE;
default: default:
return OBJECT_TYPE_UNKNOWN; return NMP_OBJECT_TYPE_UNKNOWN;
} }
} else } else
return OBJECT_TYPE_UNKNOWN; return NMP_OBJECT_TYPE_UNKNOWN;
} }
/******************************************************************/ /******************************************************************/
@@ -1449,7 +1449,7 @@ delayed_action_refresh_to_object_type (DelayedActionType action_type)
case DELAYED_ACTION_TYPE_REFRESH_ALL_IP6_ADDRESSES: return NMP_OBJECT_TYPE_IP6_ADDRESS; case DELAYED_ACTION_TYPE_REFRESH_ALL_IP6_ADDRESSES: return NMP_OBJECT_TYPE_IP6_ADDRESS;
case DELAYED_ACTION_TYPE_REFRESH_ALL_IP4_ROUTES: return NMP_OBJECT_TYPE_IP4_ROUTE; case DELAYED_ACTION_TYPE_REFRESH_ALL_IP4_ROUTES: return NMP_OBJECT_TYPE_IP4_ROUTE;
case DELAYED_ACTION_TYPE_REFRESH_ALL_IP6_ROUTES: return NMP_OBJECT_TYPE_IP6_ROUTE; case DELAYED_ACTION_TYPE_REFRESH_ALL_IP6_ROUTES: return NMP_OBJECT_TYPE_IP6_ROUTE;
default: g_return_val_if_reached (OBJECT_TYPE_UNKNOWN); default: g_return_val_if_reached (NMP_OBJECT_TYPE_UNKNOWN);
} }
} }

6
src/platform/nmp-object.c
View File

@@ -180,7 +180,7 @@ _nmp_object_fixup_link_master_connected (NMPObject *obj, const NMPCache *cache)
const NMPClass * const NMPClass *
nmp_class_from_type (NMPObjectType obj_type) nmp_class_from_type (NMPObjectType obj_type)
{ {
g_return_val_if_fail (obj_type > OBJECT_TYPE_UNKNOWN && obj_type <= OBJECT_TYPE_MAX, NULL); g_return_val_if_fail (obj_type > NMP_OBJECT_TYPE_UNKNOWN && obj_type <= NMP_OBJECT_TYPE_MAX, NULL);
return &_nmp_classes[obj_type - 1]; return &_nmp_classes[obj_type - 1];
} }
@@ -811,7 +811,7 @@ nmp_object_from_nl (NMPlatform *platform, const struct nl_object *nlo, gboolean
NMPObjectType obj_type = _nlo_get_object_type (nlo); NMPObjectType obj_type = _nlo_get_object_type (nlo);
NMPObject *obj; NMPObject *obj;
if (obj_type == OBJECT_TYPE_UNKNOWN) if (obj_type == NMP_OBJECT_TYPE_UNKNOWN)
return NULL; return NULL;
obj = nmp_object_new (obj_type, NULL); obj = nmp_object_new (obj_type, NULL);
@@ -1798,7 +1798,7 @@ ASSERT_nmp_cache_is_consistent (const NMPCache *cache)
} }
/******************************************************************/ /******************************************************************/
const NMPClass _nmp_classes[OBJECT_TYPE_MAX] = { const NMPClass _nmp_classes[NMP_OBJECT_TYPE_MAX] = {
[NMP_OBJECT_TYPE_LINK - 1] = { [NMP_OBJECT_TYPE_LINK - 1] = {
.obj_type = NMP_OBJECT_TYPE_LINK, .obj_type = NMP_OBJECT_TYPE_LINK,
.sizeof_data = sizeof (NMPObjectLink), .sizeof_data = sizeof (NMPObjectLink),

4
src/platform/nmp-object.h
View File

@@ -142,7 +142,7 @@ typedef struct {
int (*cmd_plobj_cmp) (const NMPlatformObject *obj1, const NMPlatformObject *obj2); int (*cmd_plobj_cmp) (const NMPlatformObject *obj1, const NMPlatformObject *obj2);
} NMPClass; } NMPClass;
extern const NMPClass _nmp_classes[OBJECT_TYPE_MAX]; extern const NMPClass _nmp_classes[NMP_OBJECT_TYPE_MAX];
typedef struct { typedef struct {
NMPlatformLink _public; NMPlatformLink _public;
@@ -254,7 +254,7 @@ NMP_OBJECT_GET_TYPE (const NMPObject *obj)
{ {
nm_assert (!obj || NMP_OBJECT_IS_VALID (obj)); nm_assert (!obj || NMP_OBJECT_IS_VALID (obj));
return obj ? obj->_class->obj_type : OBJECT_TYPE_UNKNOWN; return obj ? obj->_class->obj_type : NMP_OBJECT_TYPE_UNKNOWN;
} }