From b8c2eb2e6c1a61ea1422f8137a7289160eb8f0a0 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Tue, 3 Nov 2015 15:09:22 +0000 Subject: [PATCH] Clarified handling of file descriptor. Coverity CID 28753. --- libisoburn/trunk/xorriso/read_run.c | 6 +++--- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libisoburn/trunk/xorriso/read_run.c b/libisoburn/trunk/xorriso/read_run.c index 0731d09f..e9545deb 100644 --- a/libisoburn/trunk/xorriso/read_run.c +++ b/libisoburn/trunk/xorriso/read_run.c @@ -2,7 +2,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2014 Thomas Schmitt, + Copyright 2007-2015 Thomas Schmitt, Provided under GPL version 2 or later. @@ -668,7 +668,7 @@ int Xorriso_tree_restore_node(struct XorrisO *xorriso, IsoNode *node, break; } } - if(write_fd > 0) + if(write_fd != -1) close(write_fd); write_fd= -1; if(todo > 0 && xorriso->extract_error_mode == 2 && open_path_pt != NULL) { @@ -779,7 +779,7 @@ restore_properties:; if(todo < 0) ret= 0; ex:; - if(write_fd >= 0) { + if(write_fd != -1) { close(write_fd); if(ret <= 0 && xorriso->extract_error_mode == 2 && open_path_pt != NULL) unlink(open_path_pt); diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index da056d17..f870d305 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2015.11.03.145920" +#define Xorriso_timestamP "2015.11.03.150839"