From 838995c2238573c19ae62fa53897c6ada6472d06 Mon Sep 17 00:00:00 2001 From: horwitz Date: Fri, 11 Mar 2011 08:47:22 +0000 Subject: [PATCH] Fix:core:Fix some warnings git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4328 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/navit/debug.c | 2 +- navit/navit/graphics.c | 2 +- navit/navit/search.h | 2 ++ navit/navit/xmlconfig.c | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/navit/navit/debug.c b/navit/navit/debug.c index d69d066..779276a 100644 --- a/navit/navit/debug.c +++ b/navit/navit/debug.c @@ -58,7 +58,7 @@ int timestamp_prefix=0; static int dummy; static GHashTable *debug_hash; -static const gchar *gdb_program; +static gchar *gdb_program; static FILE *debug_fp; diff --git a/navit/navit/graphics.c b/navit/navit/graphics.c index 329ebd7..692e85b 100644 --- a/navit/navit/graphics.c +++ b/navit/navit/graphics.c @@ -1251,7 +1251,7 @@ graphics_draw_polyline_as_polygon(struct graphics *gra, struct graphics_gc *gc, struct point *res=g_alloca(sizeof(struct point)*maxpoints); struct point pos, poso, neg, nego; int i, dx=0, dy=0, l=0, dxo=0, dyo=0; - struct offset o,oo; + struct offset o,oo={}; int fow=0, fowo=0, delta; int wi, ppos = maxpoints/2, npos = maxpoints/2; int state,prec=5; diff --git a/navit/navit/search.h b/navit/navit/search.h index 64f6009..82daf7e 100644 --- a/navit/navit/search.h +++ b/navit/navit/search.h @@ -74,6 +74,7 @@ struct attr; struct mapset; struct search_list; struct search_list_result; +struct jni_object; struct search_list *search_list_new(struct mapset *ms); void search_list_search(struct search_list *this_, struct attr *search_attr, int partial); char *search_postal_merge(char *mask, char *new_); @@ -82,6 +83,7 @@ struct search_list_common *search_list_select(struct search_list *this_, enum at struct search_list_result *search_list_get_result(struct search_list *this_); void search_list_destroy(struct search_list *this_); void search_init(void); +GList * search_by_address(GList *result_list,struct mapset *ms, char *addr, int partial, struct jni_object *jni); /* end of prototypes */ #ifdef __cplusplus } diff --git a/navit/navit/xmlconfig.c b/navit/navit/xmlconfig.c index ef2272a..4fbe38f 100644 --- a/navit/navit/xmlconfig.c +++ b/navit/navit/xmlconfig.c @@ -320,7 +320,7 @@ static char *element_fixmes[]={ NULL,NULL, }; -static void initStatic() { +static void initStatic(void) { elements=g_new0(struct element_func,40); //39 is a number of elements + ending NULL element elements[0].name="config"; -- 2.7.4