diff options
author | Joseph Herlant <herlantj@gmail.com> | 2018-05-25 22:06:51 -0700 |
---|---|---|
committer | Joseph Herlant <aerostitch@users.noreply.github.com> | 2018-05-25 22:17:50 -0700 |
commit | 8a76acb966f7059caf9d72c853175bd923b1e9d7 (patch) | |
tree | 1735178f7a0718831b88d2c36ea18a9955de3224 /navit/maps.c | |
parent | 032f15287b472f1a4b5349533f3e5b468684b281 (diff) | |
download | navit-8a76acb966f7059caf9d72c853175bd923b1e9d7.tar.gz |
cleanup:global:Use astyle to reformat everything
Diffstat (limited to 'navit/maps.c')
-rw-r--r-- | navit/maps.c | 125 |
1 files changed, 62 insertions, 63 deletions
diff --git a/navit/maps.c b/navit/maps.c index 91a85bcd5..4caf6dcf8 100644 --- a/navit/maps.c +++ b/navit/maps.c @@ -28,75 +28,74 @@ struct maps; struct maps * -maps_new(struct attr *parent, struct attr **attrs) -{ - struct attr *data,**attrs_dup; - if (!parent) { - dbg(lvl_error,"No parent"); - return NULL; - } - if (parent->type != attr_mapset) { - dbg(lvl_error,"Parent must be mapset"); - return NULL; - } - dbg(lvl_debug,"enter"); - attrs_dup=attr_list_dup(attrs); - data=attr_search(attrs_dup, NULL, attr_data); - if (data) { - struct file_wordexp *wexp=file_wordexp_new(data->u.str); - int i,count=file_wordexp_get_count(wexp); - char **array=file_wordexp_get_array(wexp); - struct attr *name; - struct attr *name_provided = attr_search(attrs_dup, NULL, attr_name); +maps_new(struct attr *parent, struct attr **attrs) { + struct attr *data,**attrs_dup; + if (!parent) { + dbg(lvl_error,"No parent"); + return NULL; + } + if (parent->type != attr_mapset) { + dbg(lvl_error,"Parent must be mapset"); + return NULL; + } + dbg(lvl_debug,"enter"); + attrs_dup=attr_list_dup(attrs); + data=attr_search(attrs_dup, NULL, attr_data); + if (data) { + struct file_wordexp *wexp=file_wordexp_new(data->u.str); + int i,count=file_wordexp_get_count(wexp); + char **array=file_wordexp_get_array(wexp); + struct attr *name; + struct attr *name_provided = attr_search(attrs_dup, NULL, attr_name); - // if no name was provided, fill the name with the location - if (!name_provided) { - struct attr name_tmp; - name_tmp.type = attr_name; - name_tmp.u.str="NULL"; - attrs_dup=attr_generic_add_attr(attrs_dup, &name_tmp); - name = attr_search(attrs_dup, NULL, attr_name); - } + // if no name was provided, fill the name with the location + if (!name_provided) { + struct attr name_tmp; + name_tmp.type = attr_name; + name_tmp.u.str="NULL"; + attrs_dup=attr_generic_add_attr(attrs_dup, &name_tmp); + name = attr_search(attrs_dup, NULL, attr_name); + } - for (i = 0 ; i < count ; i++) { - struct attr map; - g_free(data->u.str); - data->u.str=g_strdup(array[i]); + for (i = 0 ; i < count ; i++) { + struct attr map; + g_free(data->u.str); + data->u.str=g_strdup(array[i]); - if (!name_provided) { - g_free(name->u.str); - name->u.str=g_strdup(array[i]); - } + if (!name_provided) { + g_free(name->u.str); + name->u.str=g_strdup(array[i]); + } - map.type=attr_map; - map.u.map=map_new(parent, attrs_dup); + map.type=attr_map; + map.u.map=map_new(parent, attrs_dup); - if (map.u.map) { - mapset_add_attr(parent->u.mapset, &map); - navit_object_unref(map.u.navit_object); - } - - } - file_wordexp_destroy(wexp); - } else { - dbg(lvl_error,"no data attribute"); - } - attr_list_free(attrs_dup); - return NULL; + if (map.u.map) { + mapset_add_attr(parent->u.mapset, &map); + navit_object_unref(map.u.navit_object); + } + + } + file_wordexp_destroy(wexp); + } else { + dbg(lvl_error,"no data attribute"); + } + attr_list_free(attrs_dup); + return NULL; } struct object_func maps_func = { - attr_maps, - (object_func_new)maps_new, - (object_func_get_attr)NULL, - (object_func_iter_new)NULL, - (object_func_iter_destroy)NULL, - (object_func_set_attr)NULL, - (object_func_add_attr)NULL, - (object_func_remove_attr)NULL, - (object_func_init)NULL, - (object_func_destroy)NULL, - (object_func_dup)NULL, - (object_func_ref)NULL, - (object_func_unref)NULL, + attr_maps, + (object_func_new)maps_new, + (object_func_get_attr)NULL, + (object_func_iter_new)NULL, + (object_func_iter_destroy)NULL, + (object_func_set_attr)NULL, + (object_func_add_attr)NULL, + (object_func_remove_attr)NULL, + (object_func_init)NULL, + (object_func_destroy)NULL, + (object_func_dup)NULL, + (object_func_ref)NULL, + (object_func_unref)NULL, }; |