summaryrefslogtreecommitdiffstats
path: root/src/io
diff options
context:
space:
mode:
authorKris De Gussem <kris.degussem@gmail.com>2016-02-22 20:16:54 +0000
committerKris De Gussem <Kris.De.Gussem@hotmail.com>2016-02-22 20:16:54 +0000
commit4aca329e373b27be4f8171e9f6cf2c8e04d591bc (patch)
tree5701d2888ac16c9469949ab6d0267cc94284dd4e /src/io
parentstatic code analysis (diff)
downloadinkscape-4aca329e373b27be4f8171e9f6cf2c8e04d591bc.tar.gz
inkscape-4aca329e373b27be4f8171e9f6cf2c8e04d591bc.zip
static code analysis
(bzr r14665)
Diffstat (limited to 'src/io')
-rw-r--r--src/io/inkjar.cpp17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/io/inkjar.cpp b/src/io/inkjar.cpp
index fb1fedf55..345455c4a 100644
--- a/src/io/inkjar.cpp
+++ b/src/io/inkjar.cpp
@@ -103,14 +103,19 @@ bool JarFile::init_inflation()
bool JarFile::open()
{
+ if (_file != NULL) {
+ fclose(_file);
+ }
if ((_file = fopen(_filename, "r")) == NULL) {
- fprintf(stderr, "open failed.\n");
- return false;
+ fprintf(stderr, "open failed.\n");
+ return false;
+ }
+ if (!init_inflation()) {
+ return false;
+ }
+ else {
+ return true;
}
- if (!init_inflation())
- return false;
-
- return true;
}
bool JarFile::close()