Fix:Core:Fix some compiler warnings.

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

9 files changed, 22 insertions, 22 deletions

diff --git a/navit/binding/dbus/binding_dbus.c b/navit/binding/dbus/binding_dbus.c
index a2fd1193f..ed15be5bd 100644
--- a/navit/binding/dbus/binding_dbus.c
+++ b/navit/binding/dbus/binding_dbus.c
@@ -119,9 +119,7 @@ static void *
 object_get_from_message_arg(DBusMessage *message, char *type)
 {
 	char *opath;
-	char *prefix;
 	DBusError error;
-	void *ret=NULL;
 
 	dbus_error_init(&error);
 	if (!dbus_message_get_args(message, &error, DBUS_TYPE_OBJECT_PATH, &opath, DBUS_TYPE_INVALID)) {
@@ -743,10 +741,7 @@ request_graphics_get_data(DBusConnection *connection, DBusMessage *message)
 	struct graphics *graphics;
 	char *data;
 	struct graphics_data_image *image;
-	struct attr attr;
 	DBusMessage *reply;
-	int *error;
-	int i;
 
 	graphics = object_get_from_message(message, "graphics");
 	if (! graphics)
@@ -814,7 +809,7 @@ struct dbus_method {
 static char *
 introspect_path(char *object)
 {
-	char *ret,*s,*d;
+	char *ret;
 	int i;
 	char *def=".default_";
 	int def_len=strlen(def);
@@ -878,7 +873,7 @@ generate_navitintrospectxml(char *object)
         navitintrospectxml = g_strconcat_printf(navitintrospectxml, "    </method>\n");
         
         // close the interface if we reached the last method or the interface changes
-        if ((methods_size == i+1) || (methods_size > i+1) && strcmp(dbus_methods[i+1].path, dbus_methods[i].path))
+        if ((methods_size == i+1) || ((methods_size > i+1) && strcmp(dbus_methods[i+1].path, dbus_methods[i].path)))
             navitintrospectxml = g_strconcat_printf(navitintrospectxml, "  </interface>\n\n");
     }
     // close the "mother tag"
diff --git a/navit/graphics.c b/navit/graphics.c
index 4703fa32a..5e722f857 100644
--- a/navit/graphics.c
+++ b/navit/graphics.c
@@ -1567,7 +1567,9 @@ graphics_draw_itemgra(struct graphics *gra, struct itemgra *itm, struct transfor
 	GList *es;
 	struct point p;
 	struct coord c;
+#if 0
 	char *label=NULL;
+#endif
 	struct graphics_gc *gc = NULL;
 	struct graphics_image *img;
 	char path[PATH_MAX];
diff --git a/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c b/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
index ce8257a52..ca1168ea7 100644
--- a/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
+++ b/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
@@ -665,7 +665,7 @@ button_press(GtkWidget * widget, GdkEventButton * event, gpointer user_data)
 
 	if (event->button < 8) {
 		if (this->button[event->button])
-			return;
+			return FALSE;
 		this->button[event->button]=1;
 	}
 	p.x=event->x;
@@ -682,7 +682,7 @@ button_release(GtkWidget * widget, GdkEventButton * event, gpointer user_data)
 
 	if (event->button < 8) {
 		if (!this->button[event->button])
-			return;
+			return FALSE;
 		this->button[event->button]=0;
 	}
 	p.x=event->x;
@@ -1048,9 +1048,6 @@ graphics_gtk_drawing_area_new(struct navit *nav, struct graphics_methods *meth,
 	gtk_widget_set_events(draw, GDK_BUTTON_PRESS_MASK|GDK_BUTTON_RELEASE_MASK|GDK_POINTER_MOTION_MASK|GDK_KEY_PRESS_MASK);
 	g_signal_connect(G_OBJECT(draw), "expose_event", G_CALLBACK(expose), this);
         g_signal_connect(G_OBJECT(draw), "configure_event", G_CALLBACK(configure), this);
-#if 0
-        g_signal_connect(G_OBJECT(draw), "realize_event", G_CALLBACK(realize), co);
-#endif
 	g_signal_connect(G_OBJECT(draw), "button_press_event", G_CALLBACK(button_press), this);
 	g_signal_connect(G_OBJECT(draw), "button_release_event", G_CALLBACK(button_release), this);
 	g_signal_connect(G_OBJECT(draw), "scroll_event", G_CALLBACK(scroll), this);
diff --git a/navit/map/mg/map.c b/navit/map/mg/map.c
index 42b5fa598..976d6850e 100644
--- a/navit/map/mg/map.c
+++ b/navit/map/mg/map.c
@@ -316,7 +316,7 @@ map_rect_get_item_byid_mg(struct map_rect_priv *mr, int id_hi, int id_lo)
 }
 
 
-static void
+void
 map_rect_destroy_mg(struct map_rect_priv *mr)
 {
 	int i;
diff --git a/navit/map/mg/mg.h b/navit/map/mg/mg.h
index b8218d985..9eddf2fe9 100644
--- a/navit/map/mg/mg.h
+++ b/navit/map/mg/mg.h
@@ -348,4 +348,6 @@ int tree_search_next(struct tree_search *ts, unsigned char **p, int dir);
 int tree_search_next_lin(struct tree_search *ts, unsigned char **p);
 struct item * housenumber_search_get_item(struct map_rect_priv *mr);
 struct map_rect_priv * map_rect_new_mg(struct map_priv *map, struct map_selection *sel);
+void map_rect_destroy_mg(struct map_rect_priv *mr);
 struct item *map_rect_get_item_byid_mg(struct map_rect_priv *mr, int id_hi, int id_lo);
+int housenumber_search_setup(struct map_rect_priv *mr);
diff --git a/navit/map/mg/street.c b/navit/map/mg/street.c
index 8025b9460..0593003ce 100644
--- a/navit/map/mg/street.c
+++ b/navit/map/mg/street.c
@@ -17,6 +17,7 @@
  * Boston, MA  02110-1301, USA.
  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
@@ -986,6 +987,7 @@ street_name_coord_get(void *priv_data, struct coord *c, int count)
 	return 0;
 }
 
+#if 0
 static void
 debug(struct map_rect_priv *mr)
 {
@@ -1027,13 +1029,12 @@ debug(struct map_rect_priv *mr)
 				}
 			}
 }
+#endif
 
 static int
 street_name_attr_get(void *priv_data, enum attr_type attr_type, struct attr *attr)
 {
 	struct map_rect_priv *mr=priv_data;
-	struct item *item;
-	struct attr attrd;
 
 	attr->type=attr_type;
 	switch (attr_type) {
@@ -1171,7 +1172,7 @@ static int
 street_name_numbers_get_next(struct map_rect_priv *mr, struct street_name *name, char *start, char **p, int mode, int *id, struct street_name_numbers *ret)
 {
 	struct street_name_numbers tmp;
-	char *s,*ps,*pt;
+	char *ps,*pt;
 	int found;
 	while (*p < name->aux_data+name->aux_len) {
 		ps=*p;
@@ -1199,8 +1200,6 @@ street_name_numbers_get_next(struct map_rect_priv *mr, struct street_name *name,
 static struct item *
 street_search_get_item_street_name_district(struct map_rect_priv *mr, int flag)
 {
-	struct street_name_numbers name_numbers;
-	int id=mr->item.id_hi & 0xff;
 	if (street_name_eod(&mr->street.name))
 		return NULL;
 	if (!street_name_numbers_get_next(mr, &mr->street.name, NULL, &mr->street.name.tmp_data, 1, &mr->item.id_hi, &mr->street.name_numbers))
@@ -1272,9 +1271,7 @@ housenumber_coord_get(void *priv_data, struct coord *c, int count)
 static int
 housenumber_attr_get(void *priv_data, enum attr_type attr_type, struct attr *attr)
 {
-	struct map_rect_priv *mr=priv_data,*mrt;
-	struct item *item;
-	struct attr attrn;
+	struct map_rect_priv *mr=priv_data;
 	attr->type=attr_type;
 	switch (attr_type) {
 	case attr_house_number:
@@ -1337,7 +1334,7 @@ housenumber_search_setup(struct map_rect_priv *mr)
 	return 1;
 }
 
-int
+static int
 house_number_next(char *number, char *first, char *last, int interpolation, int *percentage)
 {
 	int firstn=atoi(first);
diff --git a/navit/map/poi_geodownload/libmdb/table.c b/navit/map/poi_geodownload/libmdb/table.c
index 1f39f1dde..c19600754 100644
--- a/navit/map/poi_geodownload/libmdb/table.c
+++ b/navit/map/poi_geodownload/libmdb/table.c
@@ -34,6 +34,7 @@ static gint mdb_col_comparer(MdbColumn **a, MdbColumn **b)
 		return 0;
 }
 
+#if 0
 static unsigned char mdb_col_needs_size(int col_type)
 {
 	if (col_type == MDB_TEXT) {
@@ -42,6 +43,7 @@ static unsigned char mdb_col_needs_size(int col_type)
 		return FALSE;
 	}
 }
+#endif
 
 MdbTableDef *mdb_alloc_tabledef(MdbCatalogEntry *entry)
 {
diff --git a/navit/map/shapefile/shptree.c b/navit/map/shapefile/shptree.c
index d89a6cf4e..b8f42a772 100644
--- a/navit/map/shapefile/shptree.c
+++ b/navit/map/shapefile/shptree.c
@@ -82,7 +82,9 @@
 #include <cpl_error.h>
 #endif
 
+#if 0
 SHP_CVSID("$Id: shptree.c,v 1.12 2008/11/12 15:39:50 fwarmerdam Exp $")
+#endif
 
 #ifndef TRUE
 #  define TRUE 1
diff --git a/navit/track.c b/navit/track.c
index f4ffc140f..cdd50f5d9 100644
--- a/navit/track.c
+++ b/navit/track.c
@@ -33,6 +33,7 @@
 #include "mapset.h"
 #include "plugin.h"
 #include "vehicleprofile.h"
+#include "vehicle.h"
 
 struct tracking_line
 {
@@ -129,6 +130,7 @@ tracking_init_cdf(struct cdf_data *cdf, int hist_size)
 // Mininum distance (square of it..), below which we ignore gps updates
 #define CDF_MINDIST 49 // 7 meters, I guess this value has to be changed for pedestrians.
 
+#if 0
 static void
 tracking_process_cdf(struct cdf_data *cdf, struct pcoord *pin, struct pcoord *pout, int dirin, int *dirout, int cur_speed, time_t fixtime)
 {
@@ -278,6 +280,7 @@ tracking_process_cdf(struct cdf_data *cdf, struct pcoord *pin, struct pcoord *po
 
 	cdf->available = 1;
 } 
+#endif
 
 int
 tracking_get_angle(struct tracking *tr)