From 35f33a26404866c676285356a17e42b56523008a Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Thu, 27 Mar 2008 11:26:33 +0100
Subject: 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
(This used to be commit 4ae4692bc6c6da15483a6f4a3363cdc23121efc7)
---
 source4/lib/replace/test/os2_delete.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'source4/lib/replace/test/os2_delete.c')

diff --git a/source4/lib/replace/test/os2_delete.c b/source4/lib/replace/test/os2_delete.c
index c6ef180017..b45c135355 100644
--- a/source4/lib/replace/test/os2_delete.c
+++ b/source4/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");
+		}
 	}
 }
 
-- 
cgit