diff options
| author | Bart Polot <bart@net.in.tum.de> | 2012-02-01 17:37:16 +0000 |
|---|---|---|
| committer | Bart Polot <bart@net.in.tum.de> | 2012-02-01 17:37:16 +0000 |
| commit | 51ded2191d94c707434cc5e082c7053f9469f149 (patch) | |
| tree | d584ee1351488ecff69205b6ca7a84a409f16c60 /src | |
| parent | fd2436817f0466d182ac4478f1fee3f2368a81ea (diff) | |
| download | gnunet-51ded2191d94c707434cc5e082c7053f9469f149.tar.gz gnunet-51ded2191d94c707434cc5e082c7053f9469f149.zip | |
Let the compiler not include debug strings in binary when make is not configured with verbose
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/gnunet_common.h | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h index 35db82a3a..d8bb6d8d6 100644 --- a/src/include/gnunet_common.h +++ b/src/include/gnunet_common.h | |||
| @@ -324,23 +324,27 @@ GNUNET_log_from_nocheck (enum GNUNET_ErrorType kind, const char *comp, | |||
| 324 | #if !defined(GNUNET_CULL_LOGGING) | 324 | #if !defined(GNUNET_CULL_LOGGING) |
| 325 | #define GNUNET_log_from(kind,comp,...) do { int log_line = __LINE__;\ | 325 | #define GNUNET_log_from(kind,comp,...) do { int log_line = __LINE__;\ |
| 326 | static int log_call_enabled = GNUNET_LOG_CALL_STATUS;\ | 326 | static int log_call_enabled = GNUNET_LOG_CALL_STATUS;\ |
| 327 | if (GN_UNLIKELY(log_call_enabled == -1))\ | 327 | if ((GNUNET_EXTRA_LOGGING > 0) || ((GNUNET_ERROR_TYPE_DEBUG & kind) == 0)) {\ |
| 328 | log_call_enabled = GNUNET_get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), comp, __FILE__, __FUNCTION__, log_line);\ | 328 | if (GN_UNLIKELY(log_call_enabled == -1))\ |
| 329 | if (GN_UNLIKELY(skip_log > 0)) {skip_log--;}\ | 329 | log_call_enabled = GNUNET_get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), comp, __FILE__, __FUNCTION__, log_line);\ |
| 330 | else {\ | 330 | if (GN_UNLIKELY(skip_log > 0)) {skip_log--;}\ |
| 331 | if (GN_UNLIKELY(log_call_enabled))\ | 331 | else {\ |
| 332 | GNUNET_log_from_nocheck (kind, comp, __VA_ARGS__);\ | 332 | if (GN_UNLIKELY(log_call_enabled))\ |
| 333 | GNUNET_log_from_nocheck (kind, comp, __VA_ARGS__);\ | ||
| 334 | }\ | ||
| 333 | }\ | 335 | }\ |
| 334 | } while (0) | 336 | } while (0) |
| 335 | 337 | ||
| 336 | #define GNUNET_log(kind,...) do { int log_line = __LINE__;\ | 338 | #define GNUNET_log(kind,...) do { int log_line = __LINE__;\ |
| 337 | static int log_call_enabled = GNUNET_LOG_CALL_STATUS;\ | 339 | static int log_call_enabled = GNUNET_LOG_CALL_STATUS;\ |
| 338 | if (GN_UNLIKELY(log_call_enabled == -1))\ | 340 | if ((GNUNET_EXTRA_LOGGING > 0) || ((GNUNET_ERROR_TYPE_DEBUG & kind) == 0)) {\ |
| 339 | log_call_enabled = GNUNET_get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), NULL, __FILE__, __FUNCTION__, log_line);\ | 341 | if (GN_UNLIKELY(log_call_enabled == -1))\ |
| 340 | if (GN_UNLIKELY(skip_log > 0)) {skip_log--;}\ | 342 | log_call_enabled = GNUNET_get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), NULL, __FILE__, __FUNCTION__, log_line);\ |
| 341 | else {\ | 343 | if (GN_UNLIKELY(skip_log > 0)) {skip_log--;}\ |
| 342 | if (GN_UNLIKELY(log_call_enabled))\ | 344 | else {\ |
| 343 | GNUNET_log_nocheck (kind, __VA_ARGS__);\ | 345 | if (GN_UNLIKELY(log_call_enabled))\ |
| 346 | GNUNET_log_nocheck (kind, __VA_ARGS__);\ | ||
| 347 | }\ | ||
| 344 | }\ | 348 | }\ |
| 345 | } while (0) | 349 | } while (0) |
| 346 | #else | 350 | #else |