diff options
| -rw-r--r-- | navit/command.c | 29 | ||||
| -rw-r--r-- | navit/command.h | 4 | ||||
| -rw-r--r-- | navit/gui/gtk/gui_gtk_window.c | 2 | ||||
| -rw-r--r-- | navit/map/mg/street.c | 4 | ||||
| -rw-r--r-- | navit/maptool/coastline.c | 26 | ||||
| -rw-r--r-- | navit/speech/cmdline/speech_cmdline.c | 2 | ||||
| -rw-r--r-- | navit/transform.c | 2 |
7 files changed, 34 insertions, 35 deletions
diff --git a/navit/command.c b/navit/command.c index 12d5d7d77..7767f0ae6 100644 --- a/navit/command.c +++ b/navit/command.c @@ -32,9 +32,9 @@ osd[type=="xxx"].active=0;osd[type=="yyy"].active=0 struct result { struct attr attr; double val; - char *var; + const char *var; int varlen; - char *attrn; + const char *attrn; int attrnlen; int allocated; }; @@ -42,7 +42,7 @@ struct result { struct context { struct attr *attr; int error; - char *expr; + const char *expr; struct result res; }; @@ -80,10 +80,11 @@ result_free(struct result *res) static int command_register_callbacks(struct command_saved *cs); -static char * +static const char * get_op(struct context *ctx, int test, ...) { - char *op,*ret=NULL; + char *op; + const char *ret=NULL; va_list ap; while (g_ascii_isspace(*ctx->expr)) { @@ -254,7 +255,7 @@ set_int(struct context *ctx, struct result *res, int val) static void eval_value(struct context *ctx, struct result *res) { - char *op; + const char *op; int len,dots=0; op=ctx->expr; res->varlen=0; @@ -417,7 +418,7 @@ static void eval_postfix(struct context *ctx, struct result *res) { struct result tmp; - char *op; + const char *op; eval_brace(ctx, res); if (ctx->error) return; @@ -448,7 +449,7 @@ eval_postfix(struct context *ctx, struct result *res) static void eval_unary(struct context *ctx, struct result *res) { - char *op; + const char *op; op=get_op(ctx,0,"~","!",NULL); if (op) { eval_unary(ctx, res); @@ -465,7 +466,7 @@ static void eval_multiplicative(struct context *ctx, struct result *res) { struct result tmp; - char *op; + const char *op; eval_unary(ctx, res); if (ctx->error) return; @@ -498,7 +499,7 @@ static void eval_additive(struct context *ctx, struct result *res) { struct result tmp; - char *op; + const char *op; eval_multiplicative(ctx, res); if (ctx->error) return; @@ -525,7 +526,7 @@ static void eval_equality(struct context *ctx, struct result *res) { struct result tmp; - char *op; + const char *op; eval_additive(ctx, res); if (ctx->error) return; @@ -744,7 +745,7 @@ void command(struct attr *attr, char *expr) #endif static void -command_evaluate_to(struct attr *attr, char *expr, struct context *ctx, struct result *res) +command_evaluate_to(struct attr *attr, const char *expr, struct context *ctx, struct result *res) { memset(res, 0, sizeof(*res)); memset(ctx, 0, sizeof(*ctx)); @@ -807,7 +808,7 @@ command_evaluate_to_int(struct attr *attr, char *expr, int *error) } int -command_evaluate_to_boolean(struct attr *attr, char *expr, int *error) +command_evaluate_to_boolean(struct attr *attr, const char *expr, int *error) { struct result res; struct context ctx; @@ -834,7 +835,7 @@ command_evaluate_to_boolean(struct attr *attr, char *expr, int *error) } void -command_evaluate(struct attr *attr, char *expr) +command_evaluate(struct attr *attr, const char *expr) { struct result res; struct context ctx; diff --git a/navit/command.h b/navit/command.h index ca30a9ad3..78b52142b 100644 --- a/navit/command.h +++ b/navit/command.h @@ -16,8 +16,8 @@ struct navit; void command_evaluate_to_void(struct attr *attr, char *expr, int *error); char *command_evaluate_to_string(struct attr *attr, char *expr, int *error); int command_evaluate_to_int(struct attr *attr, char *expr, int *error); -int command_evaluate_to_boolean(struct attr *attr, char *expr, int *error); -void command_evaluate(struct attr *attr, char *expr); +int command_evaluate_to_boolean(struct attr *attr, const char *expr, int *error); +void command_evaluate(struct attr *attr,const char *expr); void command_add_table_attr(struct command_table *table, int count, void *data, struct attr *attr); void command_add_table(struct callback_list *cbl, struct command_table *table, int count, void *data); void command_saved_set_cb(struct command_saved *cs, struct callback *cb); diff --git a/navit/gui/gtk/gui_gtk_window.c b/navit/gui/gtk/gui_gtk_window.c index d96fb8c28..2751adfa2 100644 --- a/navit/gui/gtk/gui_gtk_window.c +++ b/navit/gui/gtk/gui_gtk_window.c @@ -674,7 +674,7 @@ gui_gtk_init(struct gui_priv *this, struct navit *nav) } static struct gui_priv * -gui_gtk_new(struct navit *nav, struct gui_methods *meth, struct attr **attrs) +gui_gtk_new(struct navit *nav, struct gui_methods *meth, struct attr **attrs, struct gui *gui) { struct gui_priv *this; int w=792, h=547; diff --git a/navit/map/mg/street.c b/navit/map/mg/street.c index b4493ecb9..7f86996e1 100644 --- a/navit/map/mg/street.c +++ b/navit/map/mg/street.c @@ -1174,10 +1174,10 @@ district_debug(struct map_rect_priv *mr, int country, int dist) } 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) +street_name_numbers_get_next(struct map_rect_priv *mr, struct street_name *name, char *start, unsigned char **p, int mode, int *id, struct street_name_numbers *ret) { struct street_name_numbers tmp; - char *ps,*pt; + unsigned char *ps,*pt; int found; while (*p < name->aux_data+name->aux_len) { ps=*p; diff --git a/navit/maptool/coastline.c b/navit/maptool/coastline.c index a1ee73c42..7369ad7b3 100644 --- a/navit/maptool/coastline.c +++ b/navit/maptool/coastline.c @@ -146,9 +146,9 @@ tile_data_to_segments(int *tile_data) static void tile_collector_process_tile(char *tile, int *tile_data, struct coastline_tile_data *data) { - int poly_start_valid,tile_start_valid,exclude,search=0,workload=0; + int poly_start_valid,tile_start_valid,exclude,search=0; struct rect bbox; - struct coord c,cn[2],end,poly_start,tile_start; + struct coord cn[2],end,poly_start,tile_start; struct geom_poly_segment *first; struct item_bin *ib=(struct item_bin *)buffer; struct item_bin_sink *out=data->sink->priv_data[1]; @@ -441,8 +441,6 @@ tile_collector_add_siblings2(char *tile, void *edgesp, struct coastline_tile_dat char t=tile[len-1]; strcpy(tile2, tile); tile2[len-1]='\0'; - struct item_bin_sink *out=data->sink->priv_data[1]; - struct rect bbox; int edges=(int)edgesp; int pedges=0; int debug=0; @@ -488,28 +486,28 @@ tile_collector_finish(struct item_bin_sink_func *tile_collector) data.tile_edges=g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); GHashTable *hash=tile_collector->priv_data[0]; fprintf(stderr,"tile_collector_finish\n"); - g_hash_table_foreach(hash, tile_collector_process_tile, &data); + g_hash_table_foreach(hash, (GHFunc) tile_collector_process_tile, &data); fprintf(stderr,"tile_collector_finish foreach done\n"); g_hash_table_destroy(hash); fprintf(stderr,"tile_collector_finish destroy done\n"); for (i = 14 ; i > 0 ; i--) { fprintf(stderr,"Level=%d\n",i); data.level=i; - g_hash_table_foreach(data.tile_edges, tile_collector_add_siblings, &data); + g_hash_table_foreach(data.tile_edges, (GHFunc) tile_collector_add_siblings, &data); fprintf(stderr,"*"); - g_hash_table_foreach(data.tile_edges, tile_collector_add_siblings, &data); + g_hash_table_foreach(data.tile_edges, (GHFunc) tile_collector_add_siblings, &data); fprintf(stderr,"*"); - g_hash_table_foreach(data.tile_edges, tile_collector_add_siblings, &data); + g_hash_table_foreach(data.tile_edges, (GHFunc) tile_collector_add_siblings, &data); fprintf(stderr,"*"); - g_hash_table_foreach(data.tile_edges, tile_collector_add_siblings, &data); + g_hash_table_foreach(data.tile_edges, (GHFunc) tile_collector_add_siblings, &data); fprintf(stderr,"*"); - g_hash_table_foreach(data.tile_edges, tile_collector_add_siblings2, &data); + g_hash_table_foreach(data.tile_edges, (GHFunc) tile_collector_add_siblings2, &data); fprintf(stderr,"*\n"); - g_hash_table_foreach(data.tile_edges, tile_collector_add_siblings2, &data); + g_hash_table_foreach(data.tile_edges, (GHFunc) tile_collector_add_siblings2, &data); fprintf(stderr,"*\n"); - g_hash_table_foreach(data.tile_edges, tile_collector_add_siblings2, &data); + g_hash_table_foreach(data.tile_edges, (GHFunc) tile_collector_add_siblings2, &data); fprintf(stderr,"*\n"); - g_hash_table_foreach(data.tile_edges, tile_collector_add_siblings2, &data); + g_hash_table_foreach(data.tile_edges, (GHFunc) tile_collector_add_siblings2, &data); fprintf(stderr,"*\n"); } #if 0 @@ -530,9 +528,9 @@ tile_collector_finish(struct item_bin_sink_func *tile_collector) static int coastline_processor_process(struct item_bin_sink_func *func, struct item_bin *ib, struct tile_data *tile_data) { +#if 0 int i; struct coord *c=(struct coord *)(ib+1); -#if 0 for (i = 0 ; i < 19 ; i++) { c[i]=c[i+420]; } diff --git a/navit/speech/cmdline/speech_cmdline.c b/navit/speech/cmdline/speech_cmdline.c index ba8979ea1..71f862215 100644 --- a/navit/speech/cmdline/speech_cmdline.c +++ b/navit/speech/cmdline/speech_cmdline.c @@ -108,7 +108,7 @@ static struct speech_methods speechd_meth = { }; static struct speech_priv * -speechd_new(struct speech_methods *meth, struct attr **attrs) { +speechd_new(struct speech_methods *meth, struct attr **attrs, struct attr *parent) { struct speech_priv *this; struct attr *data; data=attr_search(attrs, NULL, attr_data); diff --git a/navit/transform.c b/navit/transform.c index 86dae1c1c..e3085624f 100644 --- a/navit/transform.c +++ b/navit/transform.c @@ -849,7 +849,7 @@ transform_setup_source_rect(struct transformation *t) struct coord_geo_cart tmp,cg[8]; struct coord c; int valid=0; - char edgenodes[]={ + unsigned char edgenodes[]={ 0,1, 1,2, 2,3, |