diff options
author | Behdad Esfahbod <behdad@gnome.org> | 2005-11-04 23:55:38 +0000 |
---|---|---|
committer | Behdad Esfahbod <behdad@src.gnome.org> | 2005-11-04 23:55:38 +0000 |
commit | b6942a337fd03b0f24a49f3b7336b9137828c5f4 (patch) | |
tree | ad95f548fbe6765cdea8bfcae095e42652697e26 /modules/basic | |
parent | 933f541030f770b446d95bb0b5b3c85d561a63e5 (diff) | |
download | pango-b6942a337fd03b0f24a49f3b7336b9137828c5f4.tar.gz |
Turn various gcc warnings off. Adding const, adding static, fully
2005-11-04 Behdad Esfahbod <behdad@gnome.org>
* configure.in, examples/argcontext.c examples/cairoview.c,
examples/renderdemo.c, examples/renderdemo.h examples/xftview.c,
modules/basic/basic-x.c, modules/hangul/hangul-fc.c,
modules/hebrew/hebrew-shaper.c, modules/hebrew/hebrew-shaper.h,
modules/indic/indic-fc.c, modules/indic/mprefixups.c,
modules/syriac/syriac-fc.c, pango/break.c pango/fonts.c,
pango/modules.c, pango/pango-coverage.c pango/pango-engine.c,
pango/pango-engine.h, pango/pango-fontmap.c,
pango/pango-fontset.c, pango/pango-impl-utils.h,
pango/pango-layout.c, pango/pango-layout.h,
pango/pango-renderer.c, pango/pango-script.c,
pango/pango-utils.c, pango/pangocairo-fc.h,
pango/pangocairo-font.c, pango/pangocairo-fontmap.c,
pango/pangocairo-private.h, pango/pangofc-decoder.c,
pango/pangofc-font.c, pango/pangofc-fontmap.c pango/pangoft2.c,
pango/pangox-fontcache.c, pango/pangox-fontmap.c pango/pangox.c,
pango/pangoxft-font.c, pango/querymodules.c,
pango/opentype/ftglue.c, pango/opentype/ftxgpos.c,
pango/opentype/ftxopen.c, pango/opentype/pango-ot-buffer.c,
pango/opentype/pango-ot-info.c,
pango/opentype/pango-ot-ruleset.c, tests/dump-boundaries.c,
tests/testboundaries.c, tests/testcolor.c tests/testiter.c,
tests/testscript.c: Turn various gcc warnings off. Adding const,
adding static, fully initializing structs, match signedness in
comparisons. (#317804)
* tests/testscript.c, tools/gen-script-for-lang.c:
(scripts_for_file): Pass error->message instead of error to fail(),
which was wrong.
(compare_lang): Fix typo comparing a and a instead of a and b.
Diffstat (limited to 'modules/basic')
-rw-r--r-- | modules/basic/basic-x.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/modules/basic/basic-x.c b/modules/basic/basic-x.c index 22dbb671..3b440db4 100644 --- a/modules/basic/basic-x.c +++ b/modules/basic/basic-x.c @@ -51,8 +51,8 @@ typedef PangoGlyph (*ConvFunc) (CharCache *cache, struct _Charset { int index; - char *id; - char *x_charset; + const char *id; + const char *x_charset; ConvFunc conv_func; }; @@ -214,7 +214,7 @@ find_char (CharCache *cache, PangoFont *font, gunichar wc, const char *input) mask_table = cache->mask_tables[mask_index]; else { - char *charset_names[G_N_ELEMENTS(charsets)]; + const char *charset_names[G_N_ELEMENTS(charsets)]; Charset *charsets_map[G_N_ELEMENTS(charsets)]; guint mask; int n_charsets = 0; @@ -227,7 +227,7 @@ find_char (CharCache *cache, PangoFont *font, gunichar wc, const char *input) /* Find the character sets that are included in this mask */ - for (i=0; i<G_N_ELEMENTS(charsets); i++) + for (i=0; i<(int)G_N_ELEMENTS(charsets); i++) { int charset_index = cache->ordering->charsets[i]; @@ -240,7 +240,7 @@ find_char (CharCache *cache, PangoFont *font, gunichar wc, const char *input) } } - mask_table->n_subfonts = pango_x_list_subfonts (font, charset_names, n_charsets, &mask_table->subfonts, &subfont_charsets); + mask_table->n_subfonts = pango_x_list_subfonts (font, (char**)charset_names, n_charsets, &mask_table->subfonts, &subfont_charsets); mask_table->charsets = g_new (Charset *, mask_table->n_subfonts); for (i=0; i<mask_table->n_subfonts; i++) @@ -371,8 +371,8 @@ conv_16bit (CharCache *cache, static PangoGlyph conv_16bit_MSB_on (CharCache *cache, - GIConv cd, - const char *input) + GIConv cd, + const char *input) { char outbuf[2]; @@ -490,7 +490,7 @@ ordering_for_lang (PangoLanguage *lang) { int i; - for (i = 0; i < G_N_ELEMENTS (charset_orderings) - 1; i++) + for (i = 0; i < (int)G_N_ELEMENTS (charset_orderings) - 1; i++) { if (pango_language_matches (lang, charset_orderings[i].langs)) return &charset_orderings[i]; |