kernelcompat: remove old definitions that are now unused

[ust.git] / include / usterr.h

diff --git a/include/usterr.h b/include/usterr.h
index a32b0b6603d66a347409bcbd66bcbc96961182df..067866ab23c0117086f52ad334da9cb1c6b25148 100644 (file)
--- a/include/usterr.h
+++ b/include/usterr.h
@@ -23,6 +23,8 @@
  * signal handlers, so we must use a print method which is signal safe.
  */
 
+extern int ust_safe_snprintf(char *str, size_t n, const char *fmt, ...);
+
 #define sigsafe_print_err(fmt, args...) \
 { \
        /* Can't use dynamic allocation. Limit ourselves to 250 chars. */ \
@@ -32,7 +34,7 @@
        /* Save the errno. */ \
        ____saved_errno = errno; \
 \
-       snprintf(____buf, sizeof(____buf), fmt, ## args); \
+       ust_safe_snprintf(____buf, sizeof(____buf), fmt, ## args); \
 \
        /* Add end of string in case of buffer overflow. */ \
        ____buf[sizeof(____buf)-1] = 0; \
@@ -46,13 +48,14 @@
 
 #define UST_STR_COMPONENT XSTR(UST_COMPONENT)
 
-#define ERRMSG(fmt, args...) do { sigsafe_print_err(UST_STR_COMPONENT "[%ld/%ld]: " fmt " (" __FILE__ ":" XSTR(__LINE__) ")\n", (long) getpid(), (long) syscall(SYS_gettid), ## args); fflush(stderr); } while(0)
+#define ERRMSG(fmt, args...) do { sigsafe_print_err(UST_STR_COMPONENT "[%ld/%ld]: " fmt " (in %s() at " __FILE__ ":" XSTR(__LINE__) ")\n", (long) getpid(), (long) syscall(SYS_gettid), ## args, __func__); fflush(stderr); } while(0)
 
-/*#define DEBUG*/
-#ifdef DEBUG
+#ifdef UST_DEBUG
 # define DBG(fmt, args...) ERRMSG(fmt, ## args)
+# define DBG_raw(fmt, args...) do { sigsafe_print_err(fmt, ## args); fflush(stderr); } while(0)
 #else
 # define DBG(fmt, args...) do {} while(0)
+# define DBG_raw(fmt, args...) do {} while(0)
 #endif
 #define WARN(fmt, args...) ERRMSG("Warning: " fmt, ## args)
 #define ERR(fmt, args...) ERRMSG("Error: " fmt, ## args)
@@ -77,5 +80,6 @@
 
 #define BUG_ON(condition) do { if (unlikely(condition)) ERR("condition not respected (BUG)"); } while(0)
 #define WARN_ON(condition) do { if (unlikely(condition)) WARN("condition not respected on line %s:%d", __FILE__, __LINE__); } while(0)
+#define WARN_ON_ONCE(condition) WARN_ON(condition)
 
 #endif /* USTERR_H */