Changeset 481 for trunk/src/sh_err_log.c


Ignore:
Timestamp:
Jul 18, 2015, 5:06:52 PM (6 years ago)
Author:
katerina
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/sh_err_log.c

    r459 r481  
    770770
    771771#if defined(HAVE_MLOCK) && !defined(HAVE_BROKEN_MLOCK)
    772   if (skey->mlock_failed == SL_FALSE)
     772  if (skey->mlock_failed == S_FALSE)
    773773    {
    774774      if ( (-1) == sh_unix_mlock( FIL__, __LINE__, log_msg.msg,
    775775                                  (size_t)(2*KEY_LEN + status + 32) ) )
    776776        {
    777           skey->mlock_failed = SL_TRUE;
     777          skey->mlock_failed = S_TRUE;
    778778#if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE)
    779779          sh_error_handle ((-1), FIL__, __LINE__, EPERM, MSG_MLOCK);
     
    782782    }
    783783#else
    784   if (skey->mlock_failed == SL_FALSE)
    785     {
    786       skey->mlock_failed = SL_TRUE;
     784  if (skey->mlock_failed == S_FALSE)
     785    {
     786      skey->mlock_failed = S_TRUE;
    787787#if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE)
    788788      sh_error_handle ((-1), FIL__, __LINE__, EPERM, MSG_MLOCK);
     
    12071207  int i;
    12081208
    1209   if (SL_TRUE == sl_ok_adds (gSave[0], sh.statistics.bytes_hashed))
     1209  if (S_TRUE == sl_ok_adds (gSave[0], sh.statistics.bytes_hashed))
    12101210    gSave[0] += sh.statistics.bytes_hashed;
    1211   if (SL_TRUE == sl_ok_adds (gSave[1], sh.statistics.dirs_checked))
     1211  if (S_TRUE == sl_ok_adds (gSave[1], sh.statistics.dirs_checked))
    12121212    gSave[1] += sh.statistics.dirs_checked;
    1213   if (SL_TRUE == sl_ok_adds (gSave[2], sh.statistics.files_checked))
     1213  if (S_TRUE == sl_ok_adds (gSave[2], sh.statistics.files_checked))
    12141214    gSave[2] += sh.statistics.files_checked;
    1215   if (SL_TRUE == sl_ok_adds (gSave[3], sh.statistics.files_report))
     1215  if (S_TRUE == sl_ok_adds (gSave[3], sh.statistics.files_report))
    12161216    gSave[3] += sh.statistics.files_report;
    1217   if (SL_TRUE == sl_ok_adds (gSave[4], sh.statistics.files_error))
     1217  if (S_TRUE == sl_ok_adds (gSave[4], sh.statistics.files_error))
    12181218    gSave[4] += sh.statistics.files_error;
    1219   if (SL_TRUE == sl_ok_adds (gSave[5], sh.statistics.files_nodir))
     1219  if (S_TRUE == sl_ok_adds (gSave[5], sh.statistics.files_nodir))
    12201220    gSave[5] += sh.statistics.files_nodir;
    12211221
Note: See TracChangeset for help on using the changeset viewer.