Merge pull request #1939 from RincewindsHat/compiler_warnings_parentheses

Fixes for compiler warning -Wparentheses

4 files changed, 8 insertions, 7 deletions

diff --git a/lib/extra_opts.c b/lib/extra_opts.c
index b9843eba..771621d8 100644
--- a/lib/extra_opts.c
+++ b/lib/extra_opts.c
@@ -92,14 +92,14 @@ char **np_extra_opts(int *argc, char **argv, const char *plugin_name){
                         /* append the list to extra_args */
                         if(extra_args==NULL){
                                 extra_args=ea1;
-                                while(ea1=ea1->next) ea_num++;
+                                while((ea1 = ea1->next)) ea_num++;
                         }else{
                                 ea_tmp=extra_args;
                                 while(ea_tmp->next) {
                                         ea_tmp=ea_tmp->next;
                                 }
                                 ea_tmp->next=ea1;
-                                while(ea1=ea1->next) ea_num++;
+                                while((ea1 = ea1->next)) ea_num++;
                         }
                         ea1=ea_tmp=NULL;
                 }
diff --git a/lib/utils_base.c b/lib/utils_base.c
index 3c7221c8..f86efbeb 100644
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -331,7 +331,7 @@ char *np_extract_value(const char *varlist, const char *name, char sep) {
                                 /* strip leading spaces */
                                 for (; isspace(varlist[0]); varlist++);
 
-                                if (tmp = index(varlist, sep)) {
+                                if ((tmp = index(varlist, sep))) {
                                         /* Value is delimited by a comma */
                                         if (tmp-varlist == 0) continue;
                                         value = (char *)calloc(1, tmp-varlist+1);
@@ -347,7 +347,7 @@ char *np_extract_value(const char *varlist, const char *name, char sep) {
                                 break;
                         }
                 }
-                if (tmp = index(varlist, sep)) {
+                if ((tmp = index(varlist, sep))) {
                         /* More keys, keep going... */
                         varlist = tmp + 1;
                 } else {
diff --git a/plugins/check_http.c b/plugins/check_http.c
index 718c8ee7..b9d8145c 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -1094,7 +1094,7 @@ check_http (void)
       microsec_firstbyte = deltime (tv_temp);
       elapsed_time_firstbyte = (double)microsec_firstbyte / 1.0e6;
     }
-    while (pos = memchr(buffer, '\0', i)) {
+    while ((pos = memchr(buffer, '\0', i))) {
       /* replace nul character with a blank */
       *pos = ' ';
     }
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index c17c6996..1637e3e3 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -241,8 +241,9 @@ main (int argc, char **argv)
 
                         /* Ignore self */
                         if ((usepid && mypid == procpid) ||
-                                (!usepid && ((ret = stat_exe(procpid, &statbuf) != -1) && statbuf.st_dev == mydev && statbuf.st_ino == myino) ||
-                                 (ret == -1 && errno == ENOENT))) {
+                                ( ((!usepid) && ((ret = stat_exe(procpid, &statbuf) != -1) && statbuf.st_dev == mydev && statbuf.st_ino == myino)) ||
+                                 (ret == -1 && errno == ENOENT))
+                                ) {
                                 if (verbose >= 3)
                                          printf("not considering - is myself or gone\n");
                                 continue;