From: <ho...@us...> - 2008-12-29 12:24:45
|
Revision: 1872 http://navit.svn.sourceforge.net/navit/?rev=1872&view=rev Author: horwitz Date: 2008-12-29 12:24:42 +0000 (Mon, 29 Dec 2008) Log Message: ----------- core:fix:fix some warnings Modified Paths: -------------- trunk/navit/navit/binding/python/navit.c trunk/navit/navit/data/binfile/binfile.c trunk/navit/navit/data/mg/map.c trunk/navit/navit/gui/gtk/datawindow.c trunk/navit/navit/gui/gtk/gui_gtk_statusbar.c trunk/navit/navit/gui/gtk/gui_gtk_window.c trunk/navit/navit/map.c trunk/navit/navit/map.h trunk/navit/navit/maptype.h trunk/navit/navit/navit.c trunk/navit/navit/navit.h Modified: trunk/navit/navit/binding/python/navit.c =================================================================== --- trunk/navit/navit/binding/python/navit.c 2008-12-29 12:22:29 UTC (rev 1871) +++ trunk/navit/navit/binding/python/navit.c 2008-12-29 12:24:42 UTC (rev 1872) @@ -76,7 +76,6 @@ static PyObject * navit_zoom_to_route_py(navitObject *self, PyObject *args) { - PyObject *pcoord; if (!PyArg_ParseTuple(args, "")) return NULL; navit_zoom_to_route(self->navit); Modified: trunk/navit/navit/data/binfile/binfile.c =================================================================== --- trunk/navit/navit/data/binfile/binfile.c 2008-12-29 12:22:29 UTC (rev 1871) +++ trunk/navit/navit/data/binfile/binfile.c 2008-12-29 12:24:42 UTC (rev 1872) @@ -472,7 +472,7 @@ map_rect_new_binfile(struct map_priv *map, struct map_selection *sel) { struct map_rect_priv *mr; - struct tile t; + struct tile t={}; binfile_check_version(map); dbg(1,"map_rect_new_binfile\n"); Modified: trunk/navit/navit/data/mg/map.c =================================================================== --- trunk/navit/navit/data/mg/map.c 2008-12-29 12:22:29 UTC (rev 1871) +++ trunk/navit/navit/data/mg/map.c 2008-12-29 12:24:42 UTC (rev 1872) @@ -175,7 +175,6 @@ file_next(struct map_rect_priv *mr) { int debug=0; - enum layer_type layer; for (;;) { mr->current_file++; Modified: trunk/navit/navit/gui/gtk/datawindow.c =================================================================== --- trunk/navit/navit/gui/gtk/datawindow.c 2008-12-29 12:22:29 UTC (rev 1871) +++ trunk/navit/navit/gui/gtk/datawindow.c 2008-12-29 12:24:42 UTC (rev 1872) @@ -142,7 +142,7 @@ return FALSE; } -void +static void gui_gtk_datawindow_destroy(struct datawindow_priv *win) { if ((!win->gui) || (!win->gui->datawindow)) { @@ -156,11 +156,13 @@ return; } +#if 0 void gui_gtk_datawindow_set_button(struct datawindow_priv *this_, GtkWidget *btn) { this_->button = btn; } +#endif static gboolean keypress(GtkWidget *widget, GdkEventKey *event, struct datawindow_priv *win) Modified: trunk/navit/navit/gui/gtk/gui_gtk_statusbar.c =================================================================== --- trunk/navit/navit/gui/gtk/gui_gtk_statusbar.c 2008-12-29 12:22:29 UTC (rev 1871) +++ trunk/navit/navit/gui/gtk/gui_gtk_statusbar.c 2008-12-29 12:24:42 UTC (rev 1872) @@ -45,9 +45,7 @@ struct callback *vehicle_cb; }; - - - +#if 0 static void statusbar_destroy(struct statusbar_priv *this) { @@ -68,6 +66,7 @@ gtk_label_set_text(GTK_LABEL(this->gps), this->gps_text); } +#endif static char *status_fix2str(int type) { @@ -94,7 +93,7 @@ char buffer[128]; double lng, lat, direction=0, height=0, speed=0, hdop=0; int sats=0, qual=0; - int status; + int status=0; char *dirs[]={_("N"),_("NE"),_("E"),_("SE"),_("S"),_("SW"),_("W"),_("NW"),_("N")}; char *dir; int dir_idx; Modified: trunk/navit/navit/gui/gtk/gui_gtk_window.c =================================================================== --- trunk/navit/navit/gui/gtk/gui_gtk_window.c 2008-12-29 12:22:29 UTC (rev 1871) +++ trunk/navit/navit/gui/gtk/gui_gtk_window.c 2008-12-29 12:24:42 UTC (rev 1872) @@ -147,7 +147,6 @@ struct coord *p; struct pcoord pc; t=navit_get_trans(this->nav); - struct coord *c=transform_center(t); p=transform_center(t); pc.pro=projection_mg; p->y+=50*cos(transform_get_yaw(t)*M_PI/180); @@ -162,7 +161,6 @@ struct coord *p; struct pcoord pc; t=navit_get_trans(this->nav); - struct coord *c=transform_center(t); p=transform_center(t); pc.pro=projection_mg; p->y-=50*cos(transform_get_yaw(t)*M_PI/180); Modified: trunk/navit/navit/map.c =================================================================== --- trunk/navit/navit/map.c 2008-12-29 12:22:29 UTC (rev 1871) +++ trunk/navit/navit/map.c 2008-12-29 12:24:42 UTC (rev 1872) @@ -659,7 +659,7 @@ } void -map_dump_file(struct map *map, char *file) +map_dump_file(struct map *map, const char *file) { FILE *f; f=fopen(file,"w"); Modified: trunk/navit/navit/map.h =================================================================== --- trunk/navit/navit/map.h 2008-12-29 12:22:29 UTC (rev 1871) +++ trunk/navit/navit/map.h 2008-12-29 12:24:42 UTC (rev 1872) @@ -253,7 +253,7 @@ int map_selection_contains_item(struct map_selection *sel, int follow, enum item_type type); int map_priv_is(struct map *map, struct map_priv *priv); void map_dump_filedesc(struct map *map, FILE *out); -void map_dump_file(struct map *map, char *file); +void map_dump_file(struct map *map, const char *file); void map_dump(struct map *map); /* end of prototypes */ Modified: trunk/navit/navit/maptype.h =================================================================== --- trunk/navit/navit/maptype.h 2008-12-29 12:22:29 UTC (rev 1871) +++ trunk/navit/navit/maptype.h 2008-12-29 12:24:42 UTC (rev 1872) @@ -21,6 +21,7 @@ #define NAVIT_MAPTYPE_H struct map_methods; +enum projection; struct maptype { char *name; @@ -29,7 +30,6 @@ }; /* prototypes */ -enum projection; struct map_methods; struct map_priv; struct maptype; Modified: trunk/navit/navit/navit.c =================================================================== --- trunk/navit/navit/navit.c 2008-12-29 12:22:29 UTC (rev 1871) +++ trunk/navit/navit/navit.c 2008-12-29 12:24:42 UTC (rev 1872) @@ -836,7 +836,7 @@ * @returns nothing */ void -navit_set_destination(struct navit *this_, struct pcoord *c, char *description) +navit_set_destination(struct navit *this_, struct pcoord *c, const char *description) { if (c) { this_->destination=*c; Modified: trunk/navit/navit/navit.h =================================================================== --- trunk/navit/navit/navit.h 2008-12-29 12:22:29 UTC (rev 1871) +++ trunk/navit/navit/navit.h 2008-12-29 12:24:42 UTC (rev 1872) @@ -62,7 +62,7 @@ void navit_zoom_out(struct navit *this_, int factor, struct point *p); struct navit *navit_new(struct attr *parent, struct attr **attrs); struct graphics *navit_get_graphics(struct navit *this_); -void navit_set_destination(struct navit *this_, struct pcoord *c, char *description); +void navit_set_destination(struct navit *this_, struct pcoord *c, const char *description); void navit_add_bookmark(struct navit *this_, struct pcoord *c, const char *description); void navit_say(struct navit *this_, char *text); void navit_speak(struct navit *this_); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |