Changeset 170 for trunk/src/samhain.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/samhain.c (modified) (8 diffs)

trunk/src/samhain.c

@@ -167 +167 @@
 }
 
-void sh_g_init()
+void sh_g_init(void)
 {
   if (0 != pthread_key_create(&g_key, sh_g_destroy))
@@ -695 +695 @@
 #endif
 #if defined(SH_WITH_SERVER)
-  extern int sh_socket_remove ();
+  extern int sh_socket_remove (void);
 #endif
 
@@ -800 +800 @@
 #if defined(__linux__) || defined(sun) || defined(__sun) || defined(__sun__)
 #include <dirent.h>
-static pid_t * procdirSamhain ()
+static pid_t * procdirSamhain (void)
 {
-  volatile pid_t        * pidlist = malloc(sizeof(pid_t) * 65535);
-  pid_t        * dummy;
+  pid_t        * pidlist;
   struct dirent * d;
   DIR *        dp;
   long         ino;
   struct stat  buf;
-  int          i = 0;
+  int          i;
   pid_t        pid, mypid = getpid();
   char       * tail;
   char         exef[128];
 
-  if (!pidlist)
-    return NULL;
-
-  for (i = 0; i < 65535; ++i) pidlist[i] = 0;
-  i = 0;
-
   if (0 != stat(SH_INSTALL_PATH, &buf))
     {
-      dummy = (pid_t *)pidlist;
-      free(dummy);
       return NULL;
     }
@@ -830 +821 @@
   if (NULL == (dp = opendir("/proc")))
     {
-      dummy = (pid_t *)pidlist;
-      free(dummy);
       return NULL;
     }
@@ -837 +826 @@
   SH_MUTEX_LOCK(mutex_readdir);
 
+  pidlist =  malloc(sizeof(pid_t) * 65535);
+  if (!pidlist)
+    goto unlock_and_out;
+
+  for (i = 0; i < 65535; ++i) pidlist[i] = 0;
+
+  i = 0;
   while (NULL != (d = readdir(dp)) && i < 65535)
     {
@@ -858 +854 @@
     }
 
+ unlock_and_out:
+  ;
   SH_MUTEX_UNLOCK(mutex_readdir);
 
   closedir(dp);
-  return (pid_t *)pidlist;
+  return pidlist;
 }
 #else
-static pid_t * procdirSamhain ()
+static pid_t * procdirSamhain (void)
 {
   return NULL;
@@ -1191 +1189 @@
 #endif
 #if defined(SH_WITH_SERVER)
-  extern int    sh_create_tcp_socket();
+  extern int    sh_create_tcp_socket(void);
 #endif
 
@@ -1208 +1206 @@
 
   volatile time_t        told;
-  time_t        tcurrent;
+  volatile time_t        tcurrent;
   size_t        tzlen;
   char *        tzptr;