From 3211fedb86e93cf5e917ca7dbafd169fe7f27e59 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Sun, 12 Jul 2015 18:41:38 +0200 Subject: [PATCH] Revert last revision as the topic is being discussed in a different development thread --- src/debug.cc | 5 +++-- src/disk.cc | 4 ++-- src/ipc.cc | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/debug.cc b/src/debug.cc index beafa4eb77..5d573a8abb 100644 --- a/src/debug.cc +++ b/src/debug.cc @@ -465,11 +465,12 @@ _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: " << xstrerr(errno)); + debugs(0, DBG_IMPORTANT, "log rotation failed: " << xstrerror()); } } diff --git a/src/disk.cc b/src/disk.cc index 0d8ecbc71a..67dec9c45d 100644 --- 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 << ": " << xstrerr(errno)); + debugs(50, DBG_IMPORTANT, "error in seek for fd " << fd << ": " << xstrerror()); // 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 << ": " << xstrerr(errno)); + debugs(50, DBG_IMPORTANT, "error in seek for fd " << fd << ": " << xstrerror()); // XXX handle failures? } ++ statCounter.syscalls.disk.seeks; diff --git a/src/ipc.cc b/src/ipc.cc index ea9e1b478d..da4b062467 100644 --- 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(fds[0],snd) failed: " << xstrerr(errno)); + debugs(54, DBG_IMPORTANT, "setsockopt failed: " << xstrerror()); errno = 0; } if (setsockopt(fds[0], SOL_SOCKET, SO_RCVBUF, (void *) &buflen, sizeof(buflen)) == -1) { - debugs(54, DBG_IMPORTANT, "setsockopt(fds[0],rcv) failed: " << xstrerr(errno)); + debugs(54, DBG_IMPORTANT, "setsockopt failed: " << xstrerror()); errno = 0; } if (setsockopt(fds[1], SOL_SOCKET, SO_SNDBUF, (void *) &buflen, sizeof(buflen)) == -1) { - debugs(54, DBG_IMPORTANT, "setsockopt(fds[1],snd) failed: " << xstrerr(errno)); + debugs(54, DBG_IMPORTANT, "setsockopt failed: " << xstrerror()); errno = 0; } if (setsockopt(fds[1], SOL_SOCKET, SO_RCVBUF, (void *) &buflen, sizeof(buflen)) == -1) { - debugs(54, DBG_IMPORTANT, "setsockopt(fds[1],rcv) failed: " << xstrerr(errno)); + debugs(54, DBG_IMPORTANT, "setsockopt failed: " << xstrerror()); errno = 0; } fd_open(prfd = pwfd = fds[0], FD_PIPE, "IPC UNIX STREAM Parent"); -- 2.47.2