loglevel bitmasks needs to be larger because we got more than 32 files

diff --git a/Makefile b/Makefile
index 93c98e1e6d01456804fd31fe9b132c732639b311..b2b1b0364020f2ab881c01cc6f353e2fd7d13383 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ endif
 # Depend on the specific file (.c for each .o) and on all headers
 src/%.o: src/%.c ${HEADERS}
        echo "CC $<"
-       $(CC) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/$(shell basename $< .c)/ { print NR }' loglevels.tmp))" -c -o $@ $<
+       $(CC) $(CFLAGS) -DLOGLEVEL="((uint64_t)1 << $(shell awk '/$(shell basename $< .c)/ { print NR }' loglevels.tmp))" -c -o $@ $<
 
 all: src/cfgparse.y.o src/cfgparse.yy.o src/cmdparse.y.o src/cmdparse.yy.o ${FILES}
        echo "LINK i3"

diff --git a/include/log.h b/include/log.h
index 6d529a00f27133b524e3c9a6171898634b027c2c..9b284f0aacf2f4698fbff8526d0c129525d6939d 100644 (file)
--- a/include/log.h
+++ b/include/log.h
@@ -41,7 +41,7 @@ void set_verbosity(bool _verbose);
  * but only if the corresponding debug loglevel was activated.
  *
  */
-void debuglog(int lev, char *fmt, ...);
+void debuglog(uint64_t lev, char *fmt, ...);
 
 /**
  * Logs the given message to stdout while prefixing the current time to it.

diff --git a/src/log.c b/src/log.c
index 28b51423bbd9916face38f59ea24c8c3453b5064..a899efcb4e2de5ed72350887e724592b24e4d96a 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -21,7 +21,7 @@
 /* loglevels.h is autogenerated at make time */
 #include "loglevels.h"
 
-static uint32_t loglevel = 0;
+static uint64_t loglevel = 0;
 static bool verbose = true;
 
 /**
@@ -41,7 +41,7 @@ void set_verbosity(bool _verbose) {
 void add_loglevel(const char *level) {
        /* Handle the special loglevel "all" */
        if (strcasecmp(level, "all") == 0) {
-               loglevel = UINT32_MAX;
+               loglevel = UINT64_MAX;
                return;
        }
 
@@ -109,7 +109,7 @@ void errorlog(char *fmt, ...) {
  * This is to be called by DLOG() which includes filename/linenumber
  *
  */
-void debuglog(int lev, char *fmt, ...) {
+void debuglog(uint64_t lev, char *fmt, ...) {
        va_list args;
 
        if ((loglevel & lev) == 0)