diff options
| author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-07-17 20:20:25 +0000 |
|---|---|---|
| committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-07-17 20:20:25 +0000 |
| commit | efa0d9b6e5a6a5151f3056b859699e2fdb2ea8f3 (patch) | |
| tree | 497c88b282364f0f70c62dedbe433eb8e5650b32 /navit/maptool | |
| parent | c673c0ec96e4cc6094f8467cf85a2fe90c5b137e (diff) | |
| download | navit-svn-efa0d9b6e5a6a5151f3056b859699e2fdb2ea8f3.tar.gz | |
Refactor:maptool:New #define for relation member template string.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5816 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/maptool')
| -rw-r--r-- | navit/maptool/boundaries.c | 2 | ||||
| -rw-r--r-- | navit/maptool/maptool.h | 3 | ||||
| -rw-r--r-- | navit/maptool/osm.c | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/navit/maptool/boundaries.c b/navit/maptool/boundaries.c index ca977f74..480f5d65 100644 --- a/navit/maptool/boundaries.c +++ b/navit/maptool/boundaries.c @@ -111,7 +111,7 @@ process_boundaries_setup(FILE *boundaries, struct relations *relations) int member_type_numeric; char *rolestr; - if (sscanf(member,"%d:"LONGLONG_FMT":%n",&member_type_numeric,&osm_id,&read) < 2) + if (sscanf(member,RELATION_MEMBER_PARSE_FORMAT,&member_type_numeric,&osm_id,&read) < 2) continue; member_type=(enum relation_member_type)member_type_numeric; diff --git a/navit/maptool/maptool.h b/navit/maptool/maptool.h index 2714fe21..824148f3 100644 --- a/navit/maptool/maptool.h +++ b/navit/maptool/maptool.h @@ -34,6 +34,9 @@ #define debug_tile(x) 0 #define debug_itembin(x) 0 +#define RELATION_MEMBER_PRINT_FORMAT "%d:"LONGLONG_FMT":%s" +#define RELATION_MEMBER_PARSE_FORMAT "%d:"LONGLONG_FMT":%n" + struct tile_data { char buffer[1024]; int tile_depth; diff --git a/navit/maptool/osm.c b/navit/maptool/osm.c index fedf3a8b..ff97f140 100644 --- a/navit/maptool/osm.c +++ b/navit/maptool/osm.c @@ -1616,7 +1616,7 @@ osm_add_member(enum relation_member_type type, osmid ref, char *role) char member_buffer[bufsize]; struct attr memberattr = { attr_osm_member }; - snprintf(member_buffer,bufsize,"%d:"LONGLONG_FMT":%s", (int)type, (long long) ref, role); + snprintf(member_buffer,bufsize, RELATION_MEMBER_PRINT_FORMAT, (int)type, (long long) ref, role); memberattr.u.str=member_buffer; item_bin_add_attr(tmp_item_bin, &memberattr); } @@ -2143,7 +2143,7 @@ parse_relation_member_string(char *relation_member_string, struct relation_membe { int len; int type_numeric; - sscanf(relation_member_string,"%d:"LONGLONG_FMT":%n",&type_numeric,&memb->id,&len); + sscanf(relation_member_string,RELATION_MEMBER_PARSE_FORMAT,&type_numeric,&memb->id,&len); memb->type=(enum relation_member_type)type_numeric; memb->role=relation_member_string+len; } |