projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove an overambitious sanity check in the fecdec filter.
[paraslash.git]
/
para.h
diff --git
a/para.h
b/para.h
index 4022bec7a90019084f7e326d99f236735788f9d3..7cdc5e078b360fbb9730e9e5f79b9306c2f6d9fb 100644
(file)
--- a/
para.h
+++ b/
para.h
@@
-50,61
+50,63
@@
_x > 0? _x : -_x; })
/** Debug loglevel, gets really noisy. */
_x > 0? _x : -_x; })
/** Debug loglevel, gets really noisy. */
-#define LL_DEBUG
1
+#define LL_DEBUG
0
/** Still noisy, but won't fill your disk. */
/** Still noisy, but won't fill your disk. */
-#define LL_INFO
2
+#define LL_INFO
1
/** Normal, but significant event. */
/** Normal, but significant event. */
-#define LL_NOTICE
3
+#define LL_NOTICE
2
/** Unexpected event that can be handled. */
/** Unexpected event that can be handled. */
-#define LL_WARNING
4
+#define LL_WARNING
3
/** Unhandled error condition. */
/** Unhandled error condition. */
-#define LL_ERROR
5
+#define LL_ERROR
4
/** System might be unreliable. */
/** System might be unreliable. */
-#define LL_CRIT
6
+#define LL_CRIT
5
/** Last message before exit. */
/** Last message before exit. */
-#define LL_EMERG 7
+#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 LL_DEBUG > COMPILE_TIME_LOGLEVEL
+#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
#define PARA_DEBUG_LOG(f,...) para_log(LL_DEBUG, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
#else
#define PARA_DEBUG_LOG(...) do {;} while (0)
#endif
-#if LL_INFO > COMPILE_TIME_LOGLEVEL
+#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
#define PARA_INFO_LOG(f,...) para_log(LL_INFO, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
#else
#define PARA_INFO_LOG(...) do {;} while (0)
#endif
-#if LL_NOTICE > COMPILE_TIME_LOGLEVEL
+#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
#define PARA_NOTICE_LOG(f,...) para_log(LL_NOTICE, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
#else
#define PARA_NOTICE_LOG(...) do {;} while (0)
#endif
-#if LL_WARNING > COMPILE_TIME_LOGLEVEL
+#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
#define PARA_WARNING_LOG(f,...) para_log(LL_WARNING, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
#else
#define PARA_WARNING_LOG(...) do {;} while (0)
#endif
-#if LL_ERROR > COMPILE_TIME_LOGLEVEL
+#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
#define PARA_ERROR_LOG(f,...) para_log(LL_ERROR, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
#else
#define PARA_ERROR_LOG(...) do {;} while (0)
#endif
-#if LL_CRIT > COMPILE_TIME_LOGLEVEL
+#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
#define PARA_CRIT_LOG(f,...) para_log(LL_CRIT, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
#else
#define PARA_CRIT_LOG(...) do {;} while (0)
#endif
-#if LL_EMERG > COMPILE_TIME_LOGLEVEL
+#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(...)
#define PARA_EMERG_LOG(f,...) para_log(LL_EMERG, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
#else
#define PARA_EMERG_LOG(...)
@@
-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