Changeset 383 for trunk/src/sh_files.c

Timestamp:

Dec 5, 2011, 10:30:33 PM (13 years ago)

Author:

katerina

Message:

Fix for ticket #281 (warnings from clang static analyzer).

File:

• trunk/src/sh_files.c (modified) (11 diffs)

trunk/src/sh_files.c

@@ -107 +107 @@
   po = SH_ALLOC(len+1); *po = '\0'; p = po; pend = &po[len];
 
-  i = 0; q = s;
+  q = s;
 
   do
@@ -925 +925 @@
 #endif
 
-int sh_files_push_file_int (int class, const char * str_s, size_t len, unsigned long check_mask)
+int sh_files_push_file_int (int class, const char * str_s, size_t len, 
+                            unsigned long check_mask)
 {
   dirstack_t * new_item_ptr;
   char  * fileName;
   int     ret;
-  int     count = 0;
+  volatile int     count = 0;
 
   SL_ENTER(_("sh_files_push_file_int"));
@@ -1022 +1023 @@
   glob_t  pglob;
 
-  int     count = 0;
+  volatile int     count = 0;
   volatile unsigned long check_mask = (flag == 0) ? sh_files_maskof(class) : check_mask_in;
   
@@ -1877 +1878 @@
 
 static void * sh_dummy_dirlist;
+static void * sh_dummy_tmpcat;
 
 /* -- Check a single directory and its content. Does not
@@ -1904 +1906 @@
   int             class  = 0;
   volatile int    rdepth_next;
-  int             class_next;
+  volatile int    class_next;
   volatile int    file_class_next;
-  unsigned long   check_mask_next;
+  volatile unsigned long   check_mask_next;
   volatile unsigned long   file_check_mask_next;
 
@@ -1921 +1923 @@
 
   SL_ENTER(_("sh_files_checkdir"));
-
-  sh_dummy_dirlist = (void *) &dirlist;
 
   if (sig_urgent > 0) {
@@ -2064 +2064 @@
   sl_strlcpy (theDir->DirPath, iname, PATH_MAX); 
 
+
+  sh_dummy_dirlist = (void *) &dirlist;
+  sh_dummy_tmpcat  = (void *) &tmpcat;
 
   /* ---- read ----
@@ -2347 +2350 @@
       {
         SH_FREE(theDir);
+        sh_dummy_dirlist = NULL;
         SL_RETURN((0), _("sh_files_checkdir"));
       }
@@ -2397 +2401 @@
   SH_FREE(tmpname);
   SH_FREE(theDir);
+
+  sh_dummy_dirlist = NULL;
 
   SL_RETURN((0), _("sh_files_checkdir"));
@@ -2686 +2692 @@
                         int * rdepth)
 {
-  int retval = 0;
+  volatile int retval = 0;
 #if defined(HAVE_GLOB_H) && defined(HAVE_FNMATCH_H)
   sh_globstack_t * testPattern;
@@ -2757 +2763 @@
                          unsigned long *check_mask, int *reported)
 {
-  int retval = 0;
+  volatile int retval = 0;
 #if defined(HAVE_GLOB_H) && defined(HAVE_FNMATCH_H)
   sh_globstack_t * testPattern;