maptool: migrate free to g_free

8 files changed, 23 insertions, 35 deletions

diff --git a/navit/maptool/buffer.c b/navit/maptool/buffer.c
index bc191419c..68160f789 100644
--- a/navit/maptool/buffer.c
+++ b/navit/maptool/buffer.c
@@ -60,8 +60,7 @@ load_buffer(char *filename, struct buffer *b, long long offset, long long size)
 	long long len;
 	dbg_assert(size>=0);
 	dbg_assert(offset>=0);
-	if (b->base)
-		free(b->base);
+	g_free(b->base);
 	b->malloced=0;
 	f=fopen(filename,"rb");
 	fseeko(f, 0, SEEK_END);
diff --git a/navit/maptool/google/protobuf-c/protobuf-c.c b/navit/maptool/google/protobuf-c/protobuf-c.c
index 7cb727bf9..17a6f5a42 100644
--- a/navit/maptool/google/protobuf-c/protobuf-c.c
+++ b/navit/maptool/google/protobuf-c/protobuf-c.c
@@ -106,7 +106,7 @@ static void *system_alloc(void *allocator_data, size_t size)
   (void) allocator_data;
   if (size == 0)
     return NULL;
-  rv = malloc (size);
+  rv = g_malloc (size);
   if (rv == NULL)
     protobuf_c_out_of_memory ();
   return rv;
@@ -114,9 +114,8 @@ static void *system_alloc(void *allocator_data, size_t size)
 
 static void system_free (void *allocator_data, void *data)
 {
-  (void) allocator_data;
-  if (data)
-    free (data);
+	(void) allocator_data;
+	g_free (data);
 }
 
 /* Some users may configure the default allocator;
diff --git a/navit/maptool/maptool.c b/navit/maptool/maptool.c
index 21cd42e35..f8946aa58 100644
--- a/navit/maptool/maptool.c
+++ b/navit/maptool/maptool.c
@@ -1014,7 +1014,7 @@ int main(int argc, char **argv)
 				osm_resolve_coords_and_split_at_intersections(&p, suffix);
 			}
 		}
-		free(node_buffer.base);
+		g_free(node_buffer.base);
 		node_buffer.base=NULL;
 		node_buffer.malloced=0;
 		node_buffer.size=0;
diff --git a/navit/maptool/misc.c b/navit/maptool/misc.c
index 53ed24407..0f0b375a8 100644
--- a/navit/maptool/misc.c
+++ b/navit/maptool/misc.c
@@ -364,7 +364,7 @@ process_slice(FILE **in, FILE **reference, int in_count, int with_range, long lo
 			dbg_assert(fwrite(th->zip_data, th->total_size, 1, zip_get_index(zip_info))==1);
 		}
 	}
-	free(slice_data);
+	g_free(slice_data);
 
 	return zipfiles;
 }
diff --git a/navit/maptool/osm_protobuf.c b/navit/maptool/osm_protobuf.c
index 1216f868a..1b4294a70 100644
--- a/navit/maptool/osm_protobuf.c
+++ b/navit/maptool/osm_protobuf.c
@@ -91,12 +91,12 @@ uncompress_blob(OSMPBF__Blob *blob)
 	strm.next_out=ret;
 	zerr = inflateInit(&strm);
 	if (zerr != Z_OK) {
-		free(ret);
+		g_free(ret);
 		return NULL;
 	}
 	zerr = inflate(&strm, Z_NO_FLUSH);
 	if (zerr != Z_STREAM_END) {
-		free(ret);
+		g_free(ret);
 		return NULL;
 	}
 	inflateEnd(&strm);
@@ -370,14 +370,14 @@ map_collect_data_osm_protobuf(FILE *in, struct maptool_osm *osm)
 			process_osmdata(blob, data, osm);
 		} else {
 			printf("skipping fileblock of unknown type '%s'\n", header->type);
-			free(buffer);
+			g_free(buffer);
 			return 0;
 		}
-		free(data);
+		g_free(data);
 		osmpbf__blob__free_unpacked(blob, &protobuf_c_system_allocator);
 		osmpbf__blob_header__free_unpacked(header, &protobuf_c_system_allocator);
 	}
-	free(buffer);
+	g_free(buffer);
 #if 0
 	printf("</osm>\n");
 #endif
diff --git a/navit/maptool/osm_protobufdb.c b/navit/maptool/osm_protobufdb.c
index 09625ce4d..ba0ef84a5 100644
--- a/navit/maptool/osm_protobufdb.c
+++ b/navit/maptool/osm_protobufdb.c
@@ -298,10 +298,8 @@ osm_protobufdb_modify_node(OSMPBF__Node *node, OSMPBF__Info *info, int pos, OSMP
 	OSMPBF__Node *n=pg->nodes[pos];
 	OSMPBF__Info *old_info;
 
-	if (n->keys)
-		free(n->keys);
-	if (n->vals)
-		free(n->vals);
+	g_free(n->keys);
+	g_free(n->vals);
 	old_info=n->info;
 	*n=*node;
 	if (!info) {
@@ -339,12 +337,9 @@ osm_protobufdb_modify_way(OSMPBF__Way *way, OSMPBF__Info *info, int pos, OSMPBF_
 	int i;
 	long long ref=0;
 
-	if (w->keys)
-		free(w->keys);
-	if (w->vals)
-		free(w->vals);
-	if (w->refs)
-		free(w->refs);
+	g_free(w->keys);
+	g_free(w->vals);
+	g_free(w->refs);
 	old_info=w->info;
 	*w=*way;
 	for (i = 0 ; i < w->n_refs ; i++) {
@@ -386,16 +381,11 @@ osm_protobufdb_modify_relation(OSMPBF__Relation *relation, OSMPBF__Info *info, i
 	int i;
 	long long ref=0;
 
-	if (r->keys)
-		free(r->keys);
-	if (r->vals)
-		free(r->vals);
-	if (r->roles_sid)
-		free(r->roles_sid);
-	if (r->memids)
-		free(r->memids);
-	if (r->types)
-		free(r->types);
+	g_free(r->keys);
+	g_free(r->vals);
+	g_free(r->roles_sid);
+	g_free(r->memids);
+	g_free(r->types);
 	old_info=r->info;
 	*r=*relation;
 	for (i = 0 ; i < r->n_memids ; i++) {
diff --git a/navit/maptool/tile.c b/navit/maptool/tile.c
index e9485f2db..bdb2c5ac8 100644
--- a/navit/maptool/tile.c
+++ b/navit/maptool/tile.c
@@ -414,7 +414,7 @@ write_aux_tiles(struct zip_info *zip_info)
 			l=g_list_next(l);
 			zip_add_member(zip_info);
 		}
-		free(buffer);
+		g_free(buffer);
 	}
 	return count;
 }
diff --git a/navit/maptool/zip.c b/navit/maptool/zip.c
index 6e62bc14e..fa95c1674 100644
--- a/navit/maptool/zip.c
+++ b/navit/maptool/zip.c
@@ -175,7 +175,7 @@ write_zipmember(struct zip_info *zip_info, char *name, int filelen, char *data,
 		zip_info->dir_size+=sizeof(cd_ext);
 	}
 	
-	free(compbuffer);
+	g_free(compbuffer);
 }
 
 int