mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2024-11-14 09:33:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use strtok_r instead of strtok

Browse Source 
Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
This commit is contained in:
Sebastian Ramacher 2014-01-10 16:07:03 +01:00
parent 2c02dd97e6
commit c575fe5f83
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
database-plain.c
View File

@ -435,18 +435,25 @@ get_jumplist_from_str(const char* str)
girara_list_t* result = girara_list_new2(g_free); girara_list_t* result = girara_list_new2(g_free);
char* copy = g_strdup(str); char* copy = g_strdup(str);
char* token = strtok(copy, " "); char* saveptr = NULL;
char* token = strtok_r(copy, " ", &saveptr);
while (token != NULL) { while (token != NULL) {
zathura_jump_t* jump = g_malloc0(sizeof(zathura_jump_t)); zathura_jump_t* jump = g_malloc0(sizeof(zathura_jump_t));
jump->page = strtoul(token, NULL, 0); jump->page = strtoul(token, NULL, 0);
token = strtok(NULL, " "); token = strtok_r(NULL, " ", &saveptr);
if (token == NULL) {
girara_warning("Could not parse jumplist information.");
g_free(jump);
break;
}
jump->x = g_ascii_strtod(token, NULL); jump->x = g_ascii_strtod(token, NULL);
token = strtok(NULL, " "); token = strtok_r(NULL, " ", &saveptr);
jump->y = g_ascii_strtod(token, NULL); jump->y = g_ascii_strtod(token, NULL);
girara_list_append(result, jump); girara_list_append(result, jump);
token = strtok(NULL, " "); token = strtok_r(NULL, " ", &saveptr);
} }
g_free(copy); g_free(copy);