diff options
-rw-r--r-- | src/include/gnunet_common.h | 4 | ||||
-rw-r--r-- | src/util/common_logging.c | 14 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h index ab639122c..d599b87e9 100644 --- a/src/include/gnunet_common.h +++ b/src/include/gnunet_common.h | |||
@@ -450,7 +450,7 @@ GNUNET_log_skip (int n, int check_reset); | |||
450 | * @param comp default component to use | 450 | * @param comp default component to use |
451 | * @param loglevel what types of messages should be logged | 451 | * @param loglevel what types of messages should be logged |
452 | * @param logfile change logging to logfile (use NULL to keep stderr) | 452 | * @param logfile change logging to logfile (use NULL to keep stderr) |
453 | * @return GNUNET_OK on success, GNUNET_SYSERR if logfile could not be opened | 453 | * @return #GNUNET_OK on success, #GNUNET_SYSERR if logfile could not be opened |
454 | */ | 454 | */ |
455 | int | 455 | int |
456 | GNUNET_log_setup (const char *comp, const char *loglevel, const char *logfile); | 456 | GNUNET_log_setup (const char *comp, const char *loglevel, const char *logfile); |
@@ -461,7 +461,7 @@ GNUNET_log_setup (const char *comp, const char *loglevel, const char *logfile); | |||
461 | * Add a custom logger. | 461 | * Add a custom logger. |
462 | * | 462 | * |
463 | * @param logger log function | 463 | * @param logger log function |
464 | * @param logger_cls closure for logger | 464 | * @param logger_cls closure for @a logger |
465 | */ | 465 | */ |
466 | void | 466 | void |
467 | GNUNET_logger_add (GNUNET_Logger logger, void *logger_cls); | 467 | GNUNET_logger_add (GNUNET_Logger logger, void *logger_cls); |
diff --git a/src/util/common_logging.c b/src/util/common_logging.c index b3cb06387..80819276e 100644 --- a/src/util/common_logging.c +++ b/src/util/common_logging.c | |||
@@ -829,10 +829,11 @@ flush_bulk (const char *datestr) | |||
829 | * Ignore the next n calls to the log function. | 829 | * Ignore the next n calls to the log function. |
830 | * | 830 | * |
831 | * @param n number of log calls to ignore (could be negative) | 831 | * @param n number of log calls to ignore (could be negative) |
832 | * @param check_reset GNUNET_YES to assert that the log skip counter is currently zero | 832 | * @param check_reset #GNUNET_YES to assert that the log skip counter is currently zero |
833 | */ | 833 | */ |
834 | void | 834 | void |
835 | GNUNET_log_skip (int n, int check_reset) | 835 | GNUNET_log_skip (int n, |
836 | int check_reset) | ||
836 | { | 837 | { |
837 | int ok; | 838 | int ok; |
838 | 839 | ||
@@ -849,6 +850,7 @@ GNUNET_log_skip (int n, int check_reset) | |||
849 | } | 850 | } |
850 | } | 851 | } |
851 | 852 | ||
853 | |||
852 | /** | 854 | /** |
853 | * Get the number of log calls that are going to be skipped | 855 | * Get the number of log calls that are going to be skipped |
854 | * | 856 | * |
@@ -860,6 +862,7 @@ GNUNET_get_log_skip () | |||
860 | return skip_log; | 862 | return skip_log; |
861 | } | 863 | } |
862 | 864 | ||
865 | |||
863 | /** | 866 | /** |
864 | * Output a log message using the default mechanism. | 867 | * Output a log message using the default mechanism. |
865 | * | 868 | * |
@@ -869,7 +872,9 @@ GNUNET_get_log_skip () | |||
869 | * @param va arguments to the format string "message" | 872 | * @param va arguments to the format string "message" |
870 | */ | 873 | */ |
871 | static void | 874 | static void |
872 | mylog (enum GNUNET_ErrorType kind, const char *comp, const char *message, | 875 | mylog (enum GNUNET_ErrorType kind, |
876 | const char *comp, | ||
877 | const char *message, | ||
873 | va_list va) | 878 | va_list va) |
874 | { | 879 | { |
875 | char date[DATE_STR_SIZE]; | 880 | char date[DATE_STR_SIZE]; |
@@ -979,7 +984,8 @@ mylog (enum GNUNET_ErrorType kind, const char *comp, const char *message, | |||
979 | * @param ... arguments for format string | 984 | * @param ... arguments for format string |
980 | */ | 985 | */ |
981 | void | 986 | void |
982 | GNUNET_log_nocheck (enum GNUNET_ErrorType kind, const char *message, ...) | 987 | GNUNET_log_nocheck (enum GNUNET_ErrorType kind, |
988 | const char *message, ...) | ||
983 | { | 989 | { |
984 | va_list va; | 990 | va_list va; |
985 | 991 | ||