diff options
Diffstat (limited to 'navit/maptool/tile.c')
| -rw-r--r-- | navit/maptool/tile.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/navit/maptool/tile.c b/navit/maptool/tile.c index bdb2c5ac8..6f61b9471 100644 --- a/navit/maptool/tile.c +++ b/navit/maptool/tile.c @@ -245,8 +245,7 @@ merge_tile(char *base, char *sub) g_hash_table_insert(tile_hash, string_hash_lookup( thb->name ), thb); } else { - thb=realloc(thb, sizeof(struct tile_head)+( ths->num_subtiles+thb->num_subtiles ) * sizeof( char*) ); - assert(thb != NULL); + thb=g_realloc(thb, sizeof(struct tile_head)+( ths->num_subtiles+thb->num_subtiles ) * sizeof( char*) ); memcpy( th_get_subtile( thb, thb->num_subtiles ), th_get_subtile( ths, 0 ), ths->num_subtiles * sizeof( char*) ); thb->num_subtiles+=ths->num_subtiles; thb->total_size+=ths->total_size; @@ -510,14 +509,9 @@ load_tilesdir(FILE *in) #if 0 printf("subtile '%s'\n",subtile); #endif - struct tile_head *th_tmp=realloc(th, sizeof(struct tile_head)+(th->num_subtiles+1)*sizeof(char*)); - if (th_tmp == NULL) { - printf("Memory allocation failure, unable to load subtiles\n"); - } else { - th = th_tmp; - *th_get_subtile( th, th->num_subtiles ) = string_hash_lookup(subtile); - th->num_subtiles++; - } + th=g_realloc(th, sizeof(struct tile_head)+(th->num_subtiles+1)*sizeof(char*)); + *th_get_subtile( th, th->num_subtiles ) = string_hash_lookup(subtile); + th->num_subtiles++; } *last=th; last=&th->next; |