Fix:Core:Cleaned up useless vehicle parameter

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@2745 ffa7fe5e-494d-0410-b361-a75ebd5db220

7 files changed, 11 insertions, 14 deletions

diff --git a/navit/gui/internal/gui_internal.c b/navit/gui/internal/gui_internal.c
index 8f49f4816..d7272f39d 100644
--- a/navit/gui/internal/gui_internal.c
+++ b/navit/gui/internal/gui_internal.c
@@ -3275,7 +3275,7 @@ gui_internal_cmd_set_active_profile(struct gui_priv *this, struct
 
 	// Change the profile name
 	struct attr profilename_attr = {attr_profilename, {profilename}};
-	if(!vehicle_set_attr(v, &profilename_attr, NULL)) {
+	if(!vehicle_set_attr(v, &profilename_attr)) {
 		dbg(0, "Unable to set the vehicle's profile name\n");
 	}
 
diff --git a/navit/navit.c b/navit/navit.c
index 0f94dc49e..89ae60478 100644
--- a/navit/navit.c
+++ b/navit/navit.c
@@ -1716,9 +1716,9 @@ navit_set_attr_do(struct navit *this_, struct attr *attr, int init)
 			if (nv->vehicle == attr->u.vehicle) {
 				if (!this_->vehicle || this_->vehicle->vehicle != attr->u.vehicle) {
 					if (this_->vehicle)
-						vehicle_set_attr(this_->vehicle->vehicle, &active, NULL);
+						vehicle_set_attr(this_->vehicle->vehicle, &active);
 					active.u.num=1;
-					vehicle_set_attr(nv->vehicle, &active, NULL);
+					vehicle_set_attr(nv->vehicle, &active);
 					attr_updated=1;
 				}
 				navit_set_vehicle(this_, nv);
@@ -2215,7 +2215,7 @@ navit_add_vehicle(struct navit *this_, struct vehicle *v)
 	nv->callback.type=attr_callback;
 	nv->callback.u.callback=callback_new_attr_2(callback_cast(navit_vehicle_update), attr_position_coord_geo, this_, nv);
 	vehicle_add_attr(nv->vehicle, &nv->callback);
-	vehicle_set_attr(nv->vehicle, &this_->self, NULL);
+	vehicle_set_attr(nv->vehicle, &this_->self);
 	return 1;
 }
 
diff --git a/navit/vehicle.c b/navit/vehicle.c
index 6fe75ee1e..cf9331861 100644
--- a/navit/vehicle.c
+++ b/navit/vehicle.c
@@ -193,12 +193,11 @@ vehicle_get_attr(struct vehicle *this_, enum attr_type type, struct attr *attr,
  * @param attrs
  */
 int
-vehicle_set_attr(struct vehicle *this_, struct attr *attr,
-		 struct attr **attrs)
+vehicle_set_attr(struct vehicle *this_, struct attr *attr)
 {
 	int ret=1;
 	if (this_->meth.set_attr)
-		ret=this_->meth.set_attr(this_->priv, attr, attrs);
+		ret=this_->meth.set_attr(this_->priv, attr);
 	if (ret == 1 && attr->type != attr_navit)
 		this_->attrs=attr_generic_set_attr(this_->attrs, attr);
 	return ret != 0;
diff --git a/navit/vehicle.h b/navit/vehicle.h
index c8a2b3dfe..4e578259a 100644
--- a/navit/vehicle.h
+++ b/navit/vehicle.h
@@ -30,7 +30,7 @@ struct vehicle_priv;
 struct vehicle_methods {
 	void (*destroy)(struct vehicle_priv *priv);
 	int (*position_attr_get)(struct vehicle_priv *priv, enum attr_type type, struct attr *attr);
-	int (*set_attr)(struct vehicle_priv *priv, struct attr *attr, struct attr **attrs);
+	int (*set_attr)(struct vehicle_priv *priv, struct attr *attr);
 };
 
 /* prototypes */
@@ -41,7 +41,7 @@ struct attr_iter *vehicle_attr_iter_new(void);
 void vehicle_attr_iter_destroy(struct attr_iter *iter); 
 
 int vehicle_get_attr(struct vehicle *this_, enum attr_type type, struct attr *attr, struct attr_iter *iter);
-int vehicle_set_attr(struct vehicle *this_, struct attr *attr, struct attr **attrs);
+int vehicle_set_attr(struct vehicle *this_, struct attr *attr);
 int vehicle_add_attr(struct vehicle *this_, struct attr *attr);
 int vehicle_remove_attr(struct vehicle *this_, struct attr *attr);
 
diff --git a/navit/vehicle/demo/vehicle_demo.c b/navit/vehicle/demo/vehicle_demo.c
index d58de97c5..bf507e134 100644
--- a/navit/vehicle/demo/vehicle_demo.c
+++ b/navit/vehicle/demo/vehicle_demo.c
@@ -82,8 +82,7 @@ vehicle_demo_position_attr_get(struct vehicle_priv *priv,
 }
 
 static int
-vehicle_demo_set_attr(struct vehicle_priv *priv, struct attr *attr,
-		      struct attr **attrs)
+vehicle_demo_set_attr(struct vehicle_priv *priv, struct attr *attr)
 {
 	if (attr->type == attr_navit) 
 		priv->navit = attr->u.navit;
diff --git a/navit/vehicle/iphone/vehicle_iphone.c b/navit/vehicle/iphone/vehicle_iphone.c
index 1b27a24d2..e69747a1c 100644
--- a/navit/vehicle/iphone/vehicle_iphone.c
+++ b/navit/vehicle/iphone/vehicle_iphone.c
@@ -86,8 +86,7 @@ vehicle_iphone_position_attr_get(struct vehicle_priv *priv,
 }
 
 static int
-vehicle_iphone_set_attr(struct vehicle_priv *priv, struct attr *attr,
-		      struct attr **attrs)
+vehicle_iphone_set_attr(struct vehicle_priv *priv, struct attr *attr)
 {
 	if (attr->type == attr_navit) {
 		priv->navit = attr->u.navit;
diff --git a/navit/vehicle/null/vehicle_null.c b/navit/vehicle/null/vehicle_null.c
index 121c837ab..6b4985e64 100644
--- a/navit/vehicle/null/vehicle_null.c
+++ b/navit/vehicle/null/vehicle_null.c
@@ -120,7 +120,7 @@ vehicle_null_position_attr_get(struct vehicle_priv *priv,
 }
 
 static int
-vehicle_null_set_attr(struct vehicle_priv *priv, struct attr *attr, struct attr **attrs)
+vehicle_null_set_attr(struct vehicle_priv *priv, struct attr *attr)
 {
 	switch (attr->type) {
 	case attr_position_speed: