Changeset 185 for trunk/src/sh_hash.c

Timestamp:

Oct 29, 2008, 8:59:18 PM (16 years ago)

Author:

katerina

Message:

Bugfixes for log monitoring, samba logfile parser.

File:

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

trunk/src/sh_hash.c

@@ -1139 +1139 @@
   char hashbuf[KEYBUF_SIZE];
 
+  int  retval  = 0;
+  int  exitval = EXIT_SUCCESS;
+
   SL_ENTER(_("sh_hash_init"));
 
@@ -1170 +1173 @@
           sh_error_handle ((-1), FIL__, __LINE__, fd, MSG_EXIT_ABORT1, 
                            sh.prg_name);
-          aud_exit (FIL__, __LINE__, EXIT_FAILURE);
+          retval = 1; exitval = EXIT_FAILURE;
+          goto unlock_and_return;
         }
       sl_rewind (fd);
@@ -1196 +1200 @@
             sh_error_handle ((-1), FIL__, __LINE__, fd, MSG_EXIT_ABORT1, 
                              sh.prg_name);
-            aud_exit (FIL__, __LINE__, EXIT_FAILURE);
+            retval = 1; exitval = EXIT_FAILURE;
+            goto unlock_and_return;
           }
         
@@ -1216 +1221 @@
                                file_path('D', 'R') )
                              );
-            aud_exit (FIL__, __LINE__, EXIT_FAILURE);
+            retval = 1; exitval = EXIT_FAILURE;
+            goto unlock_and_return;
           }
         sl_rewind (fd);
@@ -1226 +1232 @@
       TPT((0, FIL__, __LINE__, _("msg=<Terminate.>\n")));
       --sig_raised; --sig_urgent;
-      aud_exit (FIL__, __LINE__, EXIT_SUCCESS);
+      retval = 1; exitval = EXIT_SUCCESS;
+      goto unlock_and_return;
     }
 
@@ -1251 +1258 @@
           TPT((0, FIL__, __LINE__, _("msg=<Terminate.>\n")));
           --sig_raised; --sig_urgent;
-          aud_exit (FIL__, __LINE__, EXIT_SUCCESS);
+          retval = 1; exitval = EXIT_SUCCESS;
+          goto unlock_and_return;
         }
 
@@ -1307 +1315 @@
   if (0 != sh_gpg_check_sign (0, fd, 2))
     {
-      aud_exit (FIL__, __LINE__, EXIT_FAILURE);
+      retval = 1; exitval = EXIT_FAILURE;
+      goto unlock_and_return;
     }
   sl_rewind (fd);
@@ -1328 +1337 @@
           TPT((0, FIL__, __LINE__, _("msg=<Terminate.>\n")));
           --sig_raised; --sig_urgent;
-          aud_exit (FIL__, __LINE__, EXIT_SUCCESS);
+          retval = 1; exitval = EXIT_SUCCESS;
+          goto unlock_and_return;
         }
 
@@ -1357 +1367 @@
   ; /* 'label at end of compound statement */
   SH_MUTEX_UNLOCK(mutex_hash);
-  SL_RET0(_("sh_hash_init"));
+  if (retval == 0)
+    {
+      SL_RET0(_("sh_hash_init"));
+    }
+  aud_exit (FIL__, __LINE__, exitval);
 }