Merge suggestions from Amos' review

diff --git a/src/debug.cc b/src/debug.cc
index 5d573a8abb89644c5c7f0b5e7b79a9cc9586dd75..beafa4eb77eadcdf09e59424ee45c70c56774963 100644 (file)
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -465,12 +465,11 @@ _db_rotate_log(void)
         snprintf(from, MAXPATHLEN, "%s.%d", debug_log_file, i - 1);
         snprintf(to, MAXPATHLEN, "%s.%d", debug_log_file, i);
 #if _SQUID_WINDOWS_
-        remove
-        (to);
+        remove(to);
 #endif
         errno = 0;
         if (rename(from, to) == -1) {
-            debugs(0, DBG_IMPORTANT, "log rotation failed: " << xstrerror());
+            debugs(0, DBG_IMPORTANT, "log rotation failed: " << xstrerr(errno));
         }
     }
 

diff --git a/src/disk.cc b/src/disk.cc
index 67dec9c45d73d5c039a9231bb8db178a5534ccea..0d8ecbc71acd7b87b617857f138ecaa1555b3344 100644 (file)
--- a/src/disk.cc
+++ b/src/disk.cc
@@ -222,7 +222,7 @@ diskHandleWrite(int fd, void *)
     if (fdd->write_q->file_offset != -1) {
         errno = 0;
         if (lseek(fd, fdd->write_q->file_offset, SEEK_SET) == -1) {
-            debugs(50, DBG_IMPORTANT, "error in seek for fd " << fd << ": " << xstrerror());
+            debugs(50, DBG_IMPORTANT, "error in seek for fd " << fd << ": " << xstrerr(errno));
             // XXX: handle error?
         }
     }
@@ -429,7 +429,7 @@ diskHandleRead(int fd, void *data)
         errno = 0;
         if (lseek(fd, ctrl_dat->offset, SEEK_SET) == -1) {
             // shouldn't happen, let's detect that
-            debugs(50, DBG_IMPORTANT, "error in seek for fd " << fd << ": " << xstrerror());
+            debugs(50, DBG_IMPORTANT, "error in seek for fd " << fd << ": " << xstrerr(errno));
             // XXX handle failures?
         }
         ++ statCounter.syscalls.disk.seeks;

diff --git a/src/ipc.cc b/src/ipc.cc
index da4b0624671536b3e00e9e7c8a81bfbc85eef97c..ea9e1b478d0a71d45e3f596fc0b9b7fd26f1cf8c 100644 (file)
--- a/src/ipc.cc
+++ b/src/ipc.cc
@@ -153,19 +153,19 @@ ipcCreate(int type, const char *prog, const char *const args[], const char *name
 
         errno = 0;
         if (setsockopt(fds[0], SOL_SOCKET, SO_SNDBUF, (void *) &buflen, sizeof(buflen)) == -1)  {
-            debugs(54, DBG_IMPORTANT, "setsockopt failed: " << xstrerror());
+            debugs(54, DBG_IMPORTANT, "setsockopt(fds[0],snd) failed: " << xstrerr(errno));
             errno = 0;
         }
         if (setsockopt(fds[0], SOL_SOCKET, SO_RCVBUF, (void *) &buflen, sizeof(buflen)) == -1) {
-            debugs(54, DBG_IMPORTANT, "setsockopt failed: " << xstrerror());
+            debugs(54, DBG_IMPORTANT, "setsockopt(fds[0],rcv) failed: " << xstrerr(errno));
             errno = 0;
         }
         if (setsockopt(fds[1], SOL_SOCKET, SO_SNDBUF, (void *) &buflen, sizeof(buflen)) == -1) {
-            debugs(54, DBG_IMPORTANT, "setsockopt failed: " << xstrerror());
+            debugs(54, DBG_IMPORTANT, "setsockopt(fds[1],snd) failed: " << xstrerr(errno));
             errno = 0;
         }
         if (setsockopt(fds[1], SOL_SOCKET, SO_RCVBUF, (void *) &buflen, sizeof(buflen)) == -1) {
-            debugs(54, DBG_IMPORTANT, "setsockopt failed: " << xstrerror());
+            debugs(54, DBG_IMPORTANT, "setsockopt(fds[1],rcv) failed: " << xstrerr(errno));
             errno = 0;
         }
         fd_open(prfd = pwfd = fds[0], FD_PIPE, "IPC UNIX STREAM Parent");