From: Michael Adam <obnox@samba.org>
Date: Thu, 27 Mar 2008 10:26:33 +0000 (+0100)
Subject: libreplace: fix coverity ID 517 - untangle close from open in test/os2_delete.c
X-Git-Tag: samba-3.3.0pre1~3085
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=451fc9ae05f841883081a334e179cf31625a772c;p=thirdparty%2Fsamba.git

libreplace: fix coverity ID 517 - untangle close from open in test/os2_delete.c

This is not a proper bug but the code is clearer now
and we are tracking failure of open separate from that of close.

Michael
---

diff --git a/source/lib/replace/test/os2_delete.c b/source/lib/replace/test/os2_delete.c
index c6ef1800178..b45c135355a 100644
--- a/source/lib/replace/test/os2_delete.c
+++ b/source/lib/replace/test/os2_delete.c
@@ -39,8 +39,15 @@ static void create_files(void)
 	int i;
 	for (i=0;i<NUM_FILES;i++) {
 		char fname[40];
+		int fd;
 		sprintf(fname, TESTDIR "/test%u.txt", i);
-		close(open(fname, O_CREAT|O_RDWR, 0600)) == 0 || FAILED("close");
+		fd = open(fname, O_CREAT|O_RDWR, 0600);
+		if (fd < 0) {
+			FAILED("open");
+		}
+		if (close(fd) != 0) {
+			FAILED("close");
+		}
 	}
 }