Changes in trunk/src/sh_error.c [27:20]

File:

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

trunk/src/sh_error.c

@@ -102 +102 @@
 /* convert a string to a numeric priority
  */ 
-int sh_error_convert_level (const char * str_s);
+int sh_error_convert_level (char * str_s);
 
 static int  IsInitialized = BAD;
@@ -219 +219 @@
 }
 
-static int sh_error_set_classmask (const char * str, int * facility_mask)
+static int sh_error_set_classmask (/*@notnull@*/char * c, int * facility_mask)
 {
   char * p;
@@ -225 +225 @@
   unsigned int    i;
   size_t len;
-  char * c;
 
   SL_ENTER(_("sh_error_set_classmask"));
   
-  if (str == NULL)
+  if (c == NULL)
     SL_RETURN( -1, _("sh_error_set_classmask"));
 
@@ -235 +234 @@
     (void) sh_error_init();
 
-  if (str[0] == (char) 34)
-    ++str;
-  len = strlen(str);
-
-  c = SH_ALLOC(len+1);
-  sl_strlcpy(c, str, len+1);
-
+  if (c[0] == (char) 34)
+    ++c;
+  len = strlen(c);
   if (c[len-1] == (char) 34)
     c[len-1] = '\0';
@@ -278 +273 @@
   } while (p);
 
-  SH_FREE(c);
   SL_RETURN( 0, _("sh_error_set_classmask"));
 }
 
-int sh_error_log_mask (const char * c)
+int sh_error_log_mask (char * c)
 {
   return (sh_error_set_classmask(c, &(errFlags.log_class)));
 }
-int sh_error_mail_mask (const char * c)
+int sh_error_mail_mask (char * c)
 {
   return (sh_error_set_classmask(c, &(errFlags.mail_class)));
 }
-int sh_error_print_mask (const char * c)
+int sh_error_print_mask (char * c)
 {
   return (sh_error_set_classmask(c, &(errFlags.print_class)));
 }
-int sh_error_export_mask (const char * c)
+int sh_error_export_mask (char * c)
 {
   return (sh_error_set_classmask(c, &(errFlags.export_class)));
 }
-int sh_error_syslog_mask (const char * c)
+int sh_error_syslog_mask (char * c)
 {
   return (sh_error_set_classmask(c, &(errFlags.syslog_class)));
 }
-int sh_error_external_mask (const char * c)
+int sh_error_external_mask (char * c)
 {
   return (sh_error_set_classmask(c, &(errFlags.external_class)));
 }
-int sh_error_database_mask (const char * c)
+int sh_error_database_mask (char * c)
 {
   return (sh_error_set_classmask(c, &(errFlags.database_class)));
 }
-int sh_error_prelude_mask (const char * c)
+int sh_error_prelude_mask (char * c)
 {
   return (sh_error_set_classmask(c, &(errFlags.prelude_class)));
@@ -452 +446 @@
 };
 
-int sh_error_convert_level (const char * str_s)
+int sh_error_convert_level (char * str_s)
 {
   int i;
@@ -478 +472 @@
 /* --- Set severity levels. ---
  */
-int sh_error_set_iv (int iv, const char *  str_s)
+int sh_error_set_iv (int iv, char *  str_s)
 {
   int level = (-1);
@@ -639 +633 @@
 }
 
-#if defined(SH_WITH_CLIENT) || defined(SH_WITH_SERVER)
+#ifdef SH_WITH_CLIENT
 /* set severity for TCP export
  */
@@ -843 +837 @@
 #endif
 
-#if defined(SH_WITH_CLIENT) || defined(SH_WITH_SERVER)
+#ifdef SH_WITH_CLIENT
   char   * ex_msg;
 #endif
@@ -862 +856 @@
   static int syslog_block = 0;
   static int log_block    = 0;
-#if defined(SH_WITH_CLIENT) || defined(SH_WITH_SERVER)
+#if defined(SH_WITH_CLIENT)
   static int export_block = 0;
 #endif
@@ -926 +920 @@
     severity = sev;
 
-  /* these are messages from remote sources
-   */
   if ((severity  & SH_ERR_INET) != 0)
     {
@@ -941 +933 @@
        ( (errFlags.sysloglevel  & severity    ) == 0 || 
          (errFlags.syslog_class & (1 << class)) == 0 )     &&
-#if defined(SH_WITH_CLIENT) || defined(SH_WITH_CLIENT)
+#ifdef SH_WITH_CLIENT
        ( (errFlags.exportlevel  & severity    ) == 0 ||
          (errFlags.export_class & (1 << class)) == 0 )     &&
@@ -960 +952 @@
          (errFlags.mail_class    & (1 << class)) == 0 )
 #ifdef SH_WITH_SERVER
-       && (flag_inet == S_FALSE) /* still log messages from remote sources */
+      && (flag_inet == S_FALSE)
 #endif
        )
