fix: added changes as suggested by @pgrandin on github

4 files changed, 6 insertions, 3 deletions

diff --git a/navit/maptool/buffer.c b/navit/maptool/buffer.c
index a11b81373..e6f8beea0 100644
--- a/navit/maptool/buffer.c
+++ b/navit/maptool/buffer.c
@@ -51,6 +51,7 @@ save_buffer(char *filename, struct buffer *b, long long offset)
  * @param filename The name of the while to where the buffer is loaded from.
  * @param b Buffer in which file is loaded.
  * @param offset
+ * @return indicator if operation suceeded
  */
 int
 load_buffer(char *filename, struct buffer *b, long long offset, long long size)
@@ -88,6 +89,7 @@ load_buffer(char *filename, struct buffer *b, long long offset, long long size)
  * This function determines the size of the buffer required to read a file. 
  *
  * @param  filename Name of file for which the required size of the buffer is determined
+ * @return required size of buffer
  */
 long long
 sizeof_buffer(char *filename)
diff --git a/navit/maptool/maptool.c b/navit/maptool/maptool.c
index 9965a9f16..21cd42e35 100644
--- a/navit/maptool/maptool.c
+++ b/navit/maptool/maptool.c
@@ -131,7 +131,6 @@ progress_time(void)
 	const int buflen=20;
 	char buf[buflen];
 	int pos=1;
-	int write_result;
 	buf[0]=' ';
 #ifdef _WIN32
 	gettimeofday(&ts, NULL);
@@ -143,8 +142,7 @@ progress_time(void)
 	seconds%=60;
 	pos+=assafe_strcp2buf(seconds>9?":":":0", buflen-pos, buf+pos);
 	pos+=assafe_lltoa(seconds, buflen-pos, buf+pos);
-	write_result = write(2,buf,pos);
-	if (write_result == -1){
+	if (write(2,buf,pos) == -1){
 		dbg(lvl_warning, "Writing progress time failed. Error-Code: %d" , errno);
 	}
 }
diff --git a/navit/maptool/tile.c b/navit/maptool/tile.c
index 23fd62dad..237558a68 100644
--- a/navit/maptool/tile.c
+++ b/navit/maptool/tile.c
@@ -408,6 +408,8 @@ write_aux_tiles(struct zip_info *zip_info)
 		
 	        if (fread(buffer, at->size, 1, f) == 0){
 			dbg(lvl_warning, "fread failed");
+			fclose(f);
+			continue;
 		}
 		fclose(f);
 		write_zipmember(zip_info, at->name, zip_get_maxnamelen(zip_info), buffer, at->size);
diff --git a/navit/maptool/zip.c b/navit/maptool/zip.c
index 0e8543fa2..497b6fd24 100644
--- a/navit/maptool/zip.c
+++ b/navit/maptool/zip.c
@@ -193,6 +193,7 @@ zip_write_index(struct zip_info *info)
 	
 	if (fread(buffer, size, 1, info->index) == 0){
 		dbg(lvl_warning, "fread failed");
+		return;
 	}
 	write_zipmember(info, "index", strlen("index"), buffer, size);
 	info->zipnum++;