X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=para.h;h=ac6a03fc5de8c0f0290ea0b621a4caa59bcbaf53;hp=29c5c2b89c4ac3e0ca820c26c07cd8be4755f266;hb=d16fe3df649cb48d5ffa26187da3dad4c3066646;hpb=92e4a0579a320372d2e94efc7c2a0d9f419e3ffe

diff --git a/para.h b/para.h
index 29c5c2b8..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,22 +71,9 @@
 		vfprintf(stderr, fmt, argp); \
 		va_end(argp); \
 	}
-
-/** Version text used by various commands if -V switch was given. */
-#define VERSION_TEXT(prefix) "para_" prefix " " PACKAGE_VERSION \
-	" (" GIT_VERSION ": " CODENAME ")" "\n" \
-	"Copyright (C) 2011 Andre Noll\n" \
-	"This is free software with ABSOLUTELY NO WARRANTY." \
-	" See COPYING for details.\n" \
-	"Written by Andre Noll.\n" \
-	"Report bugs to <maan@systemlinux.org>.\n"
-
-/** Print out \p VERSION_TEXT and exit if version flag was given. */
-#define HANDLE_VERSION_FLAG(_prefix, _args_info_struct) \
-	if (_args_info_struct.version_given) { \
-		printf("%s", VERSION_TEXT(_prefix)); \
-		exit(EXIT_SUCCESS); \
-	}
+#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 "
@@ -121,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.
  *
@@ -192,7 +182,7 @@ _static_inline_ long int para_random(unsigned max)
  */
 #define EXPR_BUILD_ASSERT(cond) (sizeof(char [1 - 2 * !(cond)]) - 1)
 
-/* &a[0] degrades to a pointer: a different type from an array */
+/** &a[0] degrades to a pointer: a different type from an array */
 #define _array_size_chk(arr) EXPR_BUILD_ASSERT(\
 	!__builtin_types_compatible_p(typeof(arr), typeof(&(arr)[0])))
 /** Get the size of an array */
@@ -216,11 +206,15 @@ _static_inline_ long int para_random(unsigned max)
 /** Data that indicates an eof-condition for a fec-encoded stream. */
 #define FEC_EOF_PACKET "\xec\x0d\xcc\xfe\0\0\0\0" \
 	"\0\0\0\0\0\0\0\0" "\0\0\0\0\0\0\0\0" "\0\0\0\0\0\0\0\0"
+/** The number of bytes of the \a FEC_EOF_PACKET. */
 #define FEC_EOF_PACKET_LEN 32
 
 /** Used to avoid a shortcoming in vim's syntax highlighting. */
 #define EMBRACE(...) { __VA_ARGS__}
 
+/** A nice cup of STFU for Mr gcc. */
+#define do_nothing do {/* nothing */} while (0)
+
 /**
  * The sample formats supported by paraslash.
  *
@@ -241,10 +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 sample_format */
 #define SAMPLE_FORMAT(a, b) a
 enum sample_format {SAMPLE_FORMATS};
 #undef SAMPLE_FORMAT
 #define SAMPLE_FORMAT(a, b) b
+/** \endcond sample_format */
 
 /** Debug loglevel, gets really noisy. */
 #define LL_DEBUG 0
@@ -266,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
@@ -308,4 +304,4 @@ enum sample_format {SAMPLE_FORMATS};
 #else
 #define PARA_EMERG_LOG(...)
 #endif
-/** \endcond */
+/** \endcond log */