diff options
Diffstat (limited to 'navit/binding/dbus/binding_dbus.c')
| -rw-r--r-- | navit/binding/dbus/binding_dbus.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/navit/binding/dbus/binding_dbus.c b/navit/binding/dbus/binding_dbus.c index 84ed7fe00..3470bdd4e 100644 --- a/navit/binding/dbus/binding_dbus.c +++ b/navit/binding/dbus/binding_dbus.c @@ -626,13 +626,13 @@ static char *get_iter_name(char *type) { } static DBusHandlerResult request_attr_iter(DBusConnection *connection, DBusMessage *message, char *type, - struct attr_iter *(*func)(void)) { + struct attr_iter *(*func)(void*)) { DBusMessage *reply; char *iter_name; char *opath; struct attr_iter *attr_iter; - attr_iter=(*func)(); + attr_iter=(*func)(NULL); iter_name=get_iter_name(type); opath=object_new(iter_name,attr_iter); g_free(iter_name); @@ -833,7 +833,7 @@ static DBusHandlerResult request_config_get_attr(DBusConnection *connection, DBu } static DBusHandlerResult request_config_attr_iter(DBusConnection *connection, DBusMessage *message) { - return request_attr_iter(connection, message, "config", (struct attr_iter * (*)(void))config_attr_iter_new); + return request_attr_iter(connection, message, "config", (struct attr_iter * (*)(void*))config_attr_iter_new); } static DBusHandlerResult request_config_attr_iter_destroy(DBusConnection *connection, DBusMessage *message) { @@ -941,7 +941,7 @@ static DBusHandlerResult request_map_dump(DBusConnection *connection, DBusMessag /* mapset */ static DBusHandlerResult request_mapset_attr_iter(DBusConnection *connection, DBusMessage *message) { - return request_attr_iter(connection, message, "mapset", (struct attr_iter * (*)(void))mapset_attr_iter_new); + return request_attr_iter(connection, message, "mapset", (struct attr_iter * (*)(void*))mapset_attr_iter_new); } static DBusHandlerResult request_mapset_attr_iter_destroy(DBusConnection *connection, DBusMessage *message) { @@ -986,7 +986,7 @@ static DBusHandlerResult request_roadprofile_set_attr(DBusConnection *connection } static DBusHandlerResult request_roadprofile_attr_iter(DBusConnection *connection, DBusMessage *message) { - return request_attr_iter(connection, message, "roadprofile", (struct attr_iter * (*)(void))roadprofile_attr_iter_new); + return request_attr_iter(connection, message, "roadprofile", (struct attr_iter * (*)(void*))roadprofile_attr_iter_new); } static DBusHandlerResult request_roadprofile_attr_iter_destroy(DBusConnection *connection, DBusMessage *message) { @@ -1232,6 +1232,7 @@ static DBusHandlerResult request_navit_traffic_export_gpx(DBusConnection *connec " xmlns='http://www.topografix.com/GPX/1/1'\n" " xsi:schemaLocation='http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd'>\n"; char *trailer = "</gpx>\n"; + memset(&c_last, 0, sizeof(c_last)); navit = object_get_from_message(message, "navit"); if (! navit) @@ -1955,7 +1956,7 @@ static DBusHandlerResult request_vehicleprofile_set_attr(DBusConnection *connect static DBusHandlerResult request_vehicleprofile_attr_iter(DBusConnection *connection, DBusMessage *message) { return request_attr_iter(connection, message, "vehicleprofile", - (struct attr_iter * (*)(void))vehicleprofile_attr_iter_new); + (struct attr_iter * (*)(void*))vehicleprofile_attr_iter_new); } static DBusHandlerResult request_vehicleprofile_attr_iter_destroy(DBusConnection *connection, DBusMessage *message) { |