diff options
author | Thomas Haller <thaller@redhat.com> | 2015-06-24 15:29:01 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2015-06-24 16:09:57 +0200 |
commit | 7bd3b0b304db105d08fe3fb9a9c5c15641f703c9 (patch) | |
tree | ad03269bf7ca0adc760480c1c4a9a4f2585286fc | |
parent | b6061b3cd5e694d492ae647b9ef1ce62621948bf (diff) | |
download | NetworkManager-7bd3b0b304db105d08fe3fb9a9c5c15641f703c9.tar.gz |
platform/trivial: fix name of enum value OBJECT_TYPE_UNKNOWN
Fixes: 518cf76de74ca11b736c27a4265c8b592d021bc4
-rw-r--r-- | src/nm-types.h | 6 | ||||
-rw-r--r-- | src/platform/nm-linux-platform.c | 10 | ||||
-rw-r--r-- | src/platform/nmp-object.c | 6 | ||||
-rw-r--r-- | src/platform/nmp-object.h | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/src/nm-types.h b/src/nm-types.h index bc3bfb0c8c..426aba5a27 100644 --- a/src/nm-types.h +++ b/src/nm-types.h @@ -121,14 +121,14 @@ typedef enum { } NMLinkType; typedef enum { - OBJECT_TYPE_UNKNOWN, + NMP_OBJECT_TYPE_UNKNOWN, NMP_OBJECT_TYPE_LINK, NMP_OBJECT_TYPE_IP4_ADDRESS, NMP_OBJECT_TYPE_IP6_ADDRESS, NMP_OBJECT_TYPE_IP4_ROUTE, NMP_OBJECT_TYPE_IP6_ROUTE, - __OBJECT_TYPE_LAST, - OBJECT_TYPE_MAX = __OBJECT_TYPE_LAST - 1, + __NMP_OBJECT_TYPE_LAST, + NMP_OBJECT_TYPE_MAX = __NMP_OBJECT_TYPE_LAST - 1, } NMPObjectType; /* settings */ diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 35cb903df2..fda33c1506 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -764,7 +764,7 @@ _nlo_get_object_type (const struct nl_object *object) const char *type_str; if (!object || !(type_str = nl_object_get_type (object))) - return OBJECT_TYPE_UNKNOWN; + return NMP_OBJECT_TYPE_UNKNOWN; if (!strcmp (type_str, "route/link")) return NMP_OBJECT_TYPE_LINK; @@ -775,7 +775,7 @@ _nlo_get_object_type (const struct nl_object *object) case AF_INET6: return NMP_OBJECT_TYPE_IP6_ADDRESS; default: - return OBJECT_TYPE_UNKNOWN; + return NMP_OBJECT_TYPE_UNKNOWN; } } else if (!strcmp (type_str, "route/route")) { 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: return NMP_OBJECT_TYPE_IP6_ROUTE; default: - return OBJECT_TYPE_UNKNOWN; + return NMP_OBJECT_TYPE_UNKNOWN; } } 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_IP4_ROUTES: return NMP_OBJECT_TYPE_IP4_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); } } diff --git a/src/platform/nmp-object.c b/src/platform/nmp-object.c index 84cedd1f31..77e7b15b99 100644 --- a/src/platform/nmp-object.c +++ b/src/platform/nmp-object.c @@ -180,7 +180,7 @@ _nmp_object_fixup_link_master_connected (NMPObject *obj, const NMPCache *cache) const NMPClass * 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]; } @@ -811,7 +811,7 @@ nmp_object_from_nl (NMPlatform *platform, const struct nl_object *nlo, gboolean NMPObjectType obj_type = _nlo_get_object_type (nlo); NMPObject *obj; - if (obj_type == OBJECT_TYPE_UNKNOWN) + if (obj_type == NMP_OBJECT_TYPE_UNKNOWN) return 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] = { .obj_type = NMP_OBJECT_TYPE_LINK, .sizeof_data = sizeof (NMPObjectLink), diff --git a/src/platform/nmp-object.h b/src/platform/nmp-object.h index 6933f9902e..5b1887b822 100644 --- a/src/platform/nmp-object.h +++ b/src/platform/nmp-object.h @@ -142,7 +142,7 @@ typedef struct { int (*cmd_plobj_cmp) (const NMPlatformObject *obj1, const NMPlatformObject *obj2); } NMPClass; -extern const NMPClass _nmp_classes[OBJECT_TYPE_MAX]; +extern const NMPClass _nmp_classes[NMP_OBJECT_TYPE_MAX]; typedef struct { NMPlatformLink _public; @@ -254,7 +254,7 @@ NMP_OBJECT_GET_TYPE (const NMPObject *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; } |