Changeset 132 for trunk/src/sh_portcheck.c

Timestamp:

Oct 23, 2007, 11:44:41 PM (17 years ago)

Author:

rainer

Message:

Make utility functions thread-safe.

File:

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

trunk/src/sh_portcheck.c

@@ -608 +608 @@
   int                nerr;
 #endif
+  char errbuf[SH_ERRBUF_SIZE];
 
   /* inet_aton(interface, &haddr); */
@@ -627 +628 @@
       nerr = errno;
       sl_snprintf(errmsg, sizeof(errmsg), _("check port: %5d/udp on %15s: %s"),
-                  port, inet_ntoa(haddr), sh_error_message(errno));
+                  port, inet_ntoa(haddr), sh_error_message(errno, errbuf, sizeof(errbuf)));
       sh_error_handle((-1), FIL__, __LINE__, nerr, MSG_E_SUBGEN, 
                       errmsg, _("connect"));
@@ -693 +694 @@
   int                nerr;
 #endif
-
+  char errbuf[SH_ERRBUF_SIZE];
 
   /* inet_aton(interface, &haddr); */
@@ -719 +720 @@
       nerr = errno;
       sl_snprintf(errmsg, sizeof(errmsg), _("check port: %5d/tcp on %15s: %s"),
-                  port, inet_ntoa(haddr), sh_error_message(errno));
+                  port, inet_ntoa(haddr), sh_error_message(errno, errbuf, sizeof(errbuf)));
       sh_error_handle((-1), FIL__, __LINE__, nerr, MSG_E_SUBGEN, 
                       errmsg, _("connect"));
@@ -889 +890 @@
   int              flag =  1; /* non-zero to enable an option */
   struct in_addr   haddr;
- 
+  char errbuf[SH_ERRBUF_SIZE];
+
   /* Check all interfaces for this host
    */
@@ -901 +903 @@
 #else
           sh_error_handle((-1), FIL__, __LINE__, errno, MSG_E_SUBGEN, 
-                          sh_error_message(errno), _("socket"));
+                          sh_error_message(errno, errbuf, sizeof(errbuf)), _("socket"));
 #endif
         }
@@ -912 +914 @@
 #else
           sh_error_handle((-1), FIL__, __LINE__, errno, MSG_E_SUBGEN, 
-                          sh_error_message(errno), _("setsockopt"));
+                          sh_error_message(errno, errbuf, sizeof(errbuf)),_("setsockopt"));
 #endif
         }
@@ -957 +959 @@
   struct sockaddr_in addr;
   int addrlen      = sizeof(addr);
+  char errbuf[SH_ERRBUF_SIZE];
 
   if (min_port == -1)
@@ -973 +976 @@
 #else
           sh_error_handle((-1), FIL__, __LINE__, errno, MSG_E_SUBGEN, 
-                          sh_error_message(errno), _("socket"));
+                          sh_error_message(errno, errbuf, sizeof(errbuf)), _("socket"));
 #endif
         }
@@ -984 +987 @@
 #else
           sh_error_handle((-1), FIL__, __LINE__, errno, MSG_E_SUBGEN, 
-                          sh_error_message(errno), _("setsockopt"));
+                          sh_error_message(errno, errbuf, sizeof(errbuf)),_("setsockopt"));
 #endif
         }
@@ -1018 +1021 @@
 #else
               sh_error_handle((-1), FIL__, __LINE__, errno, MSG_E_SUBGEN, 
-                              sh_error_message(errno), _("bind"));
+                              sh_error_message(errno, errbuf, sizeof(errbuf)), _("bind"));
 #endif
             }