Index: trunk/src/sh_dbIO.c
===================================================================
--- trunk/src/sh_dbIO.c	(revision 584)
+++ trunk/src/sh_dbIO.c	(revision 587)
@@ -890,5 +890,4 @@
 {
   sh_file_t * p;
-  int count = 0;
   int errflag = 0;
   char * line = SH_ALLOC(MAX_PATH_STORE+2);
@@ -916,5 +915,4 @@
 	  else
 	    sh_hash_remove_unconditional (p->fullpath);
-	  ++count;
 	}
       else
@@ -1481,5 +1479,4 @@
 				    const char * outpath, int truncate)
 {
-  static long p_count = 0;
   sh_filestore_t p;
   char *  fullpath = NULL;
@@ -1559,5 +1556,4 @@
     {
       write_record(pushdata_fd, &p, fullpath, linkpath, attr_string);
-      ++p_count;
     }
 
Index: trunk/src/sh_mem.c
===================================================================
--- trunk/src/sh_mem.c	(revision 584)
+++ trunk/src/sh_mem.c	(revision 587)
@@ -180,5 +180,4 @@
   memlist_t * merrlist = NULL;
   memlist_t * merr;
-  long        nerr = 0;
 
   SL_ENTER(_("sh_mem_check"));
@@ -205,5 +204,4 @@
 	  merr->next = merrlist;
 	  merrlist   = merr;
-	  ++nerr;
 	}
       else
@@ -218,5 +216,4 @@
 	      merr->next = merrlist;
 	      merrlist   = merr;
-	      ++nerr;
 	    }
 	  if ( this->real_address[SH_MEMMULT-1] != CHECKBYTE )
@@ -229,5 +226,4 @@
 	      merr->next = merrlist;
 	      merrlist   = merr;
-	      ++nerr;
 	    }
 	}
Index: trunk/src/sh_string.c
===================================================================
--- trunk/src/sh_string.c	(revision 584)
+++ trunk/src/sh_string.c	(revision 587)
@@ -644,6 +644,5 @@
               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,6 +675,5 @@
             {
               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); 
Index: trunk/src/sh_tiger0.c
===================================================================
--- trunk/src/sh_tiger0.c	(revision 584)
+++ trunk/src/sh_tiger0.c	(revision 587)
@@ -134,6 +134,4 @@
 
   sh_byte * buffer = SH_ALLOC(PRIV_MAX + 72);
-
-  unsigned long pages_read;
   uid_t   euid;
 
@@ -142,4 +140,5 @@
 
 #if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE)
+  unsigned long pages_read;
   /*@-nestedextern@*/
   extern long IO_Limit;
@@ -219,5 +218,7 @@
 #endif
 
+#if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE) 
     pages_read = 0;
+#endif
 
     while (1) 
@@ -228,5 +229,7 @@
 	  count = sl_read         (fd, buffer, PRIV_MAX);
 
+#if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE) 
 	++pages_read;
+#endif
 
 	if (SL_ISERROR (count)) 
@@ -873,6 +876,7 @@
   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,6 +900,8 @@
     }
 
+#if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE)
   pages_read = 0;
-
+#endif
+  
   content = sl_get_content(fd);
 
@@ -967,5 +973,7 @@
 	   && n != 0);
 
+#if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE)
     ++pages_read;
+#endif
 
     /* If end of file is reached, end the loop.  */
@@ -1417,6 +1425,7 @@
   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,6 +1454,8 @@
   /* Iterate over full file contents.  */
 
+#if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE) 
   pages_read = 0;
-
+#endif
+  
   content = sl_get_content(fd);
 
@@ -1515,6 +1526,8 @@
 	   && 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)