summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-03-27 11:26:33 +0100
committerKarolin Seeger <kseeger@samba.org>2008-04-10 16:17:59 +0200
commit779048d9f07f1103e1e64be2e49bc0402e545cd7 (patch)
tree74723d03553350babbdb2e0150275f752a383d30
parent1addb4d44032d9737bf829cebdf8b4b8998a6b44 (diff)
downloadsamba-779048d9f07f1103e1e64be2e49bc0402e545cd7.tar.gz
samba-779048d9f07f1103e1e64be2e49bc0402e545cd7.tar.xz
samba-779048d9f07f1103e1e64be2e49bc0402e545cd7.zip
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 (cherry picked from commit 451fc9ae05f841883081a334e179cf31625a772c)
-rw-r--r--source/lib/replace/test/os2_delete.c9
1 files changed, 8 insertions, 1 deletions
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");
+ }
}
}