Merge branch 'improvements'

* improvements: Makefile: Build and run tests by default mx_log: Fix typo "ALERT" mxq_log: Use mx_streq()
mariux · Oct 26, 2015 · 05bd9d9 · 05bd9d9
2 parents c67084b + e345231
commit 05bd9d9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -186,7 +186,7 @@ manpages/%: manpages/%.xml
 .PHONY: all
 .PHONY: build
 
-all: build
+all: build test
 
 .PHONY: devel
 devel: CFLAGS += -DMXQ_DEVELOPMENT

diff --git a/mx_log.c b/mx_log.c
@@ -109,7 +109,7 @@ static int log_log(int level, int loglevel, char *file, unsigned long line, cons
             prefix = "EMERGENCY: ";
             break;
         case MX_LOG_ALERT:
-            prefix = "AKERT: ";
+            prefix = "ALERT: ";
             break;
         case MX_LOG_CRIT:
             prefix = "CRITCAL ERROR: ";

diff --git a/mxq_log.c b/mxq_log.c
@@ -8,6 +8,8 @@
 #include <unistd.h>
 
 #include "mx_log.h"
+#include "mx_util.h"
+
 #ifndef mx_free_null
 #include <stdlib.h>
 #define mx_free_null(a) do { free((a)); (a) = NULL; } while(0)
@@ -42,7 +44,6 @@ static int timetag(char *buf, size_t size)
 
 int mx_log_print(char *msg, size_t len)
 {
-    int res;
     char timebuf[1024];
 
     static char *lastmsg = NULL;
@@ -61,8 +62,7 @@ int mx_log_print(char *msg, size_t len)
         return -(errno=EINVAL);
 
     if (lastmsg && lastlen == len) {
-        res = strcmp(msg, lastmsg);
-        if (res == 0) {
+        if (mx_streq(msg, lastmsg)) {
             cnt++;
             mx_free_null(msg);
             return 2;