Index: trunk/src/samhain.c
===================================================================
--- trunk/src/samhain.c	(revision 305)
+++ trunk/src/samhain.c	(revision 307)
@@ -2024,5 +2024,4 @@
 	  if (flag_check_2 == 1 || FileSchedTwo == NULL)
 	    {
-	      fprintf(stderr, "FIXME check unvisited\n");
 	      TPT((0, FIL__, __LINE__, _("msg=<Check for missing files.>\n")))
 	      sh_hash_unvisited (ShDFLevel[SH_ERR_T_FILE]);
Index: trunk/src/sh_calls.c
===================================================================
--- trunk/src/sh_calls.c	(revision 305)
+++ trunk/src/sh_calls.c	(revision 307)
@@ -226,5 +226,4 @@
   } while (val_retry < 0 && errno == EINTR);
 
-  *addrlen = (int) my_addrlen;
   error = errno;
   if (val_retry < 0) {
@@ -237,4 +236,5 @@
   sh_ipvx_save(serv_addr, ss.ss_family, (struct sockaddr *) &ss);
 
+  *addrlen = (int) my_addrlen;
   SL_RETURN(val_retry, _("retry_accept"));
 }
Index: trunk/src/sh_files.c
===================================================================
--- trunk/src/sh_files.c	(revision 305)
+++ trunk/src/sh_files.c	(revision 307)
@@ -377,5 +377,4 @@
 		  if (S_FALSE == sh_ignore_chk_del(ptr->name))
 		    {
-		      fprintf(stderr, "FIXME 1 %s, %d\n", ptr->name, ptr->is_reported);
 		      if (0 != hashreport_missing(ptr->name, 
 						  (ptr->class == SH_LEVEL_ALLIGNORE) ? 
@@ -436,5 +435,4 @@
 		      if (S_FALSE == sh_ignore_chk_del(ptr->name))
 			{
-			  fprintf(stderr, "FIXME 2 %s, %d\n", ptr->name, ptr->is_reported);
 			  if (0 != hashreport_missing(ptr->name, 
 						      (ptr->class == SH_LEVEL_ALLIGNORE) ? 
@@ -1292,5 +1290,4 @@
 	      if (S_FALSE == sh_ignore_chk_del(ptr->name))
 		{
-		  fprintf(stderr, "FIXME 2 %s, %d\n", ptr->name, ptr->is_reported);
 		  if (0 != hashreport_missing(ptr->name, 
 					      (ptr->class == SH_LEVEL_ALLIGNORE) ? 
Index: trunk/src/sh_forward.c
===================================================================
--- trunk/src/sh_forward.c	(revision 305)
+++ trunk/src/sh_forward.c	(revision 307)
@@ -5028,5 +5028,6 @@
 #endif
 
-  int                sock = -1;
+  /* Use volatile to circumvent a gcc4 problem on RH/CentOS 4.8 (?) */
+  volatile int       sock = -1;
   sh_conn_t        * cx;
   fd_set             readset;
Index: trunk/src/sh_hash.c
===================================================================
--- trunk/src/sh_hash.c	(revision 305)
+++ trunk/src/sh_hash.c	(revision 307)
@@ -688,5 +688,4 @@
 	  
 	  goto end;
-	  SL_RET0(_("sh_hash_remove"));
 #else
 	  SET_SH_FFLAG_REPORTED(p->fflags);