Changeset 137 for trunk/src/samhain.c

Timestamp:

Oct 28, 2007, 1:17:58 AM (17 years ago)

Author:

rainer

Message:

Fix compile errors.

File:

• trunk/src/samhain.c (modified) (9 diffs)

trunk/src/samhain.c

@@ -139 +139 @@
 
 #ifdef HAVE_PTHREAD
-typedef struct gt {
+struct gt {
   size_t g_count;
   char * g_glob;
@@ -149 +149 @@
 {
   struct gt * ptr = malloc(sizeof(struct gt));
-  if (!gt)
+  if (!ptr)
     return -1;
   ptr->g_count    = 0;
@@ -166 +166 @@
 }
 
-static void sh_g_init()
+void sh_g_init()
 {
   if (0 != pthread_key_create(&g_key, sh_g_destroy))
@@ -176 +176 @@
   if (0 != sh_g_thread())
     {
-      perror("1");
+      perror("2");
       exit(EXIT_FAILURE);
     }
@@ -191 +191 @@
   size_t j;
 
-#ifdef HAVE_PTHREAD
-  struct gt * ptr = pthread_getspecific(g_key);
-  size_t count = ptr->g_count;
-  char *  glob = ptr->g_glob;
-#else
+#ifndef HAVE_PTHREAD
   static   size_t  count = 0;
   static   char glob[SH_MAX_GLOBS * (GLOB_LEN+1)];
-#
-
-  if (str == NULL)
+#else
+  struct gt * ptr = pthread_getspecific(g_key);
+  size_t count;
+  char *  glob;
+
+  if (ptr) {
+    count = ptr->g_count;
+    glob  = ptr->g_glob;
+  } else {
     return NULL;
+  }
+#endif
+
+  if (str != NULL)
+    j = strlen(str);
   else
-    j = strlen(str);
+    return NULL;
 
   ASSERT((j <= GLOB_LEN), _("j <= GLOB_LEN"))
@@ -228 +235 @@
   i     = count;
 #ifdef HAVE_PTHREAD
-  ptr->count = count + j + 1;
+  ptr->g_count = count + j + 1;
 #else
   count = count + j + 1;
@@ -248 +255 @@
 }
 
+#else
+/* not stealth */
+#define SH_G_INIT ((void)0)
 #endif
 
@@ -815 +825 @@
     }
 
-  SH_MUTEX_LOCK(readdir_lock);
+  SH_MUTEX_LOCK(mutex_readdir);
 
   while (NULL != (d = readdir(dp)) && i < 65535)
@@ -838 +848 @@
     }
 
-  SH_MUTEX_UNLOCK(readdir_lock);
+  SH_MUTEX_UNLOCK(mutex_readdir);
 
   closedir(dp);