[Navit-cvs-commit] SF.net SVN: navit:[1573] trunk/navit/navit/navit.c

[<mar...@us...>]

Revision: 1573
          http://navit.svn.sourceforge.net/navit/?rev=1573&view=rev
Author:   martin-s
Date:     2008-10-27 09:28:17 +0000 (Mon, 27 Oct 2008)

Log Message:
-----------
Fix:Core:Fixed wrong usage of mapset_add_attr

Modified Paths:
--------------
    trunk/navit/navit/navit.c

Modified: trunk/navit/navit/navit.c
===================================================================
--- trunk/navit/navit/navit.c	2008-10-27 09:20:11 UTC (rev 1572)
+++ trunk/navit/navit/navit.c	2008-10-27 09:28:17 UTC (rev 1573)
@@ -1229,13 +1229,9 @@
 		ms=this_->mapsets->data;
 		if (this_->route) {
 			if ((map=route_get_map(this_->route)))
-				mapset_add_attr(ms, (struct attr*[]){
-                               	&(struct attr){attr_map,{map}},
-                                NULL});
+				mapset_add_attr(ms, &(struct attr){attr_map,.u.map=map});
 			if ((map=route_get_graph_map(this_->route))) {
-				mapset_add_attr(ms, (struct attr*[]){
-                               	&(struct attr){attr_map,{map}},
-                                NULL});
+				mapset_add_attr(ms, &(struct attr){attr_map,.u.map=map});
 				map_set_attr(map, &(struct attr ){attr_active,.u.num=0});
 			}
 			route_set_mapset(this_->route, ms);
@@ -1248,17 +1244,13 @@
 		}
 		if (this_->navigation) {
 			if ((map=navigation_get_map(this_->navigation))) {
-				mapset_add_attr(ms, (struct attr*[]){
-                               	&(struct attr){attr_map,{map}},
-                                NULL});
+				mapset_add_attr(ms, &(struct attr){attr_map,.u.map=map});
 				map_set_attr(map, &(struct attr ){attr_active,.u.num=0});
 			}
 		}
 		if (this_->tracking) {
 			if ((map=tracking_get_map(this_->tracking))) {
-				mapset_add_attr(ms, (struct attr*[]){
-                               	&(struct attr){attr_map,{map}},
-                                NULL});
+				mapset_add_attr(ms, &(struct attr){attr_map,.u.map=map});
 				map_set_attr(map, &(struct attr ){attr_active,.u.num=0});
 			}
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.