From fbfe2ef216a09fb76be85c4bfd667b8392da5d0e Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 7 Apr 2016 19:47:44 +0200 Subject: [PATCH] core/utils: add NM_UTILS_LOOKUP_ITEM_IGNORE_OTHER() switch case NM_UTILS_LOOKUP_DEFAULT_NM_ASSERT() is useful because unless compiled with NM_MORE_ASSERTS, there is no assertion. An assertion includes the function name, and can make the function ineligible for inlining. --- src/nm-core-utils.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/nm-core-utils.h b/src/nm-core-utils.h index f77b43e2a3..22d92d6535 100644 --- a/src/nm-core-utils.h +++ b/src/nm-core-utils.h @@ -220,11 +220,13 @@ fcn_name (lookup_type val, char *buf, gsize len) \ /*****************************************************************************/ -#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 +#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_DEFAULT_NM_ASSERT(v) { nm_assert_not_reached (); return (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 +#define NM_UTILS_LOOKUP_ITEM_IGNORE_OTHER() (void) 0; default: break; (void) 0 #define _NM_UTILS_LOOKUP_DEFINE(scope, fcn_name, lookup_type, result_type, unknown_val, ...) \ scope result_type \