diff options
| -rw-r--r-- | navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c | 2 | ||||
| -rw-r--r-- | navit/graphics/sdl/graphics_sdl.c | 3 | ||||
| -rw-r--r-- | navit/map/binfile/binfile.c | 2 | ||||
| -rw-r--r-- | navit/map/csv/csv.c | 2 | ||||
| -rw-r--r-- | navit/map/mg/street.c | 1 | ||||
| -rw-r--r-- | navit/navigation.c | 4 | ||||
| -rw-r--r-- | navit/navit.c | 14 | ||||
| -rw-r--r-- | navit/osd/core/osd_core.c | 2 | ||||
| -rw-r--r-- | navit/popup.c | 2 | ||||
| -rw-r--r-- | navit/route.c | 4 | ||||
| -rw-r--r-- | navit/track.c | 4 | ||||
| -rw-r--r-- | navit/vehicleprofile.c | 4 |
12 files changed, 20 insertions, 24 deletions
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 3c3d3757e..1782e6d05 100644 --- a/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c +++ b/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c @@ -735,7 +735,7 @@ configure(GtkWidget * widget, GdkEventConfigure * event, gpointer user_data) gra->background_ready = 0; } #ifndef _WIN32 - dbg(1,"window=%d\n", GDK_WINDOW_XID(widget->window)); + dbg(1,"window=%lu\n", GDK_WINDOW_XID(widget->window)); #endif gra->width=widget->allocation.width; gra->height=widget->allocation.height; diff --git a/navit/graphics/sdl/graphics_sdl.c b/navit/graphics/sdl/graphics_sdl.c index e6972b251..71b815584 100644 --- a/navit/graphics/sdl/graphics_sdl.c +++ b/navit/graphics/sdl/graphics_sdl.c @@ -958,7 +958,7 @@ resize_ft_buffer (unsigned int new_size) if (new_size > ft_buffer_size) { g_free (ft_buffer); ft_buffer = g_malloc (new_size); - dbg(1, "old_size(%i) new_size(%i) ft_buffer(%i)\n", ft_buffer_size, new_size, ft_buffer); + dbg(1, "old_size(%u) new_size(%u) ft_buffer(%p)\n", ft_buffer_size, new_size, ft_buffer); ft_buffer_size = new_size; } } @@ -1947,7 +1947,6 @@ static gboolean graphics_sdl_idle(void *data) dbg(2,"key mod: 0x%x\n", key_mod); if (keybuf[0]) { - dbg(2,"key: %s 0x%x\n", keybuf, keybuf); callback_list_call_attr_1(gr->cbl, attr_keypress, (void *)keybuf); } break; diff --git a/navit/map/binfile/binfile.c b/navit/map/binfile/binfile.c index 66dbbdf3f..d5030648e 100644 --- a/navit/map/binfile/binfile.c +++ b/navit/map/binfile/binfile.c @@ -1761,7 +1761,7 @@ map_parse_submap(struct map_rect_priv *mr, int async) return 0; if (!binfile_attr_get(mr->item.priv_data, attr_zipfile_ref, &at)) return 0; - dbg(1,"pushing zipfile %d from %d\n", at.u.num, mr->t->zipfile_num); + dbg(1,"pushing zipfile %ld from %d\n", at.u.num, mr->t->zipfile_num); return push_zipfile_tile(mr, at.u.num, 0, 0, async); } diff --git a/navit/map/csv/csv.c b/navit/map/csv/csv.c index 54a988ae6..f60f99563 100644 --- a/navit/map/csv/csv.c +++ b/navit/map/csv/csv.c @@ -848,7 +848,7 @@ map_new_csv(struct map_methods *meth, struct attr **attrs, struct callback_list fclose(fp); } else { - dbg(0,"Error opening csv map file %d, starting with empty map\n", m->filename); + dbg(0,"Error opening csv map file %s, starting with empty map\n", m->filename); } } else { dbg(1,"No data attribute, starting with in-memory map\n"); diff --git a/navit/map/mg/street.c b/navit/map/mg/street.c index 656da212c..cc209139b 100644 --- a/navit/map/mg/street.c +++ b/navit/map/mg/street.c @@ -1058,7 +1058,6 @@ street_name_attr_get(void *priv_data, enum attr_type attr_type, struct attr *att return 0; return item_attr_get(mr->search_item_tmp, attr_type, attr); default: - dbg(0,"%p\n",mr->street.name_numbers.dist); dbg(0,"unknown attr %s\n",attr_to_name(attr_type)); return 0; } diff --git a/navit/navigation.c b/navit/navigation.c index da0933b5c..da6b1ab6e 100644 --- a/navit/navigation.c +++ b/navit/navigation.c @@ -759,7 +759,7 @@ navigation_itm_update(struct navigation_itm *itm, struct item *ritem) return; } - dbg(1,"length=%d time=%d speed=%d\n", length.u.num, time.u.num, speed.u.num); + dbg(1,"length=%ld time=%ld speed=%ld\n", length.u.num, time.u.num, speed.u.num); itm->length=length.u.num; itm->time=time.u.num; itm->speed=speed.u.num; @@ -1447,7 +1447,7 @@ navigation_item_destination(struct navigation *nav, struct navigation_itm *itm, if (!vocabulary2) n2=NULL; if(!n1 && !n2 && itm->way.item.type == type_ramp && vocabulary2) { - dbg(1,">> Next is ramp %lx current is %lx \n", itm->way.item.type, next->way.item.type); + dbg(1,">> Next is ramp %x current is %x \n", itm->way.item.type, next->way.item.type); if(next->way.item.type == type_ramp) return NULL; diff --git a/navit/navit.c b/navit/navit.c index 106a5aaa2..349f1e378 100644 --- a/navit/navit.c +++ b/navit/navit.c @@ -1822,7 +1822,7 @@ navit_say(struct navit *this_, char *text) if(this_->speech) { if (!speech_get_attr(this_->speech, attr_active, &attr, NULL)) attr.u.num = 1; - dbg(1, "this_.speech->active %i\n", attr.u.num); + dbg(1, "this_.speech->active %ld\n", attr.u.num); if(attr.u.num) speech_say(this_->speech, text); } @@ -1869,7 +1869,7 @@ navit_speak(struct navit *this_) if (!speech_get_attr(this_->speech, attr_active, &attr, NULL)) attr.u.num = 1; - dbg(1, "this_.speech->active %i\n", attr.u.num); + dbg(1, "this_.speech->active %ld\n", attr.u.num); if(!attr.u.num) return; @@ -1923,7 +1923,7 @@ navit_window_roadbook_update(struct navit *this_) param[0].name=_("Command"); item_attr_get(item, attr_length, &attr); - dbg(2, "Length=%d\n", attr.u.num); + dbg(2, "Length=%ld\n", attr.u.num); param[1].name=_("Length"); if ( attr.u.num >= 2000 ) @@ -1936,7 +1936,7 @@ navit_window_roadbook_update(struct navit *this_) } item_attr_get(item, attr_time, &attr); - dbg(2, "Time=%d\n", attr.u.num); + dbg(2, "Time=%ld\n", attr.u.num); secs=attr.u.num/10; param[2].name=_("Time"); if ( secs >= 3600 ) @@ -1949,7 +1949,7 @@ navit_window_roadbook_update(struct navit *this_) } item_attr_get(item, attr_destination_length, &attr); - dbg(2, "Destlength=%d\n", attr.u.num); + dbg(2, "Destlength=%ld\n", attr.u.num); param[3].name=_("Destination Length"); if ( attr.u.num >= 2000 ) { @@ -1961,7 +1961,7 @@ navit_window_roadbook_update(struct navit *this_) } item_attr_get(item, attr_destination_time, &attr); - dbg(2, "Desttime=%d\n", attr.u.num); + dbg(2, "Desttime=%ld\n", attr.u.num); secs=attr.u.num/10; param[4].name=_("Destination Time"); if ( secs >= 3600 ) @@ -2479,7 +2479,7 @@ navit_set_attr_do(struct navit *this_, struct attr *attr, int init) } break; case attr_osd_configuration: - dbg(0,"setting osd_configuration to %d (was %d)\n", attr->u.num, this_->osd_configuration); + dbg(0,"setting osd_configuration to %ld (was %d)\n", attr->u.num, this_->osd_configuration); attr_updated=(this_->osd_configuration != attr->u.num); this_->osd_configuration=attr->u.num; break; diff --git a/navit/osd/core/osd_core.c b/navit/osd/core/osd_core.c index cf9dcda7a..0bed1bdd8 100644 --- a/navit/osd/core/osd_core.c +++ b/navit/osd/core/osd_core.c @@ -3153,7 +3153,7 @@ osd_gps_status_draw(struct osd_priv_common *opc, struct navit *navit, case 2: strength=2; if (vehicle_get_attr(vehicle_attr.u.vehicle, attr_position_sats_used, &attr, NULL)) { - dbg(1,"num=%d\n", attr.u.num); + dbg(1,"num=%ld\n", attr.u.num); if (attr.u.num >= 3) strength=attr.u.num-1; if (strength > 5) diff --git a/navit/popup.c b/navit/popup.c index 63726b80e..dc9ee62b0 100644 --- a/navit/popup.c +++ b/navit/popup.c @@ -87,7 +87,7 @@ popup_traffic_distortion(struct item *item, char *attr) } else { - dbg(0,"could not open file for distortions !!", item); + dbg(0,"could not open file for distortions !!"); } /* else - if (map) */ g_free(dist_filename); /* free the file name */ diff --git a/navit/route.c b/navit/route.c index 8c4fcb145..434a4cf16 100644 --- a/navit/route.c +++ b/navit/route.c @@ -3572,8 +3572,6 @@ rm_get_item(struct map_rect_priv *mr) struct route *route=mr->mpriv->route; void *id=0; - dbg(1,"enter\n", mr->pos); - switch (mr->item.type) { case type_none: if (route->pos && route->pos->street_direction && route->pos->street_direction != route->pos->dir) @@ -3887,7 +3885,7 @@ route_get_attr(struct route *this_, enum attr_type type, struct attr *attr, stru attr->u.num+=path->path_time; path=path->next; } - dbg(1,"path_time %d\n",attr->u.num); + dbg(1,"path_time %ld\n",attr->u.num); } else ret=0; break; diff --git a/navit/track.c b/navit/track.c index 21b749fc3..4a6a28524 100644 --- a/navit/track.c +++ b/navit/track.c @@ -687,7 +687,7 @@ tracking_update(struct tracking *tr, struct vehicle *v, struct vehicleprofile *v static_distance.u.num=10; dbg(1,"Using defaults for static position detection\n"); } - dbg(2,"Static speed: %u, static distance: %u\n",static_speed.u.num, static_distance.u.num); + dbg(2,"Static speed: %ld, static distance: %ld\n",static_speed.u.num, static_distance.u.num); time=iso8601_to_secs(time_attr.u.str); speed=*speed_attr.u.numd; direction=*direction_attr.u.numd; @@ -720,7 +720,7 @@ tracking_update(struct tracking *tr, struct vehicle *v, struct vehicleprofile *v espeed=speed; edirection=direction; } - dbg(1,"lag %d speed %f direction %d\n",lag.u.num,espeed,edirection); + dbg(1,"lag %ld speed %f direction %d\n",lag.u.num,espeed,edirection); dbg(1,"old 0x%x,0x%x\n",tr->curr_in.x, tr->curr_in.y); transform_project(pro, &tr->curr_in, espeed*lag.u.num/36, edirection, &tr->curr_in); dbg(1,"new 0x%x,0x%x\n",tr->curr_in.x, tr->curr_in.y); diff --git a/navit/vehicleprofile.c b/navit/vehicleprofile.c index 344376681..65b862f25 100644 --- a/navit/vehicleprofile.c +++ b/navit/vehicleprofile.c @@ -30,7 +30,7 @@ static void vehicleprofile_set_attr_do(struct vehicleprofile *this_, struct attr *attr) { - dbg(1,"%s:%d\n", attr_to_name(attr->type), attr->u.num); + dbg(1,"%s:%ld\n", attr_to_name(attr->type), attr->u.num); switch (attr->type) { case attr_flags: this_->flags=attr->u.num; @@ -200,7 +200,7 @@ vehicleprofile_update(struct vehicleprofile *this_) if (!profile_option.u.navit_object->func->get_attr(profile_option.u.navit_object, attr_active, &active, NULL)) active.u.num=0; if (profile_option.u.navit_object->func->get_attr(profile_option.u.navit_object, attr_name, &name, NULL)) - dbg(0,"%p %s %d\n",profile_option.u.navit_object,name.u.str,active.u.num); + dbg(0,"%p %s %ld\n",profile_option.u.navit_object,name.u.str,active.u.num); if (active.u.num) vehicleprofile_apply_attrs(this_, profile_option.u.navit_object, 1); } |