changeset 181:bea93c8651b7

Merged
author Sascha Wilde <wilde@intevation.de>
date Tue, 25 Mar 2014 17:56:56 +0100
parents 344b8a79ad2e (current diff) 8fafd0fc2173 (diff)
children 6c3a089d3265 d4e97c9b199f
files cinst/mozilla.c
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/cinst/mozilla.c	Tue Mar 25 17:51:24 2014 +0100
+++ b/cinst/mozilla.c	Tue Mar 25 17:56:56 2014 +0100
@@ -188,6 +188,7 @@
                 relative_path = true;
             }
         }
+      fclose(inifile);
     }
   else
     {
--- a/common/listutil.c	Tue Mar 25 17:51:24 2014 +0100
+++ b/common/listutil.c	Tue Mar 25 17:56:56 2014 +0100
@@ -22,7 +22,7 @@
 #include <polarssl/sha256.h>
 #pragma GCC diagnostic pop
 
-#define MAX_FILESIZE MAX_LINE_LENGTH * MAX_LINES
+#define MAX_FILESIZE (MAX_LINE_LENGTH * MAX_LINES)
 
 /**
  *  @brief Read a file into memory.
@@ -192,6 +192,8 @@
         }
         if (ret == READ_FILE_UNREADABLE) {
             /* TODO: work with errno ? */
+	    /* errsv = errno; */
+	    /* perror("read_and_verify_list(), READ_FILE_UNREADABLE:");  */
             return SeekFailed;
         }
         if (ret == READ_FILE_READ_FAILED) {

http://wald.intevation.org/projects/trustbridge/