Changeset 362 for trunk/src/sh_log_check.c

Timestamp:

Oct 19, 2011, 12:16:31 AM (13 years ago)

Author:

katerina

Message:

Fix for ticket #267 (Multiple compiler warnings with gcc 4.6.1).

File:

• trunk/src/sh_log_check.c (modified) (4 diffs)

trunk/src/sh_log_check.c

@@ -1027 +1027 @@
  *  Reader for binary files 
  */
-sh_string * sh_binary_reader (void * s, size_t size, struct sh_logfile * logfile)
+sh_string * sh_binary_reader (void * s, size_t size, 
+                              struct sh_logfile * logfile)
 {
   size_t         status;
@@ -1040 +1041 @@
       if (status != 1)
         {
+          memset(s, '\0', size);
           if (ferror(logfile->fp) && (logfile->flags & SH_LOGFILE_PIPE) == 0)
             {
@@ -1053 +1055 @@
           sl_fclose(FIL__, __LINE__, logfile->fp);
           logfile->fp = NULL;
-          memset(s, '\0', size);
           return NULL;
         }
@@ -1387 +1388 @@
       retval = -1;
     }
-
-  sh_logmon_interval = (time_t) val;
-  SL_RETURN(0, _("sh_logmon_set_interval"));
+  else
+    {
+      sh_logmon_interval = (time_t) val;
+    }
+  SL_RETURN(retval, _("sh_logmon_set_interval"));
 }