diff options
author | Sebastian Leske <sebastian.leske@sleske.name> | 2015-09-19 23:19:21 +0200 |
---|---|---|
committer | Sebastian Leske <sebastian.leske@sleske.name> | 2015-09-19 23:19:21 +0200 |
commit | cf003b88f0728aad584258f9ba7ae9b19280171f (patch) | |
tree | 6fc446a303166945ec1937dbe2157ca2c4eebb57 /navit/navigation.c | |
parent | eed388469940b8cebb0169819def56e58f884394 (diff) | |
download | navit-cf003b88f0728aad584258f9ba7ae9b19280171f.tar.gz |
Fix warnings in navigation codeR6279
Remove unused function navigation_time.
Add error message for unsupported announcement_level.
Diffstat (limited to 'navit/navigation.c')
-rw-r--r-- | navit/navigation.c | 40 |
1 files changed, 4 insertions, 36 deletions
diff --git a/navit/navigation.c b/navit/navigation.c index faf5c73c9..5f2f7123f 100644 --- a/navit/navigation.c +++ b/navit/navigation.c @@ -1386,41 +1386,6 @@ navigation_way_get_max_delta(struct navigation_way *w, enum projection pro, int return ret; } - -/** - * @brief Returns the time (in seconds) one will drive between two navigation items - * - * This function returns the time needed to drive between two items, including both of them, - * in seconds. - * - * @param from The first item - * @param to The last item - * @return The travel time in seconds, or -1 on error - */ -static int -navigation_time(struct navigation_itm *from, struct navigation_itm *to) -{ - struct navigation_itm *cur; - int time; - - time = 0; - cur = from; - while (cur) { - time += cur->time; - - if (cur == to) { - break; - } - cur = cur->next; - } - - if (!cur) { - return -1; - } - - return time; -} - /** * @brief Clears the ways one can drive from itm * @@ -3354,6 +3319,9 @@ show_maneuver(struct navigation *nav, struct navigation_itm *itm, struct navigat case level_now: /* TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow */ return g_strdup_printf(_("Leave the roundabout at the %1$s %2$s"), get_exit_count_str(count_roundabout),street_destination_announce); + default : + dbg(lvl_error,"unexpected announcement level %d\n", level); + return g_strdup_printf("internal error"); } } @@ -3629,7 +3597,7 @@ show_maneuver(struct navigation *nav, struct navigation_itm *itm, struct navigat break; default : ret= g_strdup_printf(("%1$s %2$s"),instruction,street_destination_announce); - dbg(lvl_error,"unevaluated announcement level\n"); + dbg(lvl_error,"unexpected announcement level %d\n", level); break; } |