[2/5] gdi32: Use strtok.
Kusanagi Kouichi
slash at ac.auone-net.jp
Tue Mar 27 05:08:05 CDT 2012
Signed-off-by: Kusanagi Kouichi <slash at ac.auone-net.jp>
---
dlls/gdi32/freetype.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 2f2104d..07320df 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -3108,11 +3108,8 @@ static void init_font_list(void)
valueA = HeapAlloc( GetProcessHeap(), 0, len );
WideCharToMultiByte( CP_UNIXCP, 0, valueW, -1, valueA, len, NULL, NULL );
TRACE( "got font path %s\n", debugstr_a(valueA) );
- ptr = valueA;
- while (ptr)
+ for (ptr = strtok(valueA, ":"); ptr != NULL; ptr = strtok(NULL, ":"))
{
- LPSTR next = strchr( ptr, ':' );
- if (next) *next++ = 0;
if (ptr[0] == '~' && ptr[1] == '/' && (home = getenv( "HOME" )) &&
(unixname = HeapAlloc( GetProcessHeap(), 0, strlen(ptr) + strlen(home) )))
{
@@ -3123,7 +3120,6 @@ static void init_font_list(void)
}
else
ReadFontDir( ptr, TRUE );
- ptr = next;
}
HeapFree( GetProcessHeap(), 0, valueA );
}
--
1.7.9.1
More information about the wine-patches
mailing list