From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 14 Nov 2012 02:30:30 +0000 (-0700)
Subject: unlinkd: Compiler warning cleanups
X-Git-Tag: SQUID_3_4_0_1~513
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f084aafe81c47468fd7e0091a462b34bfd3e132;p=thirdparty%2Fsquid.git

unlinkd: Compiler warning cleanups

Check the return value for open(/dev/null). Nothing we can do about it
since the daemon has already disconnected from cache.log but note that.

 Detected by Coverity Scan. Issue 740328
---

diff --git a/src/unlinkd_daemon.cc b/src/unlinkd_daemon.cc
index a143a82625..c621e1c464 100644
--- a/src/unlinkd_daemon.cc
+++ b/src/unlinkd_daemon.cc
@@ -77,9 +77,11 @@ main(int argc, char *argv[])
     setbuf(stdin, NULL);
     setbuf(stdout, NULL);
     close(2);
-    open(_PATH_DEVNULL, O_RDWR);
+    if (open(_PATH_DEVNULL, O_RDWR) < 0) {
+        ; // the irony of having to close(2) earlier is that we cannot report this failure.
+    }
 
-    while (fgets(buf, UNLINK_BUF_LEN, stdin)) {
+    while (fgets(buf, sizeof(buf), stdin)) {
         if ((t = strchr(buf, '\n')))
             *t = '\0';
         x = unlink(buf);