Changeset 463 for trunk/src

Timestamp:

Feb 17, 2015, 5:43:59 PM (10 years ago)

Author:

katerina

Message:

Fix for ticket #363 (database load on init when missing file in config).

File:

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

trunk/src/sh_hash.c

@@ -1325 +1325 @@
 
   SL_ENTER(_("sh_hash_init"));
+
+  if ( sh.flag.checkSum == SH_CHECK_INIT )
+    {
+      dlog(1, FIL__, __LINE__, 
+           _("Attempt to load the baseline database during initialisation. This is an internal error, please report it to the developer.\n"));
+      SH_ABORT;
+      aud_exit (FIL__, __LINE__, EXIT_FAILURE);
+    }
 
   SH_MUTEX_LOCK(mutex_hash);
@@ -2157 +2165 @@
 {
   sh_file_t * p;
-  int retval;
-
-  if (IsInit != 1) 
-    sh_hash_init();
-
-  SH_MUTEX_LOCK(mutex_hash);
-  p = sh_hash_have_it_int (filename);
-  if (p)
-    retval = p->fflags;
-  else
-    retval = -1;
-  SH_MUTEX_UNLOCK(mutex_hash);
+  int retval = 0;
+
+  if ( sh.flag.checkSum != SH_CHECK_INIT )
+    {
+      if (IsInit != 1) 
+        sh_hash_init();
+      
+      SH_MUTEX_LOCK(mutex_hash);
+      p = sh_hash_have_it_int (filename);
+      if (p)
+        retval = p->fflags;
+      else
+        retval = -1;
+      SH_MUTEX_UNLOCK(mutex_hash);
+    }
   return retval;
 }
@@ -2175 +2186 @@
 {
   sh_file_t * p;
-  int retval;
-
-  if (IsInit != 1) 
-    sh_hash_init();
-
-  SH_MUTEX_LOCK(mutex_hash);
-  p = sh_hash_have_it_int (filename);
-  if (p)
-    {
-      p->fflags = flags;
-      retval = 0;
-    }
-  else
-    retval = -1;
-  SH_MUTEX_UNLOCK(mutex_hash);
+  int retval = 0;
+
+  if ( sh.flag.checkSum != SH_CHECK_INIT )
+    {
+      if (IsInit != 1) 
+        sh_hash_init();
+      
+      SH_MUTEX_LOCK(mutex_hash);
+      p = sh_hash_have_it_int (filename);
+      if (p)
+        {
+          p->fflags = flags;
+          retval = 0;
+        }
+      else
+        retval = -1;
+      SH_MUTEX_UNLOCK(mutex_hash);
+    }
   return retval;
 }
@@ -2199 +2213 @@
   sh_file_t * p;
 
-  if (IsInit != 1) 
-    sh_hash_init();
-
-  SH_MUTEX_LOCK(mutex_hash);
-  p = sh_hash_have_it_int (filename);
-  if (p)
-    {
-      p->fflags |= flag_to_set;
-    }
-  SH_MUTEX_UNLOCK(mutex_hash);
+  if ( sh.flag.checkSum != SH_CHECK_INIT )
+    {
+      if (IsInit != 1) 
+        sh_hash_init();
+      
+      SH_MUTEX_LOCK(mutex_hash);
+      p = sh_hash_have_it_int (filename);
+      if (p)
+        {
+          p->fflags |= flag_to_set;
+        }
+      SH_MUTEX_UNLOCK(mutex_hash);
+    }
   return;
 }
@@ -2218 +2235 @@
   sh_file_t * p;
 
-  if (IsInit != 1) 
-    sh_hash_init();
-
-  SH_MUTEX_LOCK(mutex_hash);
-  p = sh_hash_have_it_int (filename);
-  if (p)
-    {
-      p->fflags &= ~flag_to_clear;
-    }
-  SH_MUTEX_UNLOCK(mutex_hash);
+  if ( sh.flag.checkSum != SH_CHECK_INIT )
+    {
+      if (IsInit != 1) 
+        sh_hash_init();
+      
+      SH_MUTEX_LOCK(mutex_hash);
+      p = sh_hash_have_it_int (filename);
+      if (p)
+        {
+          p->fflags &= ~flag_to_clear;
+        }
+      SH_MUTEX_UNLOCK(mutex_hash);
+    }
   return;
 }