Fix osl() wrapper.

[paraslash.git] / para.h

diff --git a/para.h b/para.h
index 3f2da13a859782ba8c5a014d6e6511ecd97d1f28..7cdc5e078b360fbb9730e9e5f79b9306c2f6d9fb 100644 (file)
--- a/para.h
+++ b/para.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>

  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */


@@ -42,70 +42,72 @@
        typeof(x) _max1 = (x); \
        typeof(y) _max2 = (y); \
        (void) (&_max1 == &_max2); \
        typeof(x) _max1 = (x); \
        typeof(y) _max2 = (y); \
        (void) (&_max1 == &_max2); \

-       _max1 < _max2 ? _max1 : _max2; })
+       _max1 < _max2 ? _max2 : _max1; })

 
 /** Compute the absolute value of \a x. */
 #define PARA_ABS(x) ({ \
        typeof(x) _x = (x); \
        _x > 0? _x : -_x; })
 
 
 /** Compute the absolute value of \a x. */
 #define PARA_ABS(x) ({ \
        typeof(x) _x = (x); \
        _x > 0? _x : -_x; })
 

-/** debug loglevel, gets really noisy */
-#define DEBUG 1
-/** still noisy, but won't fill your disk */
-#define INFO  2
-/** normal, but significant event */
-#define NOTICE 3
-/** unexpected event that can be handled */
-#define WARNING 4
-/** unhandled error condition */
-#define ERROR 5
-/** system might be unreliable */
-#define CRIT 6
-/** last message before exit */
-#define EMERG 7
+/** Debug loglevel, gets really noisy. */
+#define LL_DEBUG 0
+/** Still noisy, but won't fill your disk. */
+#define LL_INFO  1
+/** Normal, but significant event. */
+#define LL_NOTICE 2
+/** Unexpected event that can be handled. */
+#define LL_WARNING 3
+/** Unhandled error condition. */
+#define LL_ERROR 4
+/** System might be unreliable. */
+#define LL_CRIT 5
+/** Last message before exit. */
+#define LL_EMERG 6
+/** Number of all loglevels. */
+#define NUM_LOGLEVELS 7

 
 /** Log messages with lower priority than that will not be compiled in. */
 #define COMPILE_TIME_LOGLEVEL 0
 
 /** \cond */
 
 /** Log messages with lower priority than that will not be compiled in. */
 #define COMPILE_TIME_LOGLEVEL 0
 
 /** \cond */

-#if DEBUG > COMPILE_TIME_LOGLEVEL
-#define PARA_DEBUG_LOG(f,...) para_log(DEBUG, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
+#if LL_DEBUG >= COMPILE_TIME_LOGLEVEL
+#define PARA_DEBUG_LOG(f,...) para_log(LL_DEBUG, "%s: " f, __FUNCTION__, ## __VA_ARGS__)

 #else
 #define PARA_DEBUG_LOG(...) do {;} while (0)
 #endif
 
 #else
 #define PARA_DEBUG_LOG(...) do {;} while (0)
 #endif
 

-#if INFO > COMPILE_TIME_LOGLEVEL
-#define PARA_INFO_LOG(f,...) para_log(INFO, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
+#if LL_INFO >= COMPILE_TIME_LOGLEVEL
+#define PARA_INFO_LOG(f,...) para_log(LL_INFO, "%s: " f, __FUNCTION__, ## __VA_ARGS__)

 #else
 #define PARA_INFO_LOG(...) do {;} while (0)
 #endif
 
 #else
 #define PARA_INFO_LOG(...) do {;} while (0)
 #endif
 

-#if NOTICE > COMPILE_TIME_LOGLEVEL
-#define PARA_NOTICE_LOG(f,...) para_log(NOTICE, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
+#if LL_NOTICE >= COMPILE_TIME_LOGLEVEL
+#define PARA_NOTICE_LOG(f,...) para_log(LL_NOTICE, "%s: " f, __FUNCTION__, ## __VA_ARGS__)

 #else
 #define PARA_NOTICE_LOG(...) do {;} while (0)
 #endif
 
 #else
 #define PARA_NOTICE_LOG(...) do {;} while (0)
 #endif
 

