Add debug strerr macros, add __func__ support to tracing macros

Signed-off-by: Laurent Bercot <ska@appnovation.com>

1 files changed, 30 insertions, 4 deletions

diff --git a/src/include/skalibs/strerr.h b/src/include/skalibs/strerr.h
index 085d7b7..2448981 100644
--- a/src/include/skalibs/strerr.h
+++ b/src/include/skalibs/strerr.h
@@ -61,13 +61,17 @@ extern char const *PROG ;
 
 #define strerr_warnin(n, ...) strerr_warnn((n)+2, PROG, ": info: ", __VA_ARGS__)
 #define strerr_warninsys(n, ...) strerr_warnnsys((n)+2, PROG, ": info: ", __VA_ARGS__)
-#define strerr_warntn(n, ...) strerr_warnn((n)+2, PROG, ": tracing: ", __VA_ARGS__)
-#define strerr_warntnsys(n, ...) strerr_warnnsys((n)+2, PROG, ": tracing: ", __VA_ARGS__)
+#define strerr_warntn(n, ...) strerr_warnn((n)+4, PROG, ": tracing: in ", __func__, ": ", __VA_ARGS__)
+#define strerr_warntnsys(n, ...) strerr_warnnsys((n)+4, PROG, ": tracing: in ", __func__, ": ", __VA_ARGS__)
+#define strerr_warndn(n, ...) strerr_warnn((n)+4, PROG, ": debug: in ", __func__, ": ", __VA_ARGS__)
+#define strerr_warndnsys(n, ...) strerr_warnnsys((n)+4, PROG, ": debug: in ", __func__, ": ", __VA_ARGS__)
 
 #define strerr_warni(...) strerr_warn(PROG, ": info: ", __VA_ARGS__)
 #define strerr_warnisys(...) strerr_warnsys(PROG, ": info: ", __VA_ARGS__)
-#define strerr_warnt(...) strerr_warn(PROG, ": tracing: ", __VA_ARGS__)
-#define strerr_warntsys(...) strerr_warnsys(PROG, ": tracing: ", __VA_ARGS__)
+#define strerr_warnt(...) strerr_warn(PROG, ": tracing: in ", __func__, ": ", __VA_ARGS__)
+#define strerr_warntsys(...) strerr_warnsys(PROG, ": tracing: in ", __func__, ": ", __VA_ARGS__)
+#define strerr_warnd(...) strerr_warn(PROG, ": debug: in ", __func__, ": ", __VA_ARGS__)
+#define strerr_warndsys(...) strerr_warnsys(PROG, ": debug: in ", __func__, ": ", __VA_ARGS__)
 
 #define strerr_dieusage(e, u) strerr_dien(e, 3, PROG, ": usage: ", u)
 #define strerr_dienotset(e, x) strerr_diefn(e, 2, (x), " not set")
@@ -297,4 +301,26 @@ extern char const *PROG ;
 #define strerr_warnt9sys(x1, x2, x3, x4, x5, x6, x7, x8, x9) strerr_warntnsys(9, x1, x2, x3, x4, x5, x6, x7, x8, x9)
 #define strerr_warnt10sys(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10) strerr_warntnsys(10, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10)
 
+#define strerr_warnd1x(x1) strerr_warndn(1, x1)
+#define strerr_warnd2x(x1, x2) strerr_warndn(2, x1, x2)
+#define strerr_warnd3x(x1, x2, x3) strerr_warndn(3, x1, x2, x3)
+#define strerr_warnd4x(x1, x2, x3, x4) strerr_warndn(4, x1, x2, x3, x4)
+#define strerr_warnd5x(x1, x2, x3, x4, x5) strerr_warndn(5, x1, x2, x3, x4, x5)
+#define strerr_warnd6x(x1, x2, x3, x4, x5, x6) strerr_warndn(6, x1, x2, x3, x4, x5, x6)
+#define strerr_warnd7x(x1, x2, x3, x4, x5, x6, x7) strerr_warndn(7, x1, x2, x3, x4, x5, x6, x7)
+#define strerr_warnd8x(x1, x2, x3, x4, x5, x6, x7, x8) strerr_warndn(8, x1, x2, x3, x4, x5, x6, x7, x8)
+#define strerr_warnd9x(x1, x2, x3, x4, x5, x6, x7, x8, x9) strerr_warndn(9, x1, x2, x3, x4, x5, x6, x7, x8, x9)
+#define strerr_warnd10x(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10) strerr_warndn(10, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10)
+
+#define strerr_warnd1sys(x1) strerr_warndnsys(1, x1)
+#define strerr_warnd2sys(x1, x2) strerr_warndnsys(2, x1, x2)
+#define strerr_warnd3sys(x1, x2, x3) strerr_warndnsys(3, x1, x2, x3)
+#define strerr_warnd4sys(x1, x2, x3, x4) strerr_warndnsys(4, x1, x2, x3, x4)
+#define strerr_warnd5sys(x1, x2, x3, x4, x5) strerr_warndnsys(5, x1, x2, x3, x4, x5)
+#define strerr_warnd6sys(x1, x2, x3, x4, x5, x6) strerr_warndnsys(6, x1, x2, x3, x4, x5, x6)
+#define strerr_warnd7sys(x1, x2, x3, x4, x5, x6, x7) strerr_warndnsys(7, x1, x2, x3, x4, x5, x6, x7)
+#define strerr_warnd8sys(x1, x2, x3, x4, x5, x6, x7, x8) strerr_warndnsys(8, x1, x2, x3, x4, x5, x6, x7, x8)
+#define strerr_warnd9sys(x1, x2, x3, x4, x5, x6, x7, x8, x9) strerr_warndnsys(9, x1, x2, x3, x4, x5, x6, x7, x8, x9)
+#define strerr_warnd10sys(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10) strerr_warndnsys(10, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10)
+
 #endif