colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

utils: minor refactoring of NM_UTILS_FLAGS2STR_DEFINE() macro

Browse Source
This commit is contained in:
Thomas Haller
2015-12-07 14:04:45 +01:00
parent c52b2044cd
commit 01ea90b57a
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/NetworkManagerUtils.h
View File

@@ -196,6 +196,8 @@ extern char _nm_utils_to_string_buffer[2096];
void nm_utils_to_string_buffer_init (char **buf, gsize *len); 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); gboolean nm_utils_to_string_buffer_init_null (gconstpointer obj, char **buf, gsize *len);
/*****************************************************************************/
typedef struct { typedef struct {
unsigned flag; unsigned flag;
const char *name; const char *name;
@@ -203,8 +205,8 @@ typedef struct {
#define NM_UTILS_FLAGS2STR(f, n) { .flag = f, .name = ""n, } #define NM_UTILS_FLAGS2STR(f, n) { .flag = f, .name = ""n, }
#define NM_UTILS_FLAGS2STR_DEFINE(fcn_name, flags_type, ...) \ #define _NM_UTILS_FLAGS2STR_DEFINE(scope, fcn_name, flags_type, ...) \
const char * \ scope const char * \
fcn_name (flags_type flags, char *buf, gsize len) \ fcn_name (flags_type flags, char *buf, gsize len) \
{ \ { \
static const NMUtilsFlags2StrDesc descs[] = { \ 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); \ 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, ...) \ #define NM_UTILS_FLAGS2STR_DEFINE_STATIC(fcn_name, flags_type, ...) \
static \ _NM_UTILS_FLAGS2STR_DEFINE (static, fcn_name, flags_type, __VA_ARGS__)
NM_UTILS_FLAGS2STR_DEFINE (fcn_name, flags_type, __VA_ARGS__)
const char *nm_utils_flags2str (const NMUtilsFlags2StrDesc *descs, const char *nm_utils_flags2str (const NMUtilsFlags2StrDesc *descs,
gsize n_descs, gsize n_descs,
@@ -224,6 +227,8 @@ const char *nm_utils_flags2str (const NMUtilsFlags2StrDesc *descs,
char *buf, char *buf,
gsize len); gsize len);
/*****************************************************************************/
void nm_utils_strbuf_append (char **buf, gsize *len, const char *format, ...) __attribute__((__format__ (__printf__, 3, 4))); 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_c (char **buf, gsize *len, char c);
void nm_utils_strbuf_append_str (char **buf, gsize *len, const char *str); void nm_utils_strbuf_append_str (char **buf, gsize *len, const char *str);