@@ -1121 +1113 @@
        * to log server
        ****************************************************/
-#if defined(SH_WITH_CLIENT) || defined(SH_WITH_SERVER)
+#ifdef SH_WITH_CLIENT
       /* Export by TCP.
        */
-
-      if ( ((errFlags.exportlevel  & severity  )   != 0 &&
-            (errFlags.export_class & (1 << class)) != 0 &&
-            (errFlags.exportlevel  & SH_ERR_NOT)   == 0 &&
-            class != AUD                               )
-#ifdef SH_WITH_SERVER
-           || (flag_inet == S_TRUE) /* always log inet to export */
-#endif
-          /* sh.flag.isserver != GOOD                    && */
-          /* (flag_inet == S_FALSE) */ /* don't log inet to export */
-           )
+      if ((errFlags.exportlevel  & severity  )   != 0 &&
+          (errFlags.export_class & (1 << class)) != 0 &&
+          (errFlags.exportlevel  & SH_ERR_NOT)   == 0 &&
+          class != AUD                                &&
+          sh.flag.isserver != GOOD                    &&
+          (flag_inet == S_FALSE) ) /* don't log inet to export */
         {
           if (export_block == 0)
             {
               int retval;
-              size_t ex_len;
 
               /* will truncate to 65280 bytes 
                */
               export_block = 1;
-              ex_len = 64 + sl_strlen(lmsg->msg) + 1;
-              ex_msg = SH_ALLOC (ex_len);
-
-              sl_snprintf(ex_msg, ex_len, _("%d?%u?%s"),
-                      severity, class, lmsg->msg);
+              ex_msg = SH_ALLOC (64 + sl_strlen(lmsg->msg) + 1);
+              /*@-bufferoverflowhigh@*/
+              sprintf(ex_msg, _("%d?%u?%s"),             /* known to fit  */
+                           severity, class, lmsg->msg);
+              /*@-bufferoverflowhigh@*/
               retval = sh_forward (ex_msg);
               SH_FREE(ex_msg);
@@ -1320 +1306 @@
 /* allocate space for user-defined message header
  */
-int sh_error_ehead (/*@null@*/const char * str_s)
+int sh_error_ehead (/*@null@*/char * str_s)
 {
   size_t size;
-  const char * s;
+  char * s;
 
   SL_ENTER(_("sh_error_ehead"));
@@ -1338 +1324 @@
   
   size = /*@i@*/strlen(s);
-  if (/*@i@*/s[size-1] == (char) 34) --size; /* truncate */
+  if (/*@i@*/s[size-1] == (char) 34) --size;
 
   if (ehead_format != NULL)
@@ -1496 +1482 @@
       len      = sl_strlen(lmsg->msg);
       /*@i@*/required = sl_vsnprintf(&(lmsg->msg[len]), 
-                                     (lmsg->msg_len - len), lmsg->format, vl);
+                              (lmsg->msg_len - len), lmsg->format, vl);
       if ( (required + len) > (lmsg->msg_len - 4) )
         {