Tidying: coverity issues

diff --git a/src/exim_monitor/em_queue.c b/src/exim_monitor/em_queue.c
index 893e438989ec6677927789b48020925b84327b10..103e63dd42eb8e71c6f680bdfc314a0d8f488160 100644 (file)
--- a/src/exim_monitor/em_queue.c
+++ b/src/exim_monitor/em_queue.c
@@ -656,32 +656,30 @@ if (jread != NULL)
 been delivered, and removing visible names. In the nonrecipients tree,
 domains are lower cased. */
 
 been delivered, and removing visible names. In the nonrecipients tree,
 domains are lower cased. */
 

-if (recipients_list != NULL)
-  {
+if (recipients_list)

   for (i = 0; i < recipients_count; i++)
     {
     uschar *pp;
     uschar *r = recipients_list[i].address;
     tree_node *node = tree_search(tree_nonrecipients, r);
 
   for (i = 0; i < recipients_count; i++)
     {
     uschar *pp;
     uschar *r = recipients_list[i].address;
     tree_node *node = tree_search(tree_nonrecipients, r);
 

-    if (node == NULL)
+    if (!node)

       {
       uschar temp[256];
       uschar *rr = temp;
       {
       uschar temp[256];
       uschar *rr = temp;

-      Ustrcpy(temp, r);
-      while (*rr != 0 && *rr != '@') rr++;
-      while (*rr != 0) { *rr = tolower(*rr); rr++; }
+      Ustrncpy(temp, r, sizeof(temp));
+      while (*rr && *rr != '@') rr++;
+      while (*rr) { *rr = tolower(*rr); rr++; }

       node = tree_search(tree_nonrecipients, temp);
       }
 
       node = tree_search(tree_nonrecipients, temp);
       }
 

-    if ((pp = strstric(r+1, qualify_domain, FALSE)) != NULL &&
-      *(--pp) == '@') *pp = 0;
-    if (node == NULL)
+    if ((pp = strstric(r+1, qualify_domain, FALSE)) && *(--pp) == '@')
+       *pp = 0;
+    if (!node)

       (void)find_dest(p, r, dest_add, FALSE);
     else
       (void)find_dest(p, r, dest_remove, FALSE);
     }
       (void)find_dest(p, r, dest_add, FALSE);
     else
       (void)find_dest(p, r, dest_remove, FALSE);
     }

-  }

 
 /* We also need to scan the tree of non-recipients, which might
 contain child addresses that are not in the recipients list, but
 
 /* We also need to scan the tree of non-recipients, which might
 contain child addresses that are not in the recipients list, but

diff --git a/src/src/queue.c b/src/src/queue.c
index f53759c43ee0e92bf1a6e346dd5d4cbea5cbec1e..1b7b9f74c51e9f8d7eedfdf871b8d8cb496dbca1 100644 (file)
--- a/src/src/queue.c
+++ b/src/src/queue.c
@@ -1378,7 +1378,6 @@ switch(action)
     }
 
   if (yield)
     }
 
   if (yield)

-    {

     if (spool_write_header(id, SW_MODIFYING, &errmsg) >= 0)
       printf("has been modified\n");
     else
     if (spool_write_header(id, SW_MODIFYING, &errmsg) >= 0)
       printf("has been modified\n");
     else


@@ -1386,7 +1385,6 @@ switch(action)
       yield = FALSE;
       printf("- while %s: %s\n", doing, errmsg);
       }
       yield = FALSE;
       printf("- while %s: %s\n", doing, errmsg);
       }

-    }

 
   break;
   }
 
   break;
   }


@@ -1394,8 +1392,11 @@ switch(action)
 /* Closing the datafile releases the lock and permits other processes
 to operate on the message (if it still exists). */
 
 /* Closing the datafile releases the lock and permits other processes
 to operate on the message (if it still exists). */
 

-(void)close(deliver_datafile);
-deliver_datafile = -1;
+if (deliver_datafile >= 0)
+  {
+  (void)close(deliver_datafile);
+  deliver_datafile = -1;
+  }

 return yield;
 }
 
 return yield;
 }
 

diff --git a/src/src/spool_in.c b/src/src/spool_in.c
index 7eb42907c6e40aa324fd3c2b581c31cf516af766..915798784297ac9f2593708705b4ce4e75657073 100644 (file)
--- a/src/src/spool_in.c
+++ b/src/src/spool_in.c
@@ -63,8 +63,8 @@ for (i = 0; i < 2; i++)
     if (i == 0) continue;
     if (!queue_running)
       log_write(0, LOG_MAIN, "Spool%s%s file %s-D not found",
     if (i == 0) continue;
     if (!queue_running)
       log_write(0, LOG_MAIN, "Spool%s%s file %s-D not found",

-       *queue_name ? " Q=" : "",
-       *queue_name ? queue_name : "",
+       *queue_name ? US" Q=" : US"",
+       *queue_name ? queue_name : US"",

        id);
     }
   else
        id);
     }
   else