From 02df484d5b3460cc7666a802206ce647ec021745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1=D1?= =?UTF-8?q?=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= Date: Tue, 4 Oct 2011 07:08:38 +0400 Subject: [PATCH 6/8] Add GNUNET_ prefix to get_log_call_status --- src/include/gnunet_common.h | 6 +++--- src/util/common_logging.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h index fee4e11..5486990 100644 --- a/src/include/gnunet_common.h +++ b/src/include/gnunet_common.h @@ -174,7 +174,7 @@ extern enum GNUNET_ErrorType min_level; extern unsigned int skip_log; #if !defined(GNUNET_CULL_LOGGING) int -get_log_call_status (int caller_level, const char *comp, const char *file, const char *function, int line); +GNUNET_get_log_call_status (int caller_level, const char *comp, const char *file, const char *function, int line); #endif /** * Main log function. @@ -225,7 +225,7 @@ GNUNET_log_from_nocheck (enum GNUNET_ErrorType kind, const char *comp, #define GNUNET_log_from(kind,comp,...) do { int log_line = __LINE__;\ static int log_call_enabled = GNUNET_LOG_CALL_STATUS;\ if (GN_UNLIKELY(log_call_enabled == -1))\ - log_call_enabled = get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), comp, __FILE__, __FUNCTION__, log_line);\ + log_call_enabled = GNUNET_get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), comp, __FILE__, __FUNCTION__, log_line);\ if (GN_UNLIKELY(skip_log > 0)) {skip_log--;}\ else {\ if (GN_UNLIKELY(log_call_enabled))\ @@ -236,7 +236,7 @@ GNUNET_log_from_nocheck (enum GNUNET_ErrorType kind, const char *comp, #define GNUNET_log(kind,...) do { int log_line = __LINE__;\ static int log_call_enabled = GNUNET_LOG_CALL_STATUS;\ if (GN_UNLIKELY(log_call_enabled == -1))\ - log_call_enabled = get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), NULL, __FILE__, __FUNCTION__, log_line);\ + log_call_enabled = GNUNET_get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), NULL, __FILE__, __FUNCTION__, log_line);\ if (GN_UNLIKELY(skip_log > 0)) {skip_log--;}\ else {\ if (GN_UNLIKELY(log_call_enabled))\ diff --git a/src/util/common_logging.c b/src/util/common_logging.c index 7951656..4001b1e 100644 --- a/src/util/common_logging.c +++ b/src/util/common_logging.c @@ -222,7 +222,7 @@ add_definition (char *component, char *file, char *function, int from_line, int } int -get_log_call_status (int caller_level, const char *comp, const char *file, const char *function, int line) +GNUNET_get_log_call_status (int caller_level, const char *comp, const char *file, const char *function, int line) { struct LogDef *ld; int i; -- 1.7.4