diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2006-03-31 23:06:17 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-03-31 23:06:17 +0000 |
| commit | 91b9aa307d7f7a76eea3b0f48f30b32ba849f7a1 (patch) | |
| tree | 38fcf15c9d8c3729cd260dfc94f13fdc0b16d33b | |
| parent | e9f563364cad9d096f6c60e0607652fbb88ca4ff (diff) | |
| download | pango-91b9aa307d7f7a76eea3b0f48f30b32ba849f7a1.tar.gz | |
Change char* to char[] in the ft error table, to avoid relocations.
2006-03-31 Behdad Esfahbod <behdad@gnome.org>
* pango/fonts.c:
* pango/pango-utils.c:
* pango/pangox-fontmap.c:
* pango/pangoft2.c (_pango_ft2_ft_strerror): Change char* to
char[] in the ft error table, to avoid relocations.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | pango/fonts.c | 2 | ||||
| -rw-r--r-- | pango/pango-utils.c | 2 | ||||
| -rw-r--r-- | pango/pangox-fontmap.c | 6 |
4 files changed, 8 insertions, 5 deletions
@@ -1,5 +1,8 @@ 2006-03-31 Behdad Esfahbod <behdad@gnome.org> + * pango/fonts.c: + * pango/pango-utils.c: + * pango/pangox-fontmap.c: * pango/pangoft2.c (_pango_ft2_ft_strerror): Change char* to char[] in the ft error table, to avoid relocations. diff --git a/pango/fonts.c b/pango/fonts.c index 8c14d717..10bb10b0 100644 --- a/pango/fonts.c +++ b/pango/fonts.c @@ -753,7 +753,7 @@ pango_font_descriptions_free (PangoFontDescription **descs, typedef struct { int value; - const char *str; + const char str[16]; } FieldMap; static const FieldMap style_map[] = { diff --git a/pango/pango-utils.c b/pango/pango-utils.c index c344507b..290e9fef 100644 --- a/pango/pango-utils.c +++ b/pango/pango-utils.c @@ -1316,7 +1316,7 @@ pango_language_matches (PangoLanguage *language, } typedef struct { - const char *lang; + const char lang[4]; const char *str; } LangInfo; diff --git a/pango/pangox-fontmap.c b/pango/pangox-fontmap.c index 5f86585c..4593a36c 100644 --- a/pango/pangox-fontmap.c +++ b/pango/pangox-fontmap.c @@ -98,7 +98,7 @@ struct _PangoXSizeInfo }; static const struct { - const gchar *text; + const gchar text[12]; PangoWeight value; } weights_map[] = { { "light", 300 }, @@ -115,7 +115,7 @@ static const struct { }; static const struct { - const gchar *text; + const gchar text[4]; PangoStyle value; } styles_map[] = { { "r", PANGO_STYLE_NORMAL }, @@ -124,7 +124,7 @@ static const struct { }; static const struct { - const gchar *text; + const gchar text[16]; PangoStretch value; } stretches_map[] = { { "normal", PANGO_STRETCH_NORMAL }, |