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 | |
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')
-rw-r--r-- | modules/basic/basic-x.c | 16 | ||||
-rw-r--r-- | modules/hangul/hangul-fc.c | 2 | ||||
-rw-r--r-- | modules/hebrew/hebrew-shaper.c | 1 | ||||
-rw-r--r-- | modules/hebrew/hebrew-shaper.h | 2 | ||||
-rw-r--r-- | modules/indic/indic-fc.c | 14 | ||||
-rw-r--r-- | modules/indic/mprefixups.c | 4 | ||||
-rw-r--r-- | modules/syriac/syriac-fc.c | 6 |
7 files changed, 28 insertions, 17 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]; diff --git a/modules/hangul/hangul-fc.c b/modules/hangul/hangul-fc.c index ad7a239a..26485b8b 100644 --- a/modules/hangul/hangul-fc.c +++ b/modules/hangul/hangul-fc.c @@ -312,7 +312,7 @@ hangul_engine_shape (PangoEngineShape *engine, const char *p, *start; gunichar jamos_static[8]; - guint max_jamos = G_N_ELEMENTS (jamos_static); + gint max_jamos = G_N_ELEMENTS (jamos_static); gunichar *jamos = jamos_static; int n_jamos; diff --git a/modules/hebrew/hebrew-shaper.c b/modules/hebrew/hebrew-shaper.c index 6e6890fa..3e3a2183 100644 --- a/modules/hebrew/hebrew-shaper.c +++ b/modules/hebrew/hebrew-shaper.c @@ -31,6 +31,7 @@ #include <glib.h> #include "pango-engine.h" +#include "hebrew-shaper.h" /* Wrap all characters above 0xF00 to ALEF. */ #define ishebrew(wc) ((wc)>0x590 && (wc)<0x600) diff --git a/modules/hebrew/hebrew-shaper.h b/modules/hebrew/hebrew-shaper.h index 612de35b..24603433 100644 --- a/modules/hebrew/hebrew-shaper.h +++ b/modules/hebrew/hebrew-shaper.h @@ -23,7 +23,7 @@ #ifndef HEBREW_SHAPER_H #define HEBREW_SHAPER_H -char * +const char * hebrew_shaper_get_next_cluster(const char *text, gint length, gunichar *cluster, diff --git a/modules/indic/indic-fc.c b/modules/indic/indic-fc.c index b1a8ba6e..49bbd0d9 100644 --- a/modules/indic/indic-fc.c +++ b/modules/indic/indic-fc.c @@ -45,8 +45,8 @@ struct _PangoIndicInfo { PangoOTTag scriptTag; const IndicOTClassTable *classTable; - gchar *gsubQuarkName; - gchar *gposQuarkName; + const gchar *gsubQuarkName; + const gchar *gposQuarkName; }; #define ENGINE_SUFFIX "ScriptEngineFc" @@ -250,7 +250,13 @@ get_gpos_ruleset (FT_Face face, const PangoIndicInfo *indic_info) } static void -set_glyphs (PangoFont *font, FT_Face face, const gunichar *wcs, gulong *tags, glong n_glyphs, PangoOTBuffer *buffer, gboolean process_zwj) +set_glyphs (PangoFont *font, + FT_Face face, + const gunichar *wcs, + gulong *tags, + glong n_glyphs, + PangoOTBuffer *buffer, + gboolean process_zwj) { gint i; @@ -416,7 +422,7 @@ PANGO_MODULE_ENTRY(list) (PangoEngineInfo **engines, PangoEngine * PANGO_MODULE_ENTRY(create) (const char *id) { - gint i; + guint i; for (i = 0; i < G_N_ELEMENTS(script_engines); i += 1) { diff --git a/modules/indic/mprefixups.c b/modules/indic/mprefixups.c index a3a3d018..c9dba6c3 100644 --- a/modules/indic/mprefixups.c +++ b/modules/indic/mprefixups.c @@ -64,8 +64,8 @@ void indic_mprefixups_apply(MPreFixups *mprefixups, PangoOTBuffer *buffer) glong fixup; for (fixup = 0; fixup < mprefixups->fFixupCount; fixup += 1) { - glong baseIndex = mprefixups->fFixupData[fixup].fBaseIndex; - glong mpreIndex = mprefixups->fFixupData[fixup].fMPreIndex; + gulong baseIndex = mprefixups->fFixupData[fixup].fBaseIndex; + gulong mpreIndex = mprefixups->fFixupData[fixup].fMPreIndex; glong baseGlyph = -1; glong mpreGlyph = -1; glong mpreLimit = -1; diff --git a/modules/syriac/syriac-fc.c b/modules/syriac/syriac-fc.c index 8f054c55..926d486e 100644 --- a/modules/syriac/syriac-fc.c +++ b/modules/syriac/syriac-fc.c @@ -161,7 +161,11 @@ swap_range (PangoGlyphString *glyphs, int start, int end) } static void -set_glyph (PangoFont *font, PangoGlyphString *glyphs, int i, int offset, PangoGlyph glyph) +set_glyph (PangoFont *font, + PangoGlyphString *glyphs, + int i, + int offset, + PangoGlyph glyph) { glyphs->glyphs[i].glyph = glyph; glyphs->log_clusters[i] = offset; |