Changeset 481 for trunk/src/sh_err_log.c

Timestamp:

Jul 18, 2015, 5:06:52 PM (9 years ago)

Author:

katerina

Message:

Enhancements and fixes for tickets #374, #375, #376, #377, #378, and #379.

File:

• trunk/src/sh_err_log.c (modified) (3 diffs)

trunk/src/sh_err_log.c

@@ -770 +770 @@
 
 #if defined(HAVE_MLOCK) && !defined(HAVE_BROKEN_MLOCK)
-  if (skey->mlock_failed == SL_FALSE) 
+  if (skey->mlock_failed == S_FALSE) 
     {
       if ( (-1) == sh_unix_mlock( FIL__, __LINE__, log_msg.msg, 
                                   (size_t)(2*KEY_LEN + status + 32) ) ) 
         {
-          skey->mlock_failed = SL_TRUE;
+          skey->mlock_failed = S_TRUE;
 #if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE)
           sh_error_handle ((-1), FIL__, __LINE__, EPERM, MSG_MLOCK); 
@@ -782 +782 @@
     }
 #else
-  if (skey->mlock_failed == SL_FALSE) 
-    {
-      skey->mlock_failed = SL_TRUE;
+  if (skey->mlock_failed == S_FALSE) 
+    {
+      skey->mlock_failed = S_TRUE;
 #if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE)
       sh_error_handle ((-1), FIL__, __LINE__, EPERM, MSG_MLOCK);
@@ -1207 +1207 @@
   int i;
 
-  if (SL_TRUE == sl_ok_adds (gSave[0], sh.statistics.bytes_hashed))
+  if (S_TRUE == sl_ok_adds (gSave[0], sh.statistics.bytes_hashed))
     gSave[0] += sh.statistics.bytes_hashed;
-  if (SL_TRUE == sl_ok_adds (gSave[1], sh.statistics.dirs_checked))
+  if (S_TRUE == sl_ok_adds (gSave[1], sh.statistics.dirs_checked))
     gSave[1] += sh.statistics.dirs_checked;
-  if (SL_TRUE == sl_ok_adds (gSave[2], sh.statistics.files_checked))
+  if (S_TRUE == sl_ok_adds (gSave[2], sh.statistics.files_checked))
     gSave[2] += sh.statistics.files_checked;
-  if (SL_TRUE == sl_ok_adds (gSave[3], sh.statistics.files_report))
+  if (S_TRUE == sl_ok_adds (gSave[3], sh.statistics.files_report))
     gSave[3] += sh.statistics.files_report;
-  if (SL_TRUE == sl_ok_adds (gSave[4], sh.statistics.files_error))
+  if (S_TRUE == sl_ok_adds (gSave[4], sh.statistics.files_error))
     gSave[4] += sh.statistics.files_error;
-  if (SL_TRUE == sl_ok_adds (gSave[5], sh.statistics.files_nodir))
+  if (S_TRUE == sl_ok_adds (gSave[5], sh.statistics.files_nodir))
     gSave[5] += sh.statistics.files_nodir;