diff options
| author | Joseph Herlant <herlantj@gmail.com> | 2018-09-09 19:54:59 -0700 |
|---|---|---|
| committer | Joseph Herlant <herlantj@gmail.com> | 2018-09-09 19:54:59 -0700 |
| commit | fdbdbf89c99f5f6f2cb7a6bfc99618d7f0e39e84 (patch) | |
| tree | f338001fd6f655614e6c7dbc32c428fa32ad2d25 | |
| parent | 0de598f5f7f560b0df6c9bc213b6e10ae542f6dc (diff) | |
| download | navit-aerostitch/navigation_strcmp.tar.gz | |
cleanup:navigation:Make sure we use g_strcmp0 instead of strcmpaerostitch/navigation_strcmp
| -rw-r--r-- | navit/navigation.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/navit/navigation.c b/navit/navigation.c index bc216ec15..d8ab48a76 100644 --- a/navit/navigation.c +++ b/navit/navigation.c @@ -412,12 +412,12 @@ static int angle_opposite(int angle) { * @return True if both old and new are on the same street */ static int is_same_street2(char *old_name, char *old_name_systematic, char *new_name, char *new_name_systematic) { - if (old_name && new_name && !strcmp(old_name, new_name)) { + if (old_name && new_name && !g_strcmp0(old_name, new_name)) { dbg(lvl_debug,"is_same_street: '%s' '%s' vs '%s' '%s' yes (1.)", old_name_systematic, new_name_systematic, old_name, new_name); return 1; } - if (old_name_systematic && new_name_systematic && !strcmp(old_name_systematic, new_name_systematic)) { + if (old_name_systematic && new_name_systematic && !g_strcmp0(old_name_systematic, new_name_systematic)) { dbg(lvl_debug,"is_same_street: '%s' '%s' vs '%s' '%s' yes (2.)", old_name_systematic, new_name_systematic, old_name, new_name); return 1; @@ -572,7 +572,7 @@ static int set_highrank(struct street_destination *street_destination, struct na } while (future_street_destination) { - if ((strcmp(destination_string,future_street_destination->destination)==0)) { + if (g_strcmp0(destination_string,future_street_destination->destination)==0) { future_street_destination->rank=99; success =1; } else @@ -624,7 +624,7 @@ static char* select_announced_destinations(struct navigation_command *current_co search_destination = search_command->itm->way.destination; while (search_destination) { /* Search this name in the destination list of the current command. */ - if (0 == strcmp(current_destination->destination, search_destination->destination)) { + if (0 == g_strcmp0(current_destination->destination, search_destination->destination)) { /* enter the destination_name in the investigation list*/ destination_count[destination_index]++; search_destination = NULL; /* break condition */ @@ -1950,8 +1950,8 @@ static int maneuver_required2 (struct navigation *nav, struct navigation_itm *ol || !old->way.name_systematic || !new->way.name_systematic || !w->name_systematic - || strcmp(old->way.name_systematic, new->way.name_systematic) - || strcmp(old->way.name_systematic, w->name_systematic)) + || g_strcmp0(old->way.name_systematic, new->way.name_systematic) + || g_strcmp0(old->way.name_systematic, w->name_systematic)) m.num_new_motorways++; } else if (!is_motorway_like(w, 1)) { m.num_other_ways++; |