From d519f4825e5a1753d08e63d9add1468bf6f4a16b Mon Sep 17 00:00:00 2001 From: wessels <> Date: Thu, 28 Mar 1996 12:21:46 +0000 Subject: [PATCH] Use O_NDELAY rather than FNDELAY --- src/comm.cc | 10 +++++----- src/disk.cc | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/comm.cc b/src/comm.cc index f516191aa1..60c031b294 100644 --- a/src/comm.cc +++ b/src/comm.cc @@ -1,5 +1,5 @@ -/* $Id: comm.cc,v 1.9 1996/03/27 18:15:41 wessels Exp $ */ +/* $Id: comm.cc,v 1.10 1996/03/28 05:21:46 wessels Exp $ */ #include "squid.h" @@ -173,8 +173,8 @@ int comm_open(io_type, port, handler, note) return (COMM_ERROR); } #else - if (fcntl(new_socket, F_SETFL, FNDELAY)) { - debug(0, 0, "comm_open: FD %d: Failure to set FNDELAY: %s\n", + if (fcntl(new_socket, F_SETFL, O_NDELAY)) { + debug(0, 0, "comm_open: FD %d: Failure to set O_NDELAY: %s\n", new_socket, xstrerror()); return (COMM_ERROR); } @@ -815,8 +815,8 @@ int commSetNonBlocking(fd) return (COMM_ERROR); } #else - if (fcntl(fd, F_SETFL, FNDELAY)) { - debug(0, 0, "comm_open: FD %d: error setting FNDELAY: %s\n", + if (fcntl(fd, F_SETFL, O_NDELAY)) { + debug(0, 0, "comm_open: FD %d: error setting O_NDELAY: %s\n", fd, xstrerror()); return (COMM_ERROR); } diff --git a/src/disk.cc b/src/disk.cc index c277bc2d1e..4ae1476803 100644 --- a/src/disk.cc +++ b/src/disk.cc @@ -1,4 +1,4 @@ -/* $Id: disk.cc,v 1.5 1996/03/27 18:15:43 wessels Exp $ */ +/* $Id: disk.cc,v 1.6 1996/03/28 05:21:46 wessels Exp $ */ #include "squid.h" @@ -143,8 +143,8 @@ int file_open(path, handler, mode) return DISK_ERROR; } #else - if (fcntl(fd, F_SETFL, FNDELAY) < 0) { - debug(0, 0, "file_open: FD %d: Failure to set FNDELAY: %s\n", + if (fcntl(fd, F_SETFL, O_NDELAY) < 0) { + debug(0, 0, "file_open: FD %d: Failure to set O_NDELAY: %s\n", fd, xstrerror()); return DISK_ERROR; } -- 2.47.3