likely mistake

diff --git a/proc/procps.h b/proc/procps.h
index 16bdcd37ec967ade1ee5a54a28c8b4ae0445a657..76cc707a695355ece97ec6de61eba38cc24dea77 100644 (file)
--- a/proc/procps.h
+++ b/proc/procps.h
@@ -25,8 +25,8 @@
 // won't alias anything, and aligned enough for anything
 #define MALLOC __attribute__ ((__malloc__))
 // tell gcc what to expect:   if(unlikely(err)) die(err);
-#define likely(x)       __builtin_expect((x),1)
-#define unlikely(x)     __builtin_expect((x),0)
+#define likely(x)       __builtin_expect(!!(x),1)
+#define unlikely(x)     __builtin_expect(!!(x),0)
 #else
 #define MALLOC
 #define likely(x)       (x)

diff --git a/proc/readproc.c b/proc/readproc.c
index a25a024ecdb1c99aae5903befa23251b1571d1e9..6ed06620b8deb7c3afd522f6c2d6350d13bce137 100644 (file)
--- a/proc/readproc.c
+++ b/proc/readproc.c
@@ -99,11 +99,11 @@ static void status2proc(const char *S, proc_t *restrict P){
     P->cmd[i] = '\0';
 
     tmp = strstr (S,"State:\t");
-    if(likely((long)tmp)) P->state = tmp[7];
+    if(likely(tmp)) P->state = tmp[7];
     else fprintf(stderr, "Internal error!\n");
 
     tmp = strstr (S,"Pid:");
-    if(likely((long)tmp)) sscanf (tmp,
+    if(likely(tmp)) sscanf (tmp,
         "Pid:\t%d\n"
         "PPid:\t%d\n",
         &P->pid,
@@ -112,21 +112,21 @@ static void status2proc(const char *S, proc_t *restrict P){
     else fprintf(stderr, "Internal error!\n");
 
     tmp = strstr (S,"Uid:");
-    if(likely((long)tmp)) sscanf (tmp,
+    if(likely(tmp)) sscanf (tmp,
         "Uid:\t%d\t%d\t%d\t%d",
         &P->ruid, &P->euid, &P->suid, &P->fuid
     );
     else fprintf(stderr, "Internal error!\n");
 
     tmp = strstr (S,"Gid:");
-    if(likely((long)tmp)) sscanf (tmp,
+    if(likely(tmp)) sscanf (tmp,
         "Gid:\t%d\t%d\t%d\t%d",
         &P->rgid, &P->egid, &P->sgid, &P->fgid
     );
     else fprintf(stderr, "Internal error!\n");
 
     tmp = strstr (S,"VmSize:");
-    if(likely((long)tmp)) sscanf (tmp,
+    if(likely(tmp)) sscanf (tmp,
         "VmSize: %lu kB\n"
         "VmLck: %lu kB\n"
         "VmRSS: %lu kB\n"
@@ -149,7 +149,7 @@ static void status2proc(const char *S, proc_t *restrict P){
     }
 
     tmp = strstr (S,"SigPnd:");
-    if(likely((long)tmp)) sscanf (tmp,
+    if(likely(tmp)) sscanf (tmp,
 #ifdef SIGNAL_STRING
         "SigPnd: %s SigBlk: %s SigIgn: %s %*s %s",
         P->signal, P->blocked, P->sigignore, P->sigcatch