Changeset 170 for trunk/src/sh_processcheck.c

Timestamp:

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

Author:

katerina

Message:

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

File:

• trunk/src/sh_processcheck.c (modified) (10 diffs)

trunk/src/sh_processcheck.c

@@ -394 +394 @@
 } 
 
+/* These variables are not used anywhere. They only exist
+ * to assign &userold, &user to them, which keeps gcc from
+ * putting them into a register, and avoids the 'clobbered
+ * by longjmp' warning. And no, 'volatile' proved insufficient.
+ */
+static void * sh_dummy_watchlist = NULL;
+
 static void check_watchlist (short * res)
 {
@@ -399 +406 @@
   char * tmp;
   size_t indx;
+
+  /* Take the address to keep gcc from putting them into registers. 
+   * Avoids the 'clobbered by longjmp' warning. 
+   */
+  sh_dummy_watchlist = (void*) &list;
 
   while (list) 
@@ -409 +421 @@
             {
               SH_MUTEX_LOCK(mutex_thread_nolog);
+              tmp = sh_util_safe_name (list->str);
               sh_error_handle(sh_prochk_severity, FIL__, __LINE__, 0, 
                               MSG_PCK_MISS,
-                              list->str);
+                              tmp);
               SH_MUTEX_UNLOCK(mutex_thread_nolog);
             }
@@ -428 +441 @@
               if (S_FALSE == is_in_list(&list_missing, list->str, 0))
                 {
+                  SH_MUTEX_LOCK(mutex_thread_nolog);
                   tmp = sh_util_safe_name (list->str);
-                  SH_MUTEX_LOCK(mutex_thread_nolog);
                   sh_error_handle(sh_prochk_severity, FIL__, __LINE__, 0, 
                                   MSG_PCK_MISS, 
@@ -594 +607 @@
     }
 
-  val = (val <= 0 ? 60 : val);
-
   sh_prochk_interval = (time_t) val;
   SL_RETURN(0, _("sh_prochk_set_interval"));
@@ -625 +636 @@
 static int proc_max_pid (size_t * procpid)
 {
+  char * ret;
   unsigned long  pid;
   FILE * fd;
@@ -640 +652 @@
         {
           str[0] = '\0';
-          fgets(str, 128, fd);
-          if (*str != '\0')
+          ret = fgets(str, 128, fd);
+          if (ret && *str != '\0')
             {
               pid = strtoul(str, &ptr, 0);
@@ -1055 +1067 @@
 static int sh_process_check_int (short * res)
 {
-  size_t i, j;
+  volatile size_t i;
+  size_t j;
   char  tests[512];
-  int   retval;
+  volatile int   retval;
 
   pid_t this_pid;
@@ -1207 +1220 @@
 /* Initialise. 
  */
-static int sh_prochk_init_internal() 
+static int sh_prochk_init_internal(void) 
 {
   SL_ENTER(_("sh_prochk_init"));
@@ -1267 +1280 @@
 int sh_prochk_check(void) 
 {
-  int status = 0;
+  int status;
 
   SL_ENTER(_("sh_prochk_check"));
 
   SH_MUTEX_LOCK(mutex_proc_check);
+
+  status = 0;
+
   if( ShProchkActive != S_FALSE )
     {