Changeset 481 for trunk/src/sh_calls.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_calls.c (modified) (5 diffs)

trunk/src/sh_calls.c

@@ -262 +262 @@
   errno = error;
 
-  if (flag_err_debug == SL_TRUE)
+  if (flag_err_debug == S_TRUE)
     {
       char ipbuf[SH_IP_BUF];
@@ -291 +291 @@
   sh_ipvx_save(serv_addr, ss.ss_family, (struct sockaddr *) &ss);
 
-  if (flag_err_debug == SL_TRUE)
+  if (flag_err_debug == S_TRUE)
     {
       char ipbuf[SH_IP_BUF];
@@ -490 +490 @@
 #endif
 
-  SL_ENTER(_("retry_msleep"));
-
   errno  = 0;
   if (millisec > 999) millisec = 999;
@@ -511 +509 @@
 #else
   if (sec > 0)
-    {
-      sleep (sec); /* nanosleep not available */
-    }
-  else
-    {
+    sleep (sec); /* nanosleep not available */
+  else {
 #ifdef HAVE_USLEEP
-      if (millisec > 0)
-        {
-          usleep(1000 * millisec);
-        }
+    if (millisec > 0)
+      usleep(1000 * millisec);
 #else
-      if (millisec > 0)
-        {
-          sleep (1);
-        }
-#endif
-    }
-#endif
-  SL_RETURN(result, _("retry_msleep"));
+    if (millisec > 0)
+      sleep (1);
+#endif
+  }
+#endif
+  return result;
 }
 
@@ -835 +826 @@
   
 /*@noreturn@*/
-void aud_exit (const char * file, int line, int fd)
+void aud_exit (const char * file, int line, int exitval)
 {
   if (sh.flag.audit != 0 && (sh.flag.aud_mask & AUD_EXIT) != 0)
     sh_error_handle ((-1), file, line, 0, MSG_AUD_EXIT,
-                      (long) fd);
+                      (long) exitval);
 
   SL_ENTER(_("aud_exit"));
 
-  sh.flag.exit = fd;
-  exit(fd);
+  sh.flag.exit = exitval;
+  exit(exitval);
 }
 
 /*@noreturn@*/
-void aud__exit (const char * file, int line, int fd)
+void aud__exit (const char * file, int line, int exitval)
 {
   if (sh.flag.audit != 0 && (sh.flag.aud_mask & AUD_EXIT) != 0)
     sh_error_handle ((-1), file, line, 0, MSG_AUD_EXIT,
-                      (long) fd);
+                      (long) exitval);
 
   SL_ENTER(_("aud__exit"));
 
-  sh.flag.exit = fd;
-  _exit(fd);
+  sh.flag.exit = exitval;
+  _exit(exitval);
 }