diff options
| author | jandegr <jandegr@users.noreply.github.com> | 2018-05-02 10:02:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-02 10:02:46 +0200 |
| commit | de4680665398c523dfaa0879c18b0f6e39264d57 (patch) | |
| tree | 5769f2076e6e041c07ad7fd6fa052ae0b8e5b914 /navit/maptool/itembin.c | |
| parent | 53315091a2aa5a4469a743f29516cc1ae78b6b14 (diff) | |
| parent | a9f61c26e31eca52b1bf1a444f6283bb26bc2391 (diff) | |
| download | navit-Android_gradle.tar.gz | |
Merge branch 'trunk' into Android_gradleAndroid_gradle
Diffstat (limited to 'navit/maptool/itembin.c')
| -rw-r--r-- | navit/maptool/itembin.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/navit/maptool/itembin.c b/navit/maptool/itembin.c index 98b0c52a6..0c62eb205 100644 --- a/navit/maptool/itembin.c +++ b/navit/maptool/itembin.c @@ -520,19 +520,8 @@ item_bin_sort_compare(const void *p1, const void *p2) if(ret) return ret; } -#if 0 - dbg_assert(ib1->clen==2); - dbg_assert(ib2->clen==2); - attr1=(struct attr_bin *)((int *)(ib1+1)+ib1->clen); - attr2=(struct attr_bin *)((int *)(ib2+1)+ib1->clen); -#else attr1=item_bin_get_attr_bin_last(ib1); attr2=item_bin_get_attr_bin_last(ib2); -#endif -#if 0 - dbg_assert(attr1->type == attr_town_name || attr1->type == attr_town_name_match); - dbg_assert(attr2->type == attr_town_name || attr2->type == attr_town_name_match); -#endif s1=(char *)(attr1+1); s2=(char *)(attr2+1); if (attr1->type == attr_house_number && attr2->type == attr_house_number) { @@ -554,9 +543,6 @@ item_bin_sort_compare(const void *p1, const void *p2) match2=(attr2->type == attr_town_name_match || attr2->type == attr_district_name_match); ret=match1-match2; } -#if 0 - fprintf(stderr,"sort_countries_compare p1=%p p2=%p %s %s\n",p1,p2,s1,s2); -#endif return ret; } |