diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-12-07 14:04:45 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-12-07 14:34:59 +0100 |
| commit | 01ea90b57aaa9c4d6e94c6789a51a34871a141d8 (patch) | |
| tree | f7cc63315eb046bc57b64ea9b403225582efc70e /src/NetworkManagerUtils.h | |
| parent | c52b2044cd25859e2f4c4d3a816937ed040fdd8c (diff) | |
| download | NetworkManager-01ea90b57aaa9c4d6e94c6789a51a34871a141d8.tar.gz | |
utils: minor refactoring of NM_UTILS_FLAGS2STR_DEFINE() macro
Diffstat (limited to 'src/NetworkManagerUtils.h')
| -rw-r--r-- | src/NetworkManagerUtils.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h index f620ff01d5..cd81c9c994 100644 --- a/src/NetworkManagerUtils.h +++ b/src/NetworkManagerUtils.h @@ -196,6 +196,8 @@ extern char _nm_utils_to_string_buffer[2096]; void nm_utils_to_string_buffer_init (char **buf, gsize *len); gboolean nm_utils_to_string_buffer_init_null (gconstpointer obj, char **buf, gsize *len); +/*****************************************************************************/ + typedef struct { unsigned flag; const char *name; @@ -203,8 +205,8 @@ typedef struct { #define NM_UTILS_FLAGS2STR(f, n) { .flag = f, .name = ""n, } -#define NM_UTILS_FLAGS2STR_DEFINE(fcn_name, flags_type, ...) \ -const char * \ +#define _NM_UTILS_FLAGS2STR_DEFINE(scope, fcn_name, flags_type, ...) \ +scope const char * \ fcn_name (flags_type flags, char *buf, gsize len) \ { \ static const NMUtilsFlags2StrDesc descs[] = { \ @@ -214,9 +216,10 @@ fcn_name (flags_type flags, char *buf, gsize len) \ return nm_utils_flags2str (descs, G_N_ELEMENTS (descs), flags, buf, len); \ }; +#define NM_UTILS_FLAGS2STR_DEFINE(fcn_name, flags_type, ...) \ + _NM_UTILS_FLAGS2STR_DEFINE (, fcn_name, flags_type, __VA_ARGS__) #define NM_UTILS_FLAGS2STR_DEFINE_STATIC(fcn_name, flags_type, ...) \ -static \ -NM_UTILS_FLAGS2STR_DEFINE (fcn_name, flags_type, __VA_ARGS__) + _NM_UTILS_FLAGS2STR_DEFINE (static, fcn_name, flags_type, __VA_ARGS__) const char *nm_utils_flags2str (const NMUtilsFlags2StrDesc *descs, gsize n_descs, @@ -224,6 +227,8 @@ const char *nm_utils_flags2str (const NMUtilsFlags2StrDesc *descs, char *buf, gsize len); +/*****************************************************************************/ + void nm_utils_strbuf_append (char **buf, gsize *len, const char *format, ...) __attribute__((__format__ (__printf__, 3, 4))); void nm_utils_strbuf_append_c (char **buf, gsize *len, char c); void nm_utils_strbuf_append_str (char **buf, gsize *len, const char *str); |