SourceFormat Enforcement

diff --git a/src/Makefile.am b/src/Makefile.am
index f687676ab8b6bb6602260d2660994751e60ca2c7..2b441b598ca70137fadbd8109898db8755375081 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -746,7 +746,7 @@ DEFAULT_LOGFILED    = $(libexecdir)/`echo log_file_daemon | sed '$(transform);s/$$/
 DEFAULT_DISKD          = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_ICON_DIR       = $(datadir)/icons
 DEFAULT_ERROR_DIR      = $(datadir)/errors
-DEFAULT_HOSTS          = @DEFAULT_HOSTS@
+DEFAULT_HOSTS          = $(DEFAULT_HOSTS)
 
 # Make location configure settings available to the code
 DEFS += -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" -DDEFAULT_SQUID_DATA_DIR=\"$(datadir)\" -DDEFAULT_SQUID_CONFIG_DIR=\"$(sysconfdir)\"

diff --git a/tools/purge/signal.cc b/tools/purge/signal.cc
index 5eb91e3df1eb807cc3c629d4f12d0211f80805b6..ee2411e204fafec4cbeece2d7759a44f0fd8f1ff 100644 (file)
--- a/tools/purge/signal.cc
+++ b/tools/purge/signal.cc
@@ -116,19 +116,19 @@ sigChild( int signo )
     while ( (pid = waitpid( -1, &status, WNOHANG )) > 0 ) {
         if ( WIFEXITED(status) ) {
             snprintf( line, 128, "child (pid=%ld) reaped, status %d\n%c",
-                     (long) pid, WEXITSTATUS(status), 0 );
+                      (long) pid, WEXITSTATUS(status), 0 );
         } else if ( WIFSIGNALED(status) ) {
             snprintf( line, 128, "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 {
             snprintf( line, 128, "detected dead child (pid=%ld), status %d\n%c",
-                     (long) pid, status, 0 );
+                      (long) pid, status, 0 );
         }
         write( STDERR_FILENO, line, strlen(line) );
     }