From: Kaj-Michael Lang <milang@onion.tal.org>
Date: Wed, 25 Jul 2007 09:31:42 +0000 (+0300)
Subject: Remove warnings
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=738402c188a8fee67c62ed2e6e439cbff83627e2;p=mapper

Remove warnings
---

diff --git a/src/osm-db.c b/src/osm-db.c
index 2df7a31..7c916f2 100644
--- a/src/osm-db.c
+++ b/src/osm-db.c
@@ -9,10 +9,12 @@
 #include <fcntl.h>
 #include <math.h>
 #include <glib.h>
+#include <glib/gstdio.h>
 #include <sqlite3.h>
 #include <expat.h>
 
 #include "osm.h"
+#include "latlon.h"
 
 struct sql_select_stmt {
 	sqlite3_stmt *select_way;
@@ -25,6 +27,8 @@ struct sql_select_stmt {
 static struct sql_select_stmt sql;
 
 gboolean osm_way_get_nodes(osm_way *w);
+gboolean osm_way_get_name(osm_way *w);
+gboolean osm_way_get_ref(osm_way *w);
 
 gboolean
 osm_db_prepare(sqlite3 *db)
@@ -314,7 +318,6 @@ switch (g_list_length(w)) {
 	break;
 	default:
 	{
-		gint dist=900000, ndist;
 		gdouble pdist=900000.0, pndist=9000000.0;
 
 		for (iter=w; iter!=NULL; iter=iter->next) {
@@ -388,7 +391,7 @@ if (cw->type==WAY_MOTORWAY || cw->type==WAY_TRUNK ||
 g_printf("BEST WAY(%d): %s (%s,%s)\n", 
 	cw->id, cw->name, cw->ref, cw->int_ref);
 g_printf("\tT: %d F: %d N: %d D: %f\n", 
-	cw->type, cw->flags, cw->nodes, cw->dist);
+	cw->type, cw->flags, cw->nodecnt, cw->dist);
 g_printf("\tNF: %d NT: %d DT %f\n", 
 	cw->node_f->num, 
 	cw->node_t->num, cw->distance);