summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220>2015-05-10 13:16:59 +0000
committersleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220>2015-05-10 13:16:59 +0000
commitd414008072abf34ff7d2896a84d53e5138e707c2 (patch)
treee46f2d9b7650ad40ff82048b98124e8d9903b690
parent552bb6eaa6101c6c82b619ae4f7b761c50a0f568 (diff)
downloadnavit-svn-d414008072abf34ff7d2896a84d53e5138e707c2.tar.gz
Fix:binding_dbus:Fix warnings and remove wrong, unused code in GeoJSON export.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6089 ffa7fe5e-494d-0410-b361-a75ebd5db220
-rw-r--r--navit/binding/dbus/binding_dbus.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/navit/binding/dbus/binding_dbus.c b/navit/binding/dbus/binding_dbus.c
index c499b7fd..ed239948 100644
--- a/navit/binding/dbus/binding_dbus.c
+++ b/navit/binding/dbus/binding_dbus.c
@@ -1445,7 +1445,7 @@ static DBusHandlerResult
request_navit_route_export_geojson(DBusConnection *connection, DBusMessage *message)
{
char * filename;
- struct point p, *pp=NULL;
+ struct point p;
struct navit *navit;
DBusMessageIter iter;
@@ -1462,7 +1462,6 @@ request_navit_route_export_geojson(DBusConnection *connection, DBusMessage *mess
dbus_message_iter_next(&iter);
if (!point_get_from_message(message, &iter, &p))
return dbus_error_invalid_parameter(connection, message);
- pp=&p;
}
dbg(lvl_debug,"Dumping route from dbus to %s\n", filename);
@@ -1471,10 +1470,9 @@ request_navit_route_export_geojson(DBusConnection *connection, DBusMessage *mess
struct navigation * nav = NULL;
struct map_rect * mr=NULL;
struct item *item = NULL;
- struct attr attr,route;
+ struct attr attr;
struct coord c;
struct coord_geo g;
- struct transformation *trans;
char *header = "{\n"
" \"type\": \"FeatureCollection\",\n"
@@ -1497,14 +1495,13 @@ request_navit_route_export_geojson(DBusConnection *connection, DBusMessage *mess
map = navigation_get_map(nav);
if(map)
mr = map_rect_new(map,NULL);
- trans = navit_get_trans (nav);
FILE *fp;
fp = fopen(filename,"w");
fprintf(fp, "%s", header);
int is_first=1;
char * instructions;
- instructions=g_strdup_printf("");
+ instructions=g_strdup("");
while((item = map_rect_get_item(mr))) {
if(item_attr_get(item,attr_navigation_long,&attr)) {
item_coord_get(item, &c, 1);