oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Define glibtop_debug(_r) as macros, eventually calling real C function.

Browse Source 
Keep these as macros so that if debug is not enable, although the
debug message is parsed, it's not run.
It's better this way because the debug message is always parsed and
checked instead of being deleted by the preprocessor.
This commit is contained in:
Benoit Dejean
2015-06-21 22:35:52 +02:00
parent b2a2f6b5c2
commit 887092a05d
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/glibtop/error.h
View File

@@ -47,14 +47,16 @@ void glibtop_error_io (const char *format, ...) G_GNUC_PRINTF(1, 2) G_GNUC_NORET
void glibtop_warn_io (const char *format, ...) G_GNUC_PRINTF(1, 2);
/* FIXME: C99 */
#define glibtop_debug(fmt, ...) \
#define glibtop_debug_r(server, fmt, ...) \
G_STMT_START { \
if (LIBGTOP_ENABLE_DEBUG) \
glibtop_debug_r(glibtop_global_server, fmt, ##__VA_ARGS__); \
glibtop_debug_r_real(server, fmt, ##__VA_ARGS__); \
} G_STMT_END
#define glibtop_debug(...) glibtop_debug_r(glibtop_global_server, __VA_ARGS__)
void glibtop_debug_vr (glibtop *server, const char *format, va_list args);
void glibtop_debug_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3);
void glibtop_debug_r_real (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3);
G_END_DECLS

2
sysdeps/common/error.c
View File

@@ -174,7 +174,7 @@ glibtop_debug_vr (glibtop *server, const char *format, va_list args)
}
void
glibtop_debug_r (glibtop *server, const char *format, ...)
glibtop_debug_r_real (glibtop *server, const char *format, ...)
{
va_list args;