From e0da38e697e5dc2a95a3553e4b055264509a59b0 Mon Sep 17 00:00:00 2001
From: Bruno Raoult <braoult@gmail.com>
Date: Mon, 11 Dec 2023 14:59:30 +0100
Subject: [PATCH] debug.[ch]: remove dependancies from bits.h

---
 include/debug.h | 30 +++++++++++++++---------------
 libsrc/debug.c  | 39 +++++++++++++++++++--------------------
 2 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/include/debug.h b/include/debug.h
index c468d15..db65aba 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -19,7 +19,6 @@
 #include <stdint.h>
 
 #include <br.h>
-#include <bits.h>
 
 #define NANOSEC  1000000000                       /* nano sec in sec */
 #define MILLISEC 1000000                          /* milli sec in sec */
@@ -28,28 +27,29 @@
 
 #ifdef DEBUG_DEBUG
 
-void debug_init(uint level, FILE *stream, bool flush);
-void debug_level_set(uint level);
-uint debug_level_get(void);
+void debug_init(int level, FILE *stream, bool flush);
+void debug_level_set(int level);
+int debug_level_get(void);
 void debug_stream_set(FILE *stream);
 long long debug_timer_elapsed(void);
 void debug_flush_set(bool flush);
-void _printf debug(uint level, bool timestamp,
-                   uint indent, const char *src,
-                   uint line, const char *fmt, ...);
+void _printf debug(int level, bool timestamp,
+                   int indent, const char *src,
+                   int line, const char *fmt, ...);
+
 #else  /* DEBUG_DEBUG */
 
-static inline void debug_init(__unused uint level,
+static inline void debug_init(__unused int level,
                               __unused FILE *stream,
-                              _unused bool flush) {}
-static inline void debug_level_set(__unused uint level) {}
-static inline uint debug_level_get(void) {return 0;}
+                              __unused bool flush) {}
+static inline void debug_level_set(__unused int level) {}
+static inline int debug_level_get(void) {return 0;}
 static inline void debug_stream_set(__unused FILE *stream) {}
-static inline long long debug_timer_elapsed(void) {return 0LL};
+static inline long long debug_timer_elapsed(void) {return 0LL;}
 static inline void debug_flush_set(__unused bool level) {}
-static inline void _printf debug(__unused uint level, __unused bool timestamp,
-                                 __unused uint indent, __unused const char *src,
-                                 __unused uint line, __unused const char *fmt, ...) {}
+static inline void _printf debug(__unused int level, __unused bool timestamp,
+                                 __unused int indent, __unused const char *src,
+                                 __unused int line, __unused const char *fmt, ...) {}
 
 #endif  /* DEBUG_DEBUG */
 
diff --git a/libsrc/debug.c b/libsrc/debug.c
index 1ce280b..866affb 100644
--- a/libsrc/debug.c
+++ b/libsrc/debug.c
@@ -19,21 +19,20 @@
 #define DEBUG_DEBUG
 #endif
 
-#include "bits.h"
 #include "debug.h"
 
 static long long timer_start;                     /* in nanosecond */
-static uint debug_level = 0;
-static bool debug_flush = false;
-static FILE *stream = NULL;
+static int level = 0;                             /* output log when < level */
+static int flush = false;                         /* force flush after logs */
+static FILE *stream = NULL;                       /* stream to use */
 
 /**
  * debug_level_set() - set debug level.
- * @level: unsigned debug level.
+ * @_level: debug level (integer).
  */
-void debug_level_set(uint level)
+void debug_level_set(int _level)
 {
-    debug_level = level;
+    level = _level;
 #   ifdef DEBUG_DEBUG_C
     log(0, "debug level set to %u\n", level);
 #   endif
@@ -41,11 +40,11 @@ void debug_level_set(uint level)
 
 /**
  * debug_level_get() - get debug level.
- * @return: current level debug (unsigned integer).
+ * @return: current level debug (integer).
  */
-uint debug_level_get(void)
+int debug_level_get(void)
 {
-    return debug_level;
+    return level;
 }
 
 void debug_stream_set(FILE *_stream)
@@ -56,21 +55,21 @@ void debug_stream_set(FILE *_stream)
 #   endif
 }
 
-void debug_flush_set(bool flush)
+void debug_flush_set(bool _flush)
 {
-    debug_flush = flush;
+    flush = _flush;
 #   ifdef DEBUG_DEBUG_C
     log(0, "debug flush %s.\n", flush? "set": "unset");
 #   endif
 }
 
-void debug_init(uint level, FILE *_stream, bool flush)
+void debug_init(int _level, FILE *_stream, bool _flush)
 {
     struct timespec timer;
 
     debug_stream_set(_stream);
-    debug_level_set(level);
-    debug_flush_set(flush);
+    debug_level_set(_level);
+    debug_flush_set(_flush);
     if (!clock_gettime(CLOCK_MONOTONIC, &timer)) {
         timer_start = timer.tv_sec * NANOSEC + timer.tv_nsec;
     }
@@ -90,16 +89,16 @@ long long debug_timer_elapsed(void)
 
 /**
  * debug() - log function
- * @level: log level
+ * @lev: log level
  * @timestamp: boolean, print timestamp if true
  * @indent: indent level (2 spaces each)
  * @src: source file/func name (or NULL)
  * @line: line number
  */
-void debug(uint level, bool timestamp, uint indent, const char *src,
-           uint line, const char *fmt, ...)
+void debug(int lev, bool timestamp, int indent, const char *src,
+           int line, const char *fmt, ...)
 {
-    if (!stream || level > debug_level)
+    if (!stream || lev > level)
         return;
 
     va_list ap;
@@ -122,7 +121,7 @@ void debug(uint level, bool timestamp, uint indent, const char *src,
     va_start(ap, fmt);
     vfprintf(stream, fmt, ap);
     va_end(ap);
-    if (debug_flush)
+    if (flush)
         fflush(stream);
 }