Changeset 481 for trunk/src/sh_error.c

Timestamp:

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

Author:

katerina

Message:

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

File:

• trunk/src/sh_error.c (modified) (14 diffs)

trunk/src/sh_error.c

@@ -60 +60 @@
 #include "sh_tiger.h"
 #include "sh_nmail.h"
-#include "sh_forward.h"
+#include "sh_xfer.h"
 #include "sh_prelude.h"
 #include "sh_pthread.h"
@@ -77 +77 @@
 extern int clt_class;
 
-int flag_err_debug = SL_FALSE;
-int flag_err_info  = SL_FALSE;
+int flag_err_debug = S_FALSE;
+int flag_err_info  = S_FALSE;
 
 int  ShDFLevel[SH_ERR_T_END];
@@ -100 +100 @@
 static int  sh_error_init (void);
 
-/*@owned@*//*@null@*/inline
-static char * get_format(unsigned long msg_id, /*@out@*/int * priority, 
-                         /*@out@*/unsigned int * class);
+inline
+static const char * get_format(unsigned long msg_id, int * priority, 
+                               unsigned int * class);
 
 static int sh_error_string (struct _log_t * lmsg, va_list vl);
@@ -177 +177 @@
 {
   if ((errFlags.loglevel & SH_ERR_ALL) != 0)
-    flag_err_debug = SL_TRUE;
+    flag_err_debug = S_TRUE;
   else if ((errFlags.printlevel & SH_ERR_ALL) != 0)
-    flag_err_debug = SL_TRUE;
+    flag_err_debug = S_TRUE;
   else if ((errFlags.maillevel & SH_ERR_ALL) != 0)
-    flag_err_debug = SL_TRUE;
+    flag_err_debug = S_TRUE;
   else if ((errFlags.exportlevel & SH_ERR_ALL) != 0)
-    flag_err_debug = SL_TRUE;
+    flag_err_debug = S_TRUE;
   else if ((errFlags.sysloglevel & SH_ERR_ALL) != 0)
-    flag_err_debug = SL_TRUE;
+    flag_err_debug = S_TRUE;
   else if ((errFlags.externallevel & SH_ERR_ALL) != 0)
-    flag_err_debug = SL_TRUE;
+    flag_err_debug = S_TRUE;
   else if ((errFlags.databaselevel & SH_ERR_ALL) != 0)
-    flag_err_debug = SL_TRUE;
+    flag_err_debug = S_TRUE;
   else if ((errFlags.preludelevel & SH_ERR_ALL) != 0)
-    flag_err_debug = SL_TRUE;
+    flag_err_debug = S_TRUE;
   else
-    flag_err_debug = SL_FALSE;
+    flag_err_debug = S_FALSE;
   return;
 }
@@ -201 +201 @@
 {
   if ((errFlags.loglevel & SH_ERR_INFO) != 0)
-    flag_err_info = SL_TRUE;
+    flag_err_info = S_TRUE;
   else if ((errFlags.printlevel & SH_ERR_INFO) != 0)
-    flag_err_info = SL_TRUE;
+    flag_err_info = S_TRUE;
   else if ((errFlags.maillevel & SH_ERR_INFO) != 0)
-    flag_err_info = SL_TRUE;
+    flag_err_info = S_TRUE;
   else if ((errFlags.exportlevel & SH_ERR_INFO) != 0)
-    flag_err_info = SL_TRUE;
+    flag_err_info = S_TRUE;
   else if ((errFlags.sysloglevel & SH_ERR_INFO) != 0)
-    flag_err_info = SL_TRUE;
+    flag_err_info = S_TRUE;
   else if ((errFlags.externallevel & SH_ERR_INFO) != 0)
-    flag_err_info = SL_TRUE;
+    flag_err_info = S_TRUE;
   else if ((errFlags.databaselevel & SH_ERR_INFO) != 0)
-    flag_err_info = SL_TRUE;
+    flag_err_info = S_TRUE;
   else if ((errFlags.preludelevel & SH_ERR_INFO) != 0)
-    flag_err_info = SL_TRUE;
+    flag_err_info = S_TRUE;
   else
-    flag_err_info = SL_FALSE;
+    flag_err_info = S_FALSE;
   return;
 }
@@ -230 +230 @@
                              SH_ERR_SEVERE | SH_ERR_FATAL);
       dbg_flag  = 1;
-      flag_err_debug = SL_TRUE;
+      flag_err_debug = S_TRUE;
     }
   else {
@@ -935 +935 @@
   int    severity;
   unsigned int class;
-  char * fmt;
+  const char * fmt;
   volatile int sev = sev1;            /* Avoids the 'clobbered by longjmp' warning. */
 
@@ -1286 +1286 @@
               sl_snprintf(ex_msg, ex_len, _("%d?%u?%s"),
                       severity, class, lmsg->msg);
-              retval = sh_forward (ex_msg);
+              retval = sh_xfer_report (ex_msg);
               SH_FREE(ex_msg);
               export_block = 0;
@@ -1438 +1438 @@
   int    severity;
   unsigned int class;
-  char * fmt;
+  const char * fmt;
   int retval; 
 
@@ -1517 +1517 @@
  */
 /*@owned@*/ /*@null@*/inline
-static char * get_format(unsigned long msg_id, /*@out@*/ int * priority, 
+static const char * get_format(unsigned long msg_id, /*@out@*/ int * priority, 
                          /*@out@*/unsigned int * class)
 {
@@ -1532 +1532 @@
           *priority = (int) msg_cat[i].priority;
           *class    = (unsigned int) msg_cat[i].class;
-          SL_RETURN (((char *) _(msg_cat[i].format)), _("get_format"));
+          SL_RETURN (((const char *) _(msg_cat[i].format)), _("get_format"));
         }
       ++i;
@@ -1573 +1573 @@
   SL_RETURN( 0, _("sh_error_ehead"));
 }
+
+#if !defined(VA_COPY)
+#if defined(__GNUC__) && defined(__PPC__) && (defined(_CALL_SYSV) || defined(_WIN32))
+#define VA_COPY(ap1, ap2)     (*(ap1) = *(ap2))
+#elif defined(VA_COPY_AS_ARRAY)
+#define VA_COPY(ap1, ap2)     memmove ((ap1), (ap2), sizeof (va_list))
+#else /* va_list is a pointer */
+#define VA_COPY(ap1, ap2)     ((ap1) = (ap2))
+#endif
+#endif 
 
 
@@ -1707 +1717 @@
   else 
     {
-      /* use va_copy */
-      /*@i@*/va_copy(vl2, vl);
+      /* use VA_COPY */
+      /*@i@*/VA_COPY(vl2, vl);
       len      = sl_strlen(lmsg->msg);
       /*@i@*/required = sl_vsnprintf(&(lmsg->msg[len]), 
@@ -1769 +1779 @@
                              SH_ERR_STAMP | SH_ERR_ERR    | SH_ERR_SEVERE |
                              SH_ERR_FATAL);
-  flag_err_info           = SL_TRUE;
+  flag_err_info           = S_TRUE;
 #endif