X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=para.h;h=ac6a03fc5de8c0f0290ea0b621a4caa59bcbaf53;hp=5dc3912409b5dd64c71a0d68e2fcbbde2cfe466a;hb=d16fe3df649cb48d5ffa26187da3dad4c3066646;hpb=d91b2b2a70c85562b5d30cc5fda46468532e314a

diff --git a/para.h b/para.h
index 5dc39124..ac6a03fc 100644
--- a/para.h
+++ b/para.h
@@ -25,6 +25,7 @@
 #include <sys/un.h> /* needed by create_pf_socket */
 #include <string.h>
 #include <assert.h>
+#include <stdbool.h>
 #include "gcc-compat.h"
 
 /** used in various contexts */
@@ -49,15 +50,19 @@
 	typeof(x) _x = (x); \
 	_x > 0? _x : -_x; })
 
+
+extern __printf_2_3 void (*para_log)(int, const char*, ...);
 /**
  * Define a standard log function that always writes to stderr.
  *
+ * \param funcname The name of the function to be defined.
+ *
  * \param loglevel_barrier If the loglevel of the current message
  * is less than that, the message is going to be ignored.
  *
  */
-#define INIT_STDERR_LOGGING(loglevel_barrier) \
-	__printf_2_3 void para_log(int ll, const char* fmt,...) \
+#define DEFINE_STDERR_LOGGER(funcname, loglevel_barrier) \
+	__printf_2_3 void funcname(int ll, const char* fmt,...) \
 	{ \
 		va_list argp; \
 		if (ll < loglevel_barrier) \
@@ -66,6 +71,9 @@
 		vfprintf(stderr, fmt, argp); \
 		va_end(argp); \
 	}
+#define INIT_STDERR_LOGGING(loglevel_barrier) \
+	DEFINE_STDERR_LOGGER(stderr_log, loglevel_barrier); \
+	__printf_2_3 void (*para_log)(int, const char*, ...) = stderr_log;
 
 /** Sent by para_client to initiate the authentication procedure. */
 #define AUTH_REQUEST_MSG "auth rsa "
@@ -105,8 +113,6 @@ extern const char *status_item_list[];
 int for_each_stat_item(char *item_buf, size_t num_bytes,
 	int (*item_handler)(int, char *));
 
-__printf_2_3 void para_log(int, const char*, ...);
-
 /**
  * Write a log message to a dynamically allocated string.
  *
@@ -229,12 +235,12 @@ _static_inline_ long int para_random(unsigned max)
 	SAMPLE_FORMAT(SF_U16_LE, "16 bit unsigned, little endian"), \
 	SAMPLE_FORMAT(SF_U16_BE, "16 bit unsigned, big endian"), \
 
-/** \cond */
+/** \cond sample_format */
 #define SAMPLE_FORMAT(a, b) a
 enum sample_format {SAMPLE_FORMATS};
 #undef SAMPLE_FORMAT
 #define SAMPLE_FORMAT(a, b) b
-/** \endcond */
+/** \endcond sample_format */
 
 /** Debug loglevel, gets really noisy. */
 #define LL_DEBUG 0
@@ -256,7 +262,7 @@ enum sample_format {SAMPLE_FORMATS};
 /** Log messages with lower priority than that will not be compiled in. */
 #define COMPILE_TIME_LOGLEVEL 0
 
-/** \cond */
+/** \cond log */
 #if LL_DEBUG >= COMPILE_TIME_LOGLEVEL
 #define PARA_DEBUG_LOG(f,...) para_log(LL_DEBUG, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
 #else
@@ -298,4 +304,4 @@ enum sample_format {SAMPLE_FORMATS};
 #else
 #define PARA_EMERG_LOG(...)
 #endif
-/** \endcond */
+/** \endcond log */