diff options
| author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-05-29 13:36:45 +0000 |
|---|---|---|
| committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-05-29 13:36:45 +0000 |
| commit | 0882e34aaa0f6c10ac8cc9d63dc211ac4abcfff1 (patch) | |
| tree | 86738c08498d41442dd2fbdcb95e4955d8f1a16b /navit/maptool | |
| parent | 8ff5af31abfd3d3b9dbc4b73fdc2c6d5ba4d53d2 (diff) | |
| download | navit-svn-0882e34aaa0f6c10ac8cc9d63dc211ac4abcfff1.tar.gz | |
Fix:maptool:Correct pointer arithmetic for attr_strings_buffer; some renaming.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5787 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/maptool')
| -rw-r--r-- | navit/maptool/osm.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/navit/maptool/osm.c b/navit/maptool/osm.c index 2b1de14d..05a07cea 100644 --- a/navit/maptool/osm.c +++ b/navit/maptool/osm.c @@ -68,7 +68,7 @@ long long osmid_attr_value; char is_in_buffer[BUFFER_SIZE]; char attr_strings_buffer[BUFFER_SIZE*16]; -int attr_strings_buffer_len; +int attr_strings_buffer_free_offset; #define MAX_COORD_COUNT 65536 struct coord coord_buffer[MAX_COORD_COUNT]; @@ -95,7 +95,7 @@ static int attr_longest_match(struct attr_mapping **mapping, int mapping_count, static void attr_longest_match_clear(void); -enum attr_strings { +enum attr_strings_type { attr_string_phone, attr_string_fax, attr_string_email, @@ -888,18 +888,18 @@ osm_info(char *type, osmid id, int cont, char *fmt, ...) static void attr_strings_clear(void) { - attr_strings_buffer_len=0; + attr_strings_buffer_free_offset=0; memset(attr_strings, 0, sizeof(attr_strings)); } static void -attr_strings_save(enum attr_strings id, char *str) +attr_strings_save(enum attr_strings_type id, char *str) { - int len=strlen(str)+1; - dbg_assert(attr_strings_buffer_len+len+1<sizeof(attr_strings_buffer)); - attr_strings[id]=attr_strings_buffer+attr_strings_buffer_len; - g_strlcpy(attr_strings[id], str, len+1); - attr_strings_buffer_len+=len+1; + int str_size=strlen(str)+1; + dbg_assert(attr_strings_buffer_free_offset+str_size<sizeof(attr_strings_buffer)); + attr_strings[id]=attr_strings_buffer+attr_strings_buffer_free_offset; + g_strlcpy(attr_strings[id], str, str_size); + attr_strings_buffer_free_offset+=str_size; } osmid |