Changeset 376 for trunk

Timestamp:

Nov 1, 2011, 11:11:02 PM (13 years ago)

Author:

katerina

Message:

Fix some repetitive error messages.

Location:

trunk/src

Files:

• sh_fInotify.c (modified) (2 diffs)
• sh_portcheck.c (modified) (2 diffs)

trunk/src/sh_fInotify.c

@@ -264 +264 @@
 static void sh_fInotify_set_nwatches()
 {
-  if (ShfInotifyWatches == 0)
+  static int fails = 0;
+
+  if (ShfInotifyWatches == 0 || fails == 1)
     return;
 
@@ -303 +305 @@
                   _("sh_fInotify_set_nwatches"));
   SH_MUTEX_UNLOCK(mutex_thread_nolog);
+  fails = 1;
   return;
 }

trunk/src/sh_portcheck.c

@@ -1793 +1793 @@
 {
   volatile int min_port;
+  static int noprivports = 0;
 
   SH_MUTEX_LOCK(mutex_port_check);
@@ -1808 +1809 @@
         {
           min_port = 1024;
+          if (noprivports == 0)
+            {
 #ifdef TEST_ONLY
-          fprintf(stderr, "** WARNING not scanning ports < 1024\n");
-#else
-          SH_MUTEX_LOCK(mutex_thread_nolog);
-          sh_error_handle(SH_ERR_ERR, FIL__, __LINE__, 0, MSG_E_SUBGEN, 
-                          _("not scanning ports below 1024"), 
-                          _("sh_portchk_check"));
-          SH_MUTEX_UNLOCK(mutex_thread_nolog);
-#endif
+              fprintf(stderr, "** WARNING not scanning ports < 1024\n");
+#else
+              SH_MUTEX_LOCK(mutex_thread_nolog);
+              sh_error_handle(SH_ERR_ERR, FIL__, __LINE__, 0, MSG_E_SUBGEN, 
+                              _("not scanning ports below 1024"), 
+                              _("sh_portchk_check"));
+              SH_MUTEX_UNLOCK(mutex_thread_nolog);
+#endif
+              noprivports = 1;
+            }
         }