diff options
author | xrs <xrs@mail36.net> | 2020-01-16 17:12:09 +0100 |
---|---|---|
committer | xrs <xrs@mail36.net> | 2020-01-16 17:12:09 +0100 |
commit | 32b55237f2b94b4940d7031a0bc1adcf8b63824a (patch) | |
tree | 92766aa532ef2c674192dc3bd0e9b71a99829fa1 /src/util/common_logging.c | |
parent | ec78709681261eaddedbed6484dd95849f180f92 (diff) | |
parent | 5177efb74f9301bbffd79d63f47eb78611e6abba (diff) | |
download | gnunet-32b55237f2b94b4940d7031a0bc1adcf8b63824a.tar.gz gnunet-32b55237f2b94b4940d7031a0bc1adcf8b63824a.zip |
Merge branch 'master' of ssh://git.gnunet.org/gnunet
Diffstat (limited to 'src/util/common_logging.c')
-rw-r--r-- | src/util/common_logging.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/util/common_logging.c b/src/util/common_logging.c index 430f75e70..27ac88a05 100644 --- a/src/util/common_logging.c +++ b/src/util/common_logging.c | |||
@@ -294,7 +294,6 @@ resize_logdefs () | |||
294 | } | 294 | } |
295 | 295 | ||
296 | 296 | ||
297 | #if ! TALER_WALLET_ONLY | ||
298 | /** | 297 | /** |
299 | * Rotate logs, deleting the oldest log. | 298 | * Rotate logs, deleting the oldest log. |
300 | * | 299 | * |
@@ -403,9 +402,6 @@ setup_log_file (const struct tm *tm) | |||
403 | } | 402 | } |
404 | 403 | ||
405 | 404 | ||
406 | #endif | ||
407 | |||
408 | |||
409 | /** | 405 | /** |
410 | * Utility function - adds a parsed definition to logdefs array. | 406 | * Utility function - adds a parsed definition to logdefs array. |
411 | * | 407 | * |
@@ -731,7 +727,7 @@ GNUNET_log_setup (const char *comp, const char *loglevel, const char *logfile) | |||
731 | log_file_name = GNUNET_STRINGS_filename_expand (logfile); | 727 | log_file_name = GNUNET_STRINGS_filename_expand (logfile); |
732 | if (NULL == log_file_name) | 728 | if (NULL == log_file_name) |
733 | return GNUNET_SYSERR; | 729 | return GNUNET_SYSERR; |
734 | #if TALER_WALLET_ONLY || defined(GNUNET_CULL_LOGGING) | 730 | #if defined(GNUNET_CULL_LOGGING) |
735 | /* log file option not allowed for wallet logic */ | 731 | /* log file option not allowed for wallet logic */ |
736 | GNUNET_assert (NULL == logfile); | 732 | GNUNET_assert (NULL == logfile); |
737 | return GNUNET_OK; | 733 | return GNUNET_OK; |
@@ -1023,7 +1019,7 @@ mylog (enum GNUNET_ErrorType kind, | |||
1023 | } | 1019 | } |
1024 | 1020 | ||
1025 | vsnprintf (buf, size, message, va); | 1021 | vsnprintf (buf, size, message, va); |
1026 | #if ! (defined(GNUNET_CULL_LOGGING) || TALER_WALLET_ONLY) | 1022 | #if ! defined(GNUNET_CULL_LOGGING) |
1027 | if (NULL != tmptr) | 1023 | if (NULL != tmptr) |
1028 | (void) setup_log_file (tmptr); | 1024 | (void) setup_log_file (tmptr); |
1029 | #endif | 1025 | #endif |