Changeset 170 for trunk/src/sh_error.c

Timestamp:

Apr 30, 2008, 11:56:45 PM (17 years ago)

Author:

katerina

Message:

Plenty of compiler warnings fixed, SQL query length fixed, doc update.

File:

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

trunk/src/sh_error.c

@@ -105 +105 @@
 static int sh_error_string (struct _log_t * lmsg, va_list vl);
 
-extern int  sh_log_console (/*@null@*/char *message);
+extern int  sh_log_console (/*@null@*/const char *message);
 extern int  sh_log_syslog  (int  severity, /*@null@*/char *message);
 extern int  sh_log_file    (/*@null@*/char *message, 
@@ -173 +173 @@
 
 static
-void compute_flag_err_debug()
+void compute_flag_err_debug(void)
 {
   if ((errFlags.loglevel & SH_ERR_ALL) != 0)
@@ -197 +197 @@
 
 static
-void compute_flag_err_info()
+void compute_flag_err_info(void)
 {
   if ((errFlags.loglevel & SH_ERR_INFO) != 0)
@@ -220 +220 @@
 }
 
-void sh_error_dbg_switch()
+void sh_error_dbg_switch(void)
 {
   if (dbg_flag == 0)
@@ -466 +466 @@
 typedef struct eef 
 {
-  char * str;
+  const char * str;
   int    val;
 } eef_struc;
@@ -797 +797 @@
 /* init or re-init log facilities that need it
  */
-void sh_error_fixup()
+void sh_error_fixup(void)
 {
 #if defined(HAVE_LIBPRELUDE_9)
@@ -813 +813 @@
 /* to be called from sh_prelude_reset
  */
-void sh_error_init_prelude()
+void sh_error_init_prelude(void)
 {
 #if defined(HAVE_LIBPRELUDE_9)
@@ -865 +865 @@
 SH_MUTEX_RECURSIVE(mutex_err_handle);
 
-void sh_error_handle (int sev, char * file, long line, 
+void sh_error_handle (int sev, const char * file, long line, 
                       long status, unsigned long msg_id, ...)
 {
@@ -875 +875 @@
   char * fmt;
 
-  int    flag_inet  = S_FALSE;
+  int    flag_inet;
 
 #ifdef SH_WITH_SERVER
@@ -974 +974 @@
     {
       flag_inet = S_TRUE;
+    }
+  else
+    {
+      flag_inet  = S_FALSE;
     }
 
@@ -1355 +1359 @@
           *priority = (int) msg_cat[i].priority;
           *class    = (unsigned int) msg_cat[i].class;
-          SL_RETURN (_(msg_cat[i].format), _("get_format"));
+          SL_RETURN (((char *) _(msg_cat[i].format)), _("get_format"));
         }
       ++i;
@@ -1545 +1549 @@
       /*@i@*/required = sl_vsnprintf(&(lmsg->msg[len]), 
                                      (lmsg->msg_len - len), lmsg->format, vl);
+
       if ((required >= 0) && 
           sl_ok_adds(required, len) &&
@@ -1556 +1561 @@
           lmsg->msg_len = required + len + 4;
           (void) sl_vsnprintf(&(lmsg->msg[len]), 
-                              (required + len + 1), lmsg->format, vl2);
+                              (required + 1), lmsg->format, vl2);
         }
       va_end(vl2);