From: Automatic source maintenance Date: Sat, 21 Aug 2010 00:12:42 +0000 (-0600) Subject: SourceFormat Enforcement X-Git-Tag: take1~353 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8978bd9db7b66165c2b059be0eb17f5e047d9122;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/tools/purge/copyout.cc b/tools/purge/copyout.cc index eb4987dd34..b1525f16f8 100644 --- a/tools/purge/copyout.cc +++ b/tools/purge/copyout.cc @@ -234,7 +234,7 @@ copy_out( size_t filesize, size_t metasize, unsigned debug, // seek end of output file ... off_t position = lseek( out, filesize-metasize-1, SEEK_SET ); if ( position == -1 ) { - fprintf( stderr, "lseek(%s,%lu): %s\n", filename, + fprintf( stderr, "lseek(%s,%lu): %s\n", filename, (unsigned long)filesize-metasize, strerror(errno) ); BAUTZ(false); diff --git a/tools/purge/purge.cc b/tools/purge/purge.cc index 3a905eb663..c18909a0ec 100644 --- a/tools/purge/purge.cc +++ b/tools/purge/purge.cc @@ -282,15 +282,15 @@ log_extended( const char* fn, int code, long size, const SquidMetaList* meta ) // make data aligned, avoid SIGBUS on RISC machines (ARGH!) memcpy( &temp, findings->data, sizeof(StoreMetaStd) ); snprintf( timeb, sizeof(timeb), "%08lx %08lx %08lx %08lx %04x %5hu ", - (unsigned long)temp.timestamp, (unsigned long)temp.lastref, - (unsigned long)temp.expires, (unsigned long)temp.lastmod, temp.flags, temp.refcount ); + (unsigned long)temp.timestamp, (unsigned long)temp.lastref, + (unsigned long)temp.expires, (unsigned long)temp.lastmod, temp.flags, temp.refcount ); } else if ( meta && (findings = meta->search( STORE_META_STD_LFS )) ) { StoreMetaStdLFS temp; // make data aligned, avoid SIGBUS on RISC machines (ARGH!) memcpy( &temp, findings->data, sizeof(StoreMetaStd) ); snprintf( timeb, sizeof(timeb), "%08lx %08lx %08lx %08lx %04x %5hu ", - (unsigned long)temp.timestamp, (unsigned long)temp.lastref, - (unsigned long)temp.expires, (unsigned long)temp.lastmod, temp.flags, temp.refcount ); + (unsigned long)temp.timestamp, (unsigned long)temp.lastref, + (unsigned long)temp.expires, (unsigned long)temp.lastmod, temp.flags, temp.refcount ); } else { snprintf( timeb, sizeof(timeb), "%08lx %08lx %08lx %08lx %04x %5hu ", (unsigned long)-1, (unsigned long)-1, (unsigned long)-1, (unsigned long)-1, 0, 0 ); } diff --git a/tools/purge/signal.cc b/tools/purge/signal.cc index 10f1c2ab3b..774ea60a50 100644 --- a/tools/purge/signal.cc +++ b/tools/purge/signal.cc @@ -115,19 +115,19 @@ sigChild( int signo ) while ( (pid = waitpid( -1, &status, WNOHANG )) > 0 ) { if ( WIFEXITED(status) ) { fprintf( stderr, "child (pid=%ld) reaped, status %d\n%c", - (long) pid, WEXITSTATUS(status), 0 ); + (long) pid, WEXITSTATUS(status), 0 ); } else if ( WIFSIGNALED(status) ) { fprintf( stderr, "child (pid=%ld) died on signal %d%s\n%c", - (long) pid, WTERMSIG(status), + (long) pid, WTERMSIG(status), #ifdef WCOREDUMP - WCOREDUMP(status) ? " (core generated)" : "", + WCOREDUMP(status) ? " (core generated)" : "", #else - "", + "", #endif - 0 ); + 0 ); } else { fprintf( stderr, "detected dead child (pid=%ld), status %d\n%c", - (long) pid, status, 0 ); + (long) pid, status, 0 ); } } errno = saveerr;