diff options
| author | Alessandro Pignotti <a.pignotti@sssup.it> | 2011-05-18 18:31:03 +0200 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2012-08-27 22:24:43 -0400 |
| commit | bb8bf13fea27a77c53e7692dce827e2839216fc6 (patch) | |
| tree | 9f086026cfa8fe221f9ebc073ddd2c2f042cfb45 | |
| parent | b47c2247e398bdb56f929a1144d6cc0b995233b0 (diff) | |
| download | pango-bb8bf13fea27a77c53e7692dce827e2839216fc6.tar.gz | |
Make a couple of functions reentrant
| -rw-r--r-- | pango/pangowin32-fontmap.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c index b474b221..9cfa1611 100644 --- a/pango/pangowin32-fontmap.c +++ b/pango/pangowin32-fontmap.c @@ -1397,10 +1397,8 @@ pango_win32_font_description_from_logfontw (const LOGFONTW *lfp) } static char * -charset_name (int charset) +charset_name (int charset, char* num) { - static char num[10]; - switch (charset) { #define CASE(x) case x##_CHARSET: return #x @@ -1431,10 +1429,8 @@ charset_name (int charset) } static char * -ff_name (int ff) +ff_name (int ff, char* num) { - static char num[10]; - switch (ff) { #define CASE(x) case FF_##x: return #x @@ -1462,13 +1458,16 @@ pango_win32_insert_font (PangoWin32FontMap *win32fontmap, PangoWin32Face *win32face; gint i; + char tmp_for_charset_name[10]; + char tmp_for_ff_name[10]; + PING (("face=%S,charset=%s,it=%s,wt=%ld,ht=%ld,ff=%s%s", lfp->lfFaceName, - charset_name (lfp->lfCharSet), + charset_name (lfp->lfCharSet, tmp_for_charset_name), lfp->lfItalic ? "yes" : "no", lfp->lfWeight, lfp->lfHeight, - ff_name (lfp->lfPitchAndFamily & 0xF0), + ff_name (lfp->lfPitchAndFamily & 0xF0, tmp_for_ff_name), is_synthetic ? " synthetic" : "")); /* Ignore Symbol fonts (which don't have any Unicode mapping |