utils: pass entire return statement to NM_UTILS_LOOKUP_DEFINE()

This commit is contained in:
Thomas Haller
2016-02-01 14:09:56 +01:00
parent 572b60a203
commit 72255b71d7
5 changed files with 12 additions and 8 deletions

View File

@@ -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, ...) \