From 24fb6a2be0c492b023b32ab98556961a8317e13e Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 6 Jan 2009 10:40:30 +0000 Subject: [PATCH] Make it Unicode safe. 2009-01-06 Behdad Esfahbod * pango/fonts.c (pango_font_description_to_filename): Make it Unicode safe. svn path=/trunk/; revision=2786 --- ChangeLog | 5 +++++ pango/fonts.c | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2870707..c66b02d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2009-01-06 Behdad Esfahbod + * pango/fonts.c (pango_font_description_to_filename): + Make it Unicode safe. + +2009-01-06 Behdad Esfahbod + * pango/fonts.c (find_field), (parse_field), (pango_parse_style), (pango_parse_variant), (pango_parse_weight), (pango_parse_stretch): Move the parse_*() functions in fonts.c and have them share tables diff --git a/pango/fonts.c b/pango/fonts.c index 532adbe..5e145ae 100644 --- a/pango/fonts.c +++ b/pango/fonts.c @@ -1280,13 +1280,12 @@ pango_font_description_to_filename (const PangoFontDescription *desc) result = pango_font_description_to_string (desc); - /* XXX This should be rewritten to read char-by-char instead - * of byte-by-byte, to be Unicode safe. - */ p = result; while (*p) { - if (strchr ("-+_.", *p) == NULL && !g_ascii_isalnum (*p)) + if (G_UNLIKELY ((guchar) *p >= 128)) + /* skip over non-ASCII chars */; + else if (strchr ("-+_.", *p) == NULL && !g_ascii_isalnum (*p)) *p = '_'; else *p = g_ascii_tolower (*p); -- 2.7.4