Changeset 147

Show
Ignore:
Timestamp:
07/18/06 02:11:25 (2 years ago)
Author:
jtv
Message:

Renamed "clock" to "runclock" to avoid naming conflict with time.h

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/main.c

    r143 r147  
    4848 
    4949char localbuf[16384]; 
    50 time_t clock = 0; 
     50time_t runclock = 0; 
    5151 
    5252/// Have we received a kill/HUP/power signal? 
    …… 
    459459 
    460460  // Central loop 
    461   for (++clock; !stop; ++clock) 
     461  for (++runclock; !stop; ++runclock) 
    462462  { 
    463463    if (print_status)           print_status = false,   dump_stats(); 

  • trunk/src/main.h

    r143 r147  
    2222#define SWAPSPACE_MAIN_H 
    2323 
    24 #include <sys/param.h> 
     24#include <time.h> 
    2525 
    2626/// I thought C99 had this built in... Maybe I'm doing something wrong. 
    …… 
    4545 
    4646/// Timestamp counter 
    47 extern time_t clock; 
     47extern time_t runclock; 
    4848 
    4949/// Is the swapdir on a filesystem large enough for useful swap files? 

  • trunk/src/swaps.c

    r143 r147  
    212212void dump_stats(void) 
    213213{ 
    214   logm(LOG_INFO, "clock: %lld", (long long)clock); 
     214  logm(LOG_INFO, "clock: %lld", (long long)runclock); 
    215215 
    216216  dump_state(); 
    …… 
    596596        if (!quiet) logm(LOG_NOTICE, "Detected swapfile '%d'", result->seqno); 
    597597#endif 
    598         swapfiles[result->seqno].created = clock; 
     598        swapfiles[result->seqno].created = runclock; 
    599599      } 
    600600#ifndef NO_CONFIG