Changeset 587

Timestamp:

Oct 20, 2025, 10:42:43 PM (12 hours ago)

Author:

katerina

Message:

Fix for ticket #475 (compiler warnings about unused variables).

Location:

trunk/src

Files:

• sh_dbIO.c (modified) (4 diffs)
• sh_mem.c (modified) (4 diffs)
• sh_string.c (modified) (2 diffs)
• sh_tiger0.c (modified) (10 diffs)

trunk/src/sh_dbIO.c

@@ -890 +890 @@
 {
   sh_file_t * p;
-  int count = 0;
   int errflag = 0;
   char * line = SH_ALLOC(MAX_PATH_STORE+2);
@@ -916 +915 @@
           else
             sh_hash_remove_unconditional (p->fullpath);
-          ++count;
         }
       else
@@ -1481 +1479 @@
                                     const char * outpath, int truncate)
 {
-  static long p_count = 0;
   sh_filestore_t p;
   char *  fullpath = NULL;
@@ -1559 +1556 @@
     {
       write_record(pushdata_fd, &p, fullpath, linkpath, attr_string);
-      ++p_count;
     }
 

trunk/src/sh_mem.c

@@ -180 +180 @@
   memlist_t * merrlist = NULL;
   memlist_t * merr;
-  long        nerr = 0;
 
   SL_ENTER(_("sh_mem_check"));
@@ -205 +204 @@
           merr->next = merrlist;
           merrlist   = merr;
-          ++nerr;
         }
       else
@@ -218 +216 @@
               merr->next = merrlist;
               merrlist   = merr;
-              ++nerr;
             }
           if ( this->real_address[SH_MEMMULT-1] != CHECKBYTE )
@@ -229 +226 @@
               merr->next = merrlist;
               merrlist   = merr;
-              ++nerr;
             }
         }

trunk/src/sh_string.c

@@ -644 +644 @@
               len = (size_t) tlen;
 
-              if (tlen > 0 && r->siz > (r->len + len) &&
-                  &(s->str[ovector[last]]) )
+              if (tlen > 0 && r->siz > (r->len + len) /* && &(s->str[ovector[last]]) always true */ )
                 {
                   memcpy(p, &(s->str[ovector[last]]), (size_t)len);
@@ -676 +675 @@
             {
               len = (size_t)tlen;
-              if (r->siz >= (r->len + len) &&
-                  &(s->str[ovector[2*i -1]]) ) {
+              if (r->siz >= (r->len + len) /* && &(s->str[ovector[2*i -1]]) always true */ ) {
                 memcpy(p, &(s->str[ovector[2*i -1]]), (size_t)len);
                 p += (len - 1); 

trunk/src/sh_tiger0.c

@@ -134 +134 @@
 
   sh_byte * buffer = SH_ALLOC(PRIV_MAX + 72);
-
-  unsigned long pages_read;
   uid_t   euid;
 
@@ -142 +140 @@
 
 #if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE)
+  unsigned long pages_read;
   /*@-nestedextern@*/
   extern long IO_Limit;
@@ -219 +218 @@
 #endif
 
+#if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE) 
     pages_read = 0;
+#endif
 
     while (1) 
@@ -228 +229 @@
           count = sl_read         (fd, buffer, PRIV_MAX);
 
+#if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE) 
         ++pages_read;
+#endif
 
         if (SL_ISERROR (count)) 
@@ -873 +876 @@
   sh_string * content;
 
+#if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE)
   unsigned long pages_read;
-#if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE) 
+
   /*@-nestedextern@*/
   extern long IO_Limit;
@@ -896 +900 @@
     }
 
+#if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE)
   pages_read = 0;
-
+#endif
+  
   content = sl_get_content(fd);
 
@@ -967 +973 @@
            && n != 0);
 
+#if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE)
     ++pages_read;
+#endif
 
     /* If end of file is reached, end the loop.  */
@@ -1417 +1425 @@
   sh_string * content;
 
+#if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE) 
   unsigned long pages_read;
-#if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE) 
+
   /*@-nestedextern@*/
   extern long IO_Limit;
@@ -1445 +1454 @@
   /* Iterate over full file contents.  */
 
+#if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE) 
   pages_read = 0;
-
+#endif
+  
   content = sl_get_content(fd);
 
@@ -1515 +1526 @@
            && n != 0);
 
+#if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE) 
     ++pages_read;
-
+#endif
+    
     /* If end of file is reached, end the loop.  */
     if (n == 0)