Clean up compiler warnings from { gcc -Wall }, many of which I introduced with

[exim.git] / src / src / malware.c

diff --git a/src/src/malware.c b/src/src/malware.c
index 61b0c299467c17da27e209889991bc515b3aff23..f82bef63e51466e2c84bb0db71700ac66091a632 100644 (file)
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/malware.c,v 1.20 2010/06/06 22:46:34 pdp Exp $ */
+/* $Cambridge: exim/src/src/malware.c,v 1.21 2010/06/07 00:12:42 pdp Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -106,23 +106,23 @@ malware_in_file(uschar *eml_filename) {
   uschar message_id_buf[64];
   int ret;
 
-  scan_options[0] = "*";
+  scan_options[0] = US"*";
   scan_options[1] = NULL;
 
   /* spool_mbox() assumes various parameters exist, when creating
   the relevant directory and the email within */
   (void) string_format(message_id_buf, sizeof(message_id_buf),
-      US"dummy-%d", pseudo_random_number(INT_MAX));
+      "dummy-%d", pseudo_random_number(INT_MAX));
   message_id = message_id_buf;
-  sender_address = "malware-sender@example.net";
-  return_path = "";
+  sender_address = US"malware-sender@example.net";
+  return_path = US"";
   recipients_list = NULL;
-  receive_add_recipient("malware-victim@example.net", -1);
+  receive_add_recipient(US"malware-victim@example.net", -1);
   enable_dollar_recipients = TRUE;
 
   ret = malware_internal(scan_options, eml_filename, TRUE);
 
-  strncpy(spooled_message_id, message_id, sizeof(spooled_message_id));
+  Ustrncpy(spooled_message_id, message_id, sizeof(spooled_message_id));
   spool_mbox_ok = 1;
   /* don't set no_mbox_unspool; at present, there's no way for it to become
   set, but if that changes, then it should apply to these tests too */
@@ -891,7 +891,7 @@ static int malware_internal(uschar **listptr, uschar *eml_filename, BOOL faking)
         log_write(0, LOG_MAIN|LOG_PANIC,
             "malware filename does not fit in buffer [malware_internal() kavdaemon]");
       }
-      p = strrchr(scanrequest, '/');
+      p = Ustrrchr(scanrequest, '/');
       if (p)
         *p = '\0';
 
@@ -1098,7 +1098,7 @@ static int malware_internal(uschar **listptr, uschar *eml_filename, BOOL faking)
             "malware filename does not fit in buffer [malware_internal() cmdline]");
         return DEFER;
         }
-      p = strrchr(eml_filename, '/');
+      p = Ustrrchr(eml_filename, '/');
       if (p)
         *p = '\0';
       fits = string_format(commandline, sizeof(commandline), CS cmdline_scanner, file_name);
@@ -1199,7 +1199,6 @@ static int malware_internal(uschar **listptr, uschar *eml_filename, BOOL faking)
       struct sockaddr_un server;
       int sock, len;
       uschar *p;
-      BOOL fits;
       uschar file_name[1024];
       uschar av_buffer[1024];
 
@@ -1236,7 +1235,7 @@ static int malware_internal(uschar **listptr, uschar *eml_filename, BOOL faking)
         return DEFER;
         }
       memcpy(file_name, eml_filename, len);
-      p = strrchr(file_name, '/');
+      p = Ustrrchr(file_name, '/');
       if (p)
         *p = '\0';
 
@@ -1311,12 +1310,12 @@ static int malware_internal(uschar **listptr, uschar *eml_filename, BOOL faking)
       uschar clamd_options2_buffer[1024];
       uschar clamd_options2_default[] = "";
       uschar *clamav_fbuf;
-      uschar scanrequest[1024];
-      int sockData, clam_fd, result;
+      int clam_fd, result;
       unsigned int fsize;
       BOOL use_scan_command, fits;
 #ifdef WITH_OLD_CLAMAV_STREAM
       uschar av_buffer2[1024];
+      int sockData;
 #else
       uint32_t send_size, send_final_zeroblock;
 #endif