Merge branch 'trunk' into androidmaxmapfilesize

8 files changed, 25 insertions, 25 deletions

diff --git a/navit/map/binfile/binfile.c b/navit/map/binfile/binfile.c
index 865e3d72b..6108154b6 100644
--- a/navit/map/binfile/binfile.c
+++ b/navit/map/binfile/binfile.c
@@ -2647,7 +2647,7 @@ static void binfile_check_version(struct map_priv *m) {
 
 static struct map_priv *map_new_binfile(struct map_methods *meth, struct attr **attrs, struct callback_list *cbl) {
     struct map_priv *m;
-    struct attr *data=attr_search(attrs, NULL, attr_data);
+    struct attr *data=attr_search(attrs, attr_data);
     struct attr *check_version,*flags,*url,*download_enabled;
     struct file_wordexp *wexp;
     char **wexp_data;
@@ -2664,16 +2664,16 @@ static struct map_priv *map_new_binfile(struct map_methods *meth, struct attr **
     m->id=++map_id;
     m->filename=g_strdup(wexp_data[0]);
     file_wordexp_destroy(wexp);
-    check_version=attr_search(attrs, NULL, attr_check_version);
+    check_version=attr_search(attrs, attr_check_version);
     if (check_version)
         m->check_version=check_version->u.num;
-    flags=attr_search(attrs, NULL, attr_flags);
+    flags=attr_search(attrs, attr_flags);
     if (flags)
         m->flags=flags->u.num;
-    url=attr_search(attrs, NULL, attr_url);
+    url=attr_search(attrs, attr_url);
     if (url)
         m->url=g_strdup(url->u.str);
-    download_enabled = attr_search(attrs, NULL, attr_update);
+    download_enabled = attr_search(attrs, attr_update);
     if (download_enabled)
         m->download_enabled=download_enabled->u.num;
 
diff --git a/navit/map/csv/csv.c b/navit/map/csv/csv.c
index e463985b0..e54a840d4 100644
--- a/navit/map/csv/csv.c
+++ b/navit/map/csv/csv.c
@@ -661,7 +661,7 @@ static struct map_priv *map_new_csv(struct map_methods *meth, struct attr **attr
     m->qitem_hash = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, quadtree_item_free_do);
     m->tree_root = tree_root;
 
-    attr_types = attr_search(attrs, NULL, attr_attr_types);
+    attr_types = attr_search(attrs, attr_attr_types);
     if(attr_types) {
         enum attr_type* at = attr_types->u.attr_types;
         while(*at != attr_none) {
@@ -682,7 +682,7 @@ static struct map_priv *map_new_csv(struct map_methods *meth, struct attr **attr
         return NULL;
     }
 
-    charset  = attr_search(attrs, NULL, attr_charset);
+    charset  = attr_search(attrs, attr_charset);
     if(charset) {
         dbg(lvl_debug,"charset:%s",charset->u.str);
         m->charset=g_strdup(charset->u.str);
@@ -694,7 +694,7 @@ static struct map_priv *map_new_csv(struct map_methods *meth, struct attr **attr
         return NULL;
     }
 
-    item_type_attr=attr_search(attrs, NULL, attr_item_type);
+    item_type_attr=attr_search(attrs, attr_item_type);
 
     if( !item_type_attr || item_type_attr->u.item_type==type_none) {
         return NULL;
@@ -702,13 +702,13 @@ static struct map_priv *map_new_csv(struct map_methods *meth, struct attr **attr
 
     m->item_type = item_type_attr->u.item_type;
 
-    flags=attr_search(attrs, NULL, attr_flags);
+    flags=attr_search(attrs, attr_flags);
     if (flags)
         m->flags=flags->u.num;
 
     *meth = map_methods_csv;
 
-    data=attr_search(attrs, NULL, attr_data);
+    data=attr_search(attrs, attr_data);
 
     if(data) {
         struct file_wordexp *wexp;
diff --git a/navit/map/filter/filter.c b/navit/map/filter/filter.c
index c8f4f1029..1925b9e80 100644
--- a/navit/map/filter/filter.c
+++ b/navit/map/filter/filter.c
@@ -354,7 +354,7 @@ static struct map_methods map_methods_filter = {
 
 static struct map_priv *map_filter_new(struct map_methods *meth, struct attr **attrs, struct callback_list *cbl) {
     struct map_priv *m=NULL;
-    struct attr **parent_attrs,type,*subtype=attr_search(attrs, NULL, attr_subtype),*filter=attr_search(attrs, NULL,
+    struct attr **parent_attrs,type,*subtype=attr_search(attrs, attr_subtype),*filter=attr_search(attrs,
             attr_filter);
     struct map *map;
     int i,j;
diff --git a/navit/map/garmin/garmin.c b/navit/map/garmin/garmin.c
index 00a6fa115..2f4808b3b 100644
--- a/navit/map/garmin/garmin.c
+++ b/navit/map/garmin/garmin.c
@@ -873,16 +873,16 @@ static struct map_priv *gmap_new(struct map_methods *meth, struct attr **attrs,
     struct gar_config cfg;
     int debugmask = 0;
 
-    data=attr_search(attrs, NULL, attr_data);
+    data=attr_search(attrs, attr_data);
     if (! data)
         return NULL;
-    debug=attr_search(attrs, NULL, attr_debug);
+    debug=attr_search(attrs, attr_debug);
     if (debug) {
         dl = atoi(debug->u.str);
         if (!dl)
             dl = 1;
     }
-    flags=attr_search(attrs, NULL, attr_flags);
+    flags=attr_search(attrs, attr_flags);
     if (flags) {
         debugmask = flags->u.num;
     }
diff --git a/navit/map/garmin_img/garmin_img.c b/navit/map/garmin_img/garmin_img.c
index 73a7dc92b..79219cf06 100644
--- a/navit/map/garmin_img/garmin_img.c
+++ b/navit/map/garmin_img/garmin_img.c
@@ -1411,7 +1411,7 @@ static struct map_methods map_methods_garmin_img = {
 
 static struct map_priv *map_new_garmin_img(struct map_methods *meth, struct attr **attrs) {
     struct map_priv *m;
-    struct attr *data=attr_search(attrs, NULL, attr_data);
+    struct attr *data=attr_search(attrs, attr_data);
     if (! data)
         return NULL;
 
diff --git a/navit/map/mg/map.c b/navit/map/mg/map.c
index 50860e193..071ba131e 100644
--- a/navit/map/mg/map.c
+++ b/navit/map/mg/map.c
@@ -549,7 +549,7 @@ struct map_priv *
 map_new_mg(struct map_methods *meth, struct attr **attrs, struct callback_list *cbl) {
     struct map_priv *m;
     int i,maybe_missing;
-    struct attr *data=attr_search(attrs, NULL, attr_data);
+    struct attr *data=attr_search(attrs, attr_data);
     char *filename;
     struct file_wordexp *wexp;
     char **wexp_data;
@@ -561,7 +561,7 @@ map_new_mg(struct map_methods *meth, struct attr **attrs, struct callback_list *
     wexp_data=file_wordexp_get_array(wexp);
 
     *meth=map_methods_mg;
-    data=attr_search(attrs, NULL, attr_data);
+    data=attr_search(attrs, attr_data);
 
     m=g_new(struct map_priv, 1);
     m->id=++map_id;
diff --git a/navit/map/shapefile/shapefile.c b/navit/map/shapefile/shapefile.c
index 1031b6903..66e7cb380 100644
--- a/navit/map/shapefile/shapefile.c
+++ b/navit/map/shapefile/shapefile.c
@@ -590,10 +590,10 @@ static struct map_methods map_methods_shapefile = {
 
 static struct map_priv *map_new_shapefile(struct map_methods *meth, struct attr **attrs, struct callback_list *cbl) {
     struct map_priv *m;
-    struct attr *data=attr_search(attrs, NULL, attr_data);
-    struct attr *charset=attr_search(attrs, NULL, attr_charset);
-    struct attr *projectionname=attr_search(attrs, NULL, attr_projectionname);
-    struct attr *flags=attr_search(attrs, NULL, attr_flags);
+    struct attr *data=attr_search(attrs, attr_data);
+    struct attr *charset=attr_search(attrs, attr_charset);
+    struct attr *projectionname=attr_search(attrs, attr_projectionname);
+    struct attr *flags=attr_search(attrs, attr_flags);
     struct file_wordexp *wexp;
     char *wdata;
     char **wexp_data;
diff --git a/navit/map/textfile/textfile.c b/navit/map/textfile/textfile.c
index 12381d6c0..0211a4526 100644
--- a/navit/map/textfile/textfile.c
+++ b/navit/map/textfile/textfile.c
@@ -328,10 +328,10 @@ static struct map_methods map_methods_textfile = {
 
 static struct map_priv *map_new_textfile(struct map_methods *meth, struct attr **attrs, struct callback_list *cbl) {
     struct map_priv *m;
-    struct attr *data=attr_search(attrs, NULL, attr_data);
-    struct attr *charset=attr_search(attrs, NULL, attr_charset);
-    struct attr *flags=attr_search(attrs, NULL, attr_flags);
-    struct attr *no_warn=attr_search(attrs, NULL, attr_no_warning_if_map_file_missing);
+    struct attr *data=attr_search(attrs, attr_data);
+    struct attr *charset=attr_search(attrs, attr_charset);
+    struct attr *flags=attr_search(attrs, attr_flags);
+    struct attr *no_warn=attr_search(attrs, attr_no_warning_if_map_file_missing);
     struct file_wordexp *wexp;
     int len,is_pipe=0;
     char *wdata;