-#if WARNING > COMPILE_TIME_LOGLEVEL
-#define PARA_WARNING_LOG(f,...) para_log(WARNING, "%s: " f, __FUNCTION__, ##  __VA_ARGS__)
+#if LL_WARNING >= COMPILE_TIME_LOGLEVEL
+#define PARA_WARNING_LOG(f,...) para_log(LL_WARNING, "%s: " f, __FUNCTION__, ##  __VA_ARGS__)

 #else
 #define PARA_WARNING_LOG(...) do {;} while (0)
 #endif
 
 #else
 #define PARA_WARNING_LOG(...) do {;} while (0)
 #endif
 

-#if ERROR > COMPILE_TIME_LOGLEVEL
-#define PARA_ERROR_LOG(f,...) para_log(ERROR, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
+#if LL_ERROR >= COMPILE_TIME_LOGLEVEL
+#define PARA_ERROR_LOG(f,...) para_log(LL_ERROR, "%s: " f, __FUNCTION__, ## __VA_ARGS__)

 #else
 #define PARA_ERROR_LOG(...) do {;} while (0)
 #endif
 
 #else
 #define PARA_ERROR_LOG(...) do {;} while (0)
 #endif
 

-#if CRIT > COMPILE_TIME_LOGLEVEL
-#define PARA_CRIT_LOG(f,...) para_log(CRIT, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
+#if LL_CRIT >= COMPILE_TIME_LOGLEVEL
+#define PARA_CRIT_LOG(f,...) para_log(LL_CRIT, "%s: " f, __FUNCTION__, ## __VA_ARGS__)

 #else
 #define PARA_CRIT_LOG(...) do {;} while (0)
 #endif
 
 #else
 #define PARA_CRIT_LOG(...) do {;} while (0)
 #endif
 

-#if EMERG > COMPILE_TIME_LOGLEVEL
-#define PARA_EMERG_LOG(f,...) para_log(EMERG, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
+#if LL_EMERG >= COMPILE_TIME_LOGLEVEL
+#define PARA_EMERG_LOG(f,...) para_log(LL_EMERG, "%s: " f, __FUNCTION__, ## __VA_ARGS__)

 #else
 #define PARA_EMERG_LOG(...)
 #endif
 #else
 #define PARA_EMERG_LOG(...)
 #endif


@@ -131,7 +133,7 @@
 
 /** version text used by various commands if -V switch was given */
 #define VERSION_TEXT(prefix) "para_" prefix " " PACKAGE_VERSION " (" CODENAME ")" "\n" \
 
 /** version text used by various commands if -V switch was given */
 #define VERSION_TEXT(prefix) "para_" prefix " " PACKAGE_VERSION " (" CODENAME ")" "\n" \

-       "Copyright (C) 2008 Andre Noll\n" \
+       "Copyright (C) 2009 Andre Noll\n" \

        "This is free software with ABSOLUTELY NO WARRANTY." \
        " See COPYING for details.\n" \
        "Written by Andre Noll.\n" \
        "This is free software with ABSOLUTELY NO WARRANTY." \
        " See COPYING for details.\n" \
        "Written by Andre Noll.\n" \


@@ -228,7 +230,8 @@ static inline long int para_random(unsigned max)
 }
 
 /** Round up x to a multiple of y */
 }
 
 /** Round up x to a multiple of y */

-#define ROUND_UP(x, y) (((x) + ((y) - 1) / (y)) * (y))
+#define ROUND_UP(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
+

 
 /** Get the size of an array */
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
 /** Get the size of an array */
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))


@@ -247,3 +250,8 @@ static inline long int para_random(unsigned max)
  * horribly for characters which have their most significant bit set.
  */
 #define para_isspace(c) isspace((int)(unsigned char)(c))
  * horribly for characters which have their most significant bit set.
  */
 #define para_isspace(c) isspace((int)(unsigned char)(c))

+
+/** 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"
+#define FEC_EOF_PACKET_LEN 32