From: <mar...@us...> - 2010-11-08 08:52:57
|
Revision: 3657 http://navit.svn.sourceforge.net/navit/?rev=3657&view=rev Author: martin-s Date: 2010-11-08 08:52:51 +0000 (Mon, 08 Nov 2010) Log Message: ----------- Fix:osd_core:strtok_r not available on win32 Modified Paths: -------------- trunk/navit/navit/osd/core/osd_core.c Modified: trunk/navit/navit/osd/core/osd_core.c =================================================================== --- trunk/navit/navit/osd/core/osd_core.c 2010-11-07 17:02:07 UTC (rev 3656) +++ trunk/navit/navit/osd/core/osd_core.c 2010-11-08 08:52:51 UTC (rev 3657) @@ -221,29 +221,28 @@ */ static void osd_odometer_from_string(struct odometer* this_, char*str) { - char* saveptr; char* tok; char* name_str; char* sum_dist_str; char* sum_time_str; char* active_str; - tok = strtok_r(str, " ", &saveptr); + tok = strtok(str, " "); if( !tok || strcmp("odometer",tok)) { return; } - name_str = g_strdup(strtok_r(NULL, " ", &saveptr)); + name_str = g_strdup(strtok(NULL, " ")); if(!name_str) { return; } - sum_dist_str = g_strdup(strtok_r(NULL, " ", &saveptr)); + sum_dist_str = g_strdup(strtok(NULL, " ")); if(!sum_dist_str) { return; } - sum_time_str = g_strdup(strtok_r(NULL, " ", &saveptr)); + sum_time_str = g_strdup(strtok(NULL, " ")); if(!sum_time_str) { return; } - active_str = g_strdup(strtok_r(NULL, " ", &saveptr)); + active_str = g_strdup(strtok(NULL, " ")); if(!active_str) { return; } @@ -462,11 +461,10 @@ if(fgets(str,128,f)) { line = g_strdup(str); - char* saveptr; char*tok; - tok = strtok_r(str," ",&saveptr); + tok = strtok(str," "); if(!strcmp(tok,"odometer")) { - tok = strtok_r(NULL," ",&saveptr); + tok = strtok(NULL," "); if(!strcmp(this->name,tok)) { osd_odometer_from_string(this,line); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |