Changeset 481 for trunk/src/sh_portcheck.c

Timestamp:

Jul 18, 2015, 5:06:52 PM (9 years ago)

Author:

katerina

Message:

Enhancements and fixes for tickets #374, #375, #376, #377, #378, and #379.

File:

• trunk/src/sh_portcheck.c (modified) (6 diffs)

trunk/src/sh_portcheck.c

@@ -529 +529 @@
  * by longjmp' warning. And no, 'volatile' proved insufficient.
  */
-static void * sh_dummy_pre = NULL;
-static void * sh_dummy_ptr = NULL;
+void * sh_dummy_531_pre = NULL;
+void * sh_dummy_532_ptr = NULL;
 
 /* check the list of open ports for any that are marked as UNKN
  */
-static void sh_portchk_check_list (struct sh_portentry ** head, int proto, int report)
+static void sh_portchk_check_list (struct sh_portentry ** head, 
+                                   int proto, int report)
 {
   struct sh_portentry * ptr = *head;
@@ -543 +544 @@
    * Avoids the 'clobbered by longjmp' warning. 
    */
-  sh_dummy_pre = (void*) ⪯
-  sh_dummy_ptr = (void*) &ptr;
+  sh_dummy_531_pre = (void*) ⪯
+  sh_dummy_532_ptr = (void*) &ptr;
  
   while (ptr)
@@ -616 +617 @@
     }
 
-  sh_dummy_ptr = NULL;
-  sh_dummy_pre = NULL;
+  sh_dummy_532_ptr = NULL;
+  sh_dummy_531_pre = NULL;
 
   return;
@@ -1561 +1562 @@
 /* Subroutine to add an interface
  */
-static void * sh_dummy_str    = NULL; /* fix clobbered by.. warning */
+void * sh_dummy_1564_str    = NULL; /* fix clobbered by.. warning */
 
 static int sh_portchk_add_interface (const char * str)
@@ -1569 +1570 @@
   char buf[64];
 
-  sh_dummy_str    = (void*) &str;
+  sh_dummy_1564_str    = (void*) &str;
 
   if (iface_initialized == 0)
@@ -1610 +1611 @@
   } while (*str);
 
-  sh_dummy_str = NULL;
+  sh_dummy_1564_str = NULL;
   return 0;
 }