summaryrefslogtreecommitdiff
path: root/src/NetworkManagerUtils.h
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-02-01 14:09:56 +0100
committerThomas Haller <thaller@redhat.com>2016-02-01 14:20:26 +0100
commit72255b71d7970e5f02f2a29cd554421504ffc6f1 (patch)
tree63fe6e3687dae8619ea20cc9117e3c52c277e1ce /src/NetworkManagerUtils.h
parent572b60a203098e864e539ac26f1e50b378bf32ae (diff)
downloadNetworkManager-72255b71d7970e5f02f2a29cd554421504ffc6f1.tar.gz
utils: pass entire return statement to NM_UTILS_LOOKUP_DEFINE()
Diffstat (limited to 'src/NetworkManagerUtils.h')
-rw-r--r--src/NetworkManagerUtils.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h
index 4b976d15bf..1f31e53fef 100644
--- a/src/NetworkManagerUtils.h
+++ b/src/NetworkManagerUtils.h
@@ -260,6 +260,8 @@ const char *nm_utils_enum2str (const NMUtilsEnum2StrDesc *descs,
/*****************************************************************************/
+#define NM_UTILS_LOOKUP_DEFAULT(v) return (v)
+#define NM_UTILS_LOOKUP_DEFAULT_WARN(v) g_return_val_if_reached (v)
#define NM_UTILS_LOOKUP_ITEM(v, n) (void) 0; case v: return (n); (void) 0
#define NM_UTILS_LOOKUP_STR_ITEM(v, n) NM_UTILS_LOOKUP_ITEM(v, ""n"")
#define NM_UTILS_LOOKUP_ITEM_IGNORE(v) (void) 0; case v: break; (void) 0
@@ -273,7 +275,7 @@ fcn_name (lookup_type val) \
__VA_ARGS__ \
(void) 0; \
}; \
- return (unknown_val); \
+ { unknown_val; } \
}
#define NM_UTILS_LOOKUP_STR_DEFINE(fcn_name, lookup_type, unknown_val, ...) \