X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Flib.h;h=f114dbe978587e6036ad96f11cf32c677a8251bd;hb=0f88062c8973258611a8cba9a0e9668d1c688030;hp=a62281327f4214a294ef506043b227f4af1620ac;hpb=2ac260ae8694188410a408cd8c379a2fe45e4ee5;p=libucw.git

diff --git a/ucw/lib.h b/ucw/lib.h
index a6228132..f114dbe9 100644
--- a/ucw/lib.h
+++ b/ucw/lib.h
@@ -20,17 +20,13 @@
 
 #define CHECK_PTR_TYPE(x, type) ((x)-(type)(x) + (type)(x))		/** Check that a pointer @x is of type @type. Fail compilation if not. **/
 #define PTR_TO(s, i) &((s*)0)->i					/** Return OFFSETOF() in form of a pointer. **/
-#define OFFSETOF(s, i) ((unsigned int) (uintptr_t) PTR_TO(s, i))	/** Offset of item @i from the start of structure @s **/
+#define OFFSETOF(s, i) ((uns)offsetof(s, i))				/** Offset of item @i from the start of structure @s **/
 #define SKIP_BACK(s, i, p) ((s *)((char *)p - OFFSETOF(s, i)))		/** Given a pointer @p to item @i of structure @s, return a pointer to the start of the struct. **/
 
-/**
- * Align an integer @s to the nearest higher multiple of @a (which should be a power of two)
- **/
+/** Align an integer @s to the nearest higher multiple of @a (which should be a power of two) **/
 #define ALIGN_TO(s, a) (((s)+a-1)&~(a-1))
 
-/**
- * Align a pointer @p to the nearest higher multiple of @s.
- **/
+/** Align a pointer @p to the nearest higher multiple of @s. **/
 #define ALIGN_PTR(p, s) ((uintptr_t)(p) % (s) ? (typeof(p))((uintptr_t)(p) + (s) - (uintptr_t)(p) % (s)) : (p))
 
 #define UNALIGNED_PART(ptr, type) (((uintptr_t) (ptr)) % sizeof(type))
@@ -104,9 +100,16 @@ enum log_levels {			/** The available log levels to pass to msg() and friends. *
   L_WARN_R,				// 'w'   (e.g., a packet received via network)
   L_ERROR_R,				// 'e'
   L_FATAL,				// '!' - Fatal error
+  L_MAX
 };
 
-#define L_SIGHANDLER 0x80000000		/** Avoid operations that are unsafe in signal handlers **/
+#define LOG_LEVEL_NAMES P(DEBUG) P(INFO) P(WARN) P(ERROR) P(INFO_R) P(WARN_R) P(ERROR_R) P(FATAL)
+
+// Return the letter associated with a given severity level
+#define LS_LEVEL_LETTER(level) ("DIWEiwe!###"[( level )])
+
+#define L_SIGHANDLER	0x80000000	/** Avoid operations that are unsafe in signal handlers **/
+#define L_LOGGER_ERR	0x40000000	/** Used internally to avoid infinite reporting of logging errors **/
 
 /**
  * This is the basic printf-like function for logging a message.
@@ -115,6 +118,7 @@ enum log_levels {			/** The available log levels to pass to msg() and friends. *
 void msg(uns flags, const char *fmt, ...) FORMAT_CHECK(printf,2,3);
 void vmsg(uns flags, const char *fmt, va_list args);		/** A vararg version of msg(). **/
 void die(const char *, ...) NONRET FORMAT_CHECK(printf,1,2);	/** Log a fatal error message and exit the program. **/
+void vdie(const char *fmt, va_list args) NONRET;		/** va_list version of die() **/
 
 extern char *log_title;			/** An optional log message title. Set to program name by log_init(). **/
 extern int log_pid;			/** An optional PID printed in each log message. Set to 0 if it shouldn't be logged. **/
@@ -156,12 +160,12 @@ void assert_failed_noinfo(void) NONRET;
 #define xrealloc ucw_xrealloc
 #define xfree ucw_xfree
 
-void *xmalloc(uns) LIKE_MALLOC;			/** Allocate memory and die() if there is none. **/
-void *xrealloc(void *, uns);			/** Reallocate memory and die() if there is none. **/
+void *xmalloc(size_t) LIKE_MALLOC;		/** Allocate memory and die() if there is none. **/
+void *xrealloc(void *, size_t);			/** Reallocate memory and die() if there is none. **/
 void xfree(void *);				/** Free memory allocated by xmalloc() or xrealloc(). **/
 
-void *xmalloc_zero(uns) LIKE_MALLOC;		/** Allocate memory and fill it by zeroes. **/
-char *xstrdup(const char *) LIKE_MALLOC;	/** Make a xmalloc()'ed copy of a string. **/
+void *xmalloc_zero(size_t) LIKE_MALLOC;		/** Allocate memory and fill it by zeroes. **/
+char *xstrdup(const char *) LIKE_MALLOC;	/** Make a xmalloc()'ed copy of a string. Returns NULL for NULL string. **/
 
 /*** === Trivial timers (timer.c) ***/