From 056aa0ca3f32ef8963e05bcf4afb70d0a3b28788 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 26 Dec 2008 05:09:48 +0000 Subject: [PATCH] Fix all warnings in modules/. 2008-12-25 Behdad Esfahbod * modules/arabic/arabic-fc.c (arabic_engine_shape): * modules/arabic/arabic-lang.c (arabic_engine_break): * modules/basic/basic-fc.c (basic_engine_shape): * modules/basic/basic-x.c (find_char), (conv_8bit), (conv_eucjp), (conv_16bit), (conv_16bit_MSB_on), (conv_gb18030_1), (conv_euctw), (conv_ucs4), (basic_engine_shape), (basic_engine_covers): * modules/hangul/hangul-fc.c (hangul_engine_shape): * modules/hebrew/hebrew-fc.c (add_cluster), (fallback_shape): * modules/indic/indic-lang.c (indic_engine_break): * modules/khmer/khmer-fc.c (khmer_engine_shape): * modules/syriac/syriac-fc.c (syriac_engine_shape): * modules/thai/thai-fc.c (get_glyph_index_tis), (thai_engine_shape), (thai_make_unknown_glyph): * modules/thai/thai-lang.c (thai_engine_break): * modules/thai/thai-shaper.c (get_glyphs_list): * modules/tibetan/tibetan-fc.c (tibetan_engine_shape): Fix all warnings in modules/. svn path=/trunk/; revision=2771 --- ChangeLog | 20 ++++++++++++++++++++ modules/arabic/arabic-fc.c | 2 +- modules/arabic/arabic-lang.c | 6 +++--- modules/basic/basic-fc.c | 2 +- modules/basic/basic-x.c | 22 +++++++++++----------- modules/hangul/hangul-fc.c | 4 ++-- modules/hebrew/hebrew-fc.c | 10 +++------- modules/indic/indic-lang.c | 4 ++-- modules/khmer/khmer-fc.c | 2 +- modules/syriac/syriac-fc.c | 2 +- modules/thai/thai-fc.c | 7 ++++--- modules/thai/thai-lang.c | 10 +++++----- modules/thai/thai-shaper.c | 2 +- modules/tibetan/tibetan-fc.c | 2 +- 14 files changed, 56 insertions(+), 39 deletions(-) diff --git a/ChangeLog b/ChangeLog index 35173d9..f6fa0ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,25 @@ 2008-12-25 Behdad Esfahbod + * modules/arabic/arabic-fc.c (arabic_engine_shape): + * modules/arabic/arabic-lang.c (arabic_engine_break): + * modules/basic/basic-fc.c (basic_engine_shape): + * modules/basic/basic-x.c (find_char), (conv_8bit), (conv_eucjp), + (conv_16bit), (conv_16bit_MSB_on), (conv_gb18030_1), (conv_euctw), + (conv_ucs4), (basic_engine_shape), (basic_engine_covers): + * modules/hangul/hangul-fc.c (hangul_engine_shape): + * modules/hebrew/hebrew-fc.c (add_cluster), (fallback_shape): + * modules/indic/indic-lang.c (indic_engine_break): + * modules/khmer/khmer-fc.c (khmer_engine_shape): + * modules/syriac/syriac-fc.c (syriac_engine_shape): + * modules/thai/thai-fc.c (get_glyph_index_tis), + (thai_engine_shape), (thai_make_unknown_glyph): + * modules/thai/thai-lang.c (thai_engine_break): + * modules/thai/thai-shaper.c (get_glyphs_list): + * modules/tibetan/tibetan-fc.c (tibetan_engine_shape): + Fix all warnings in modules/. + +2008-12-25 Behdad Esfahbod + * pango-view/viewer-main.c (main): * pango-view/viewer-pangocairo.c (pangocairo_view_create), (transform_callback), (pangocairo_view_render), diff --git a/modules/arabic/arabic-fc.c b/modules/arabic/arabic-fc.c index eec7faa..4b024e1 100644 --- a/modules/arabic/arabic-fc.c +++ b/modules/arabic/arabic-fc.c @@ -78,7 +78,7 @@ static const PangoOTFeatureMap gpos_features[] = }; static void -arabic_engine_shape (PangoEngineShape *engine, +arabic_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED, PangoFont *font, const char *text, gint length, diff --git a/modules/arabic/arabic-lang.c b/modules/arabic/arabic-lang.c index a4200a3..ee23bad 100644 --- a/modules/arabic/arabic-lang.c +++ b/modules/arabic/arabic-lang.c @@ -71,12 +71,12 @@ static PangoEngineInfo script_engines[] = { #define IS_COMPOSITE_WITH_ALEF(c) (MADDAH_ABOVE <= (c) && (c) <= HAMZA_BELOW) static void -arabic_engine_break (PangoEngineLang *engine, +arabic_engine_break (PangoEngineLang *engine G_GNUC_UNUSED, const char *text, int length, - PangoAnalysis *analysis, + PangoAnalysis *analysis G_GNUC_UNUSED, PangoLogAttr *attrs, - int attrs_len) + int attrs_len G_GNUC_UNUSED) { int i; const char *p; diff --git a/modules/basic/basic-fc.c b/modules/basic/basic-fc.c index 50d0107..6e0d2ef 100644 --- a/modules/basic/basic-fc.c +++ b/modules/basic/basic-fc.c @@ -120,7 +120,7 @@ static const PangoOTFeatureMap vertical_gpos_features[] = }; static void -basic_engine_shape (PangoEngineShape *engine, +basic_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED, PangoFont *font, const char *text, gint length, diff --git a/modules/basic/basic-x.c b/modules/basic/basic-x.c index 436967a..ba4effc 100644 --- a/modules/basic/basic-x.c +++ b/modules/basic/basic-x.c @@ -239,7 +239,7 @@ find_char (CharCache *cache, PangoFont *font, gunichar wc, const char *input) } } - mask_table->n_subfonts = pango_x_list_subfonts (font, (char**)charset_names, n_charsets, &mask_table->subfonts, &subfont_charsets); + mask_table->n_subfonts = pango_x_list_subfonts (font, (char**)(void*)charset_names, n_charsets, &mask_table->subfonts, &subfont_charsets); mask_table->charsets = g_new (Charset *, mask_table->n_subfonts); for (i=0; in_subfonts; i++) @@ -302,7 +302,7 @@ set_glyph (PangoFont *font, PangoGlyphString *glyphs, int i, int offset, PangoGl } static PangoGlyph -conv_8bit (CharCache *cache, +conv_8bit (CharCache *cache G_GNUC_UNUSED, GIConv cd, const char *input) { @@ -321,7 +321,7 @@ conv_8bit (CharCache *cache, } static PangoGlyph -conv_eucjp (CharCache *cache, +conv_eucjp (CharCache *cache G_GNUC_UNUSED, GIConv cd, const char *input) { @@ -347,7 +347,7 @@ conv_eucjp (CharCache *cache, } static PangoGlyph -conv_16bit (CharCache *cache, +conv_16bit (CharCache *cache G_GNUC_UNUSED, GIConv cd, const char *input) { @@ -369,7 +369,7 @@ conv_16bit (CharCache *cache, } static PangoGlyph -conv_16bit_MSB_on (CharCache *cache, +conv_16bit_MSB_on (CharCache *cache G_GNUC_UNUSED, GIConv cd, const char *input) { @@ -391,7 +391,7 @@ conv_16bit_MSB_on (CharCache *cache, } static PangoGlyph -conv_gb18030_1 (CharCache *cache, +conv_gb18030_1 (CharCache *cache G_GNUC_UNUSED, GIConv cd, const char *input) { @@ -414,7 +414,7 @@ conv_gb18030_1 (CharCache *cache, } static PangoGlyph -conv_euctw (CharCache *cache, +conv_euctw (CharCache *cache G_GNUC_UNUSED, GIConv cd, const char *input) { @@ -439,8 +439,8 @@ conv_euctw (CharCache *cache, } static PangoGlyph -conv_ucs4 (CharCache *cache, - GIConv cd, +conv_ucs4 (CharCache *cache G_GNUC_UNUSED, + GIConv cd G_GNUC_UNUSED, const char *input) { return g_utf8_get_char (input); @@ -554,7 +554,7 @@ get_char_cache (PangoFont *font, } static void -basic_engine_shape (PangoEngineShape *engine, +basic_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED, PangoFont *font, const char *text, gint length, @@ -668,7 +668,7 @@ basic_engine_shape (PangoEngineShape *engine, } static PangoCoverageLevel -basic_engine_covers (PangoEngineShape *engine, +basic_engine_covers (PangoEngineShape *engine G_GNUC_UNUSED, PangoFont *font, PangoLanguage *lang, gunichar wc) diff --git a/modules/hangul/hangul-fc.c b/modules/hangul/hangul-fc.c index 6ffe159..7692a84 100644 --- a/modules/hangul/hangul-fc.c +++ b/modules/hangul/hangul-fc.c @@ -396,11 +396,11 @@ render_basic (PangoFont *font, gunichar wc, } static void -hangul_engine_shape (PangoEngineShape *engine, +hangul_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED, PangoFont *font, const char *text, gint length, - const PangoAnalysis *analysis, + const PangoAnalysis *analysis G_GNUC_UNUSED, PangoGlyphString *glyphs) { int n_chars = g_utf8_strlen (text, length); diff --git a/modules/hebrew/hebrew-fc.c b/modules/hebrew/hebrew-fc.c index de4e688..fcfed2b 100644 --- a/modules/hebrew/hebrew-fc.c +++ b/modules/hebrew/hebrew-fc.c @@ -127,11 +127,9 @@ add_glyph (PangoGlyphString *glyphs, } static void -add_cluster(PangoFont *font, - PangoGlyphString *glyphs, +add_cluster(PangoGlyphString *glyphs, int cluster_size, int cluster_start, - int glyph_num[], PangoGlyph glyph[], int width[], int x_offset[], @@ -147,7 +145,7 @@ add_cluster(PangoFont *font, } static void -fallback_shape (PangoEngineShape *engine, +fallback_shape (PangoEngineShape *engine G_GNUC_UNUSED, PangoFont *font, const char *text, gint length, @@ -192,11 +190,9 @@ fallback_shape (PangoEngineShape *engine, x_offset, y_offset); - add_cluster(font, - glyphs, + add_cluster(glyphs, cluster_size, log_cluster - text, - glyph_num, glyph, glyph_width, x_offset, diff --git a/modules/indic/indic-lang.c b/modules/indic/indic-lang.c index 765062c..a391520 100644 --- a/modules/indic/indic-lang.c +++ b/modules/indic/indic-lang.c @@ -92,12 +92,12 @@ not_cursor_position (PangoLogAttr *attr) } static void -indic_engine_break (PangoEngineLang *engine, +indic_engine_break (PangoEngineLang *engine G_GNUC_UNUSED, const char *text, int length, PangoAnalysis *analysis, PangoLogAttr *attrs, - int attrs_len) + int attrs_len G_GNUC_UNUSED) { const gchar *p, *next = NULL, *next_next; gunichar prev_wc, this_wc, next_wc, next_next_wc; diff --git a/modules/khmer/khmer-fc.c b/modules/khmer/khmer-fc.c index 5b2be9f..04c5c83 100644 --- a/modules/khmer/khmer-fc.c +++ b/modules/khmer/khmer-fc.c @@ -450,7 +450,7 @@ get_index (PangoFcFont *fc_font, gunichar wc) static void -khmer_engine_shape (PangoEngineShape *engine, +khmer_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED, PangoFont *font, const char *text, int length, diff --git a/modules/syriac/syriac-fc.c b/modules/syriac/syriac-fc.c index 8e0e16e..7ba05fb 100644 --- a/modules/syriac/syriac-fc.c +++ b/modules/syriac/syriac-fc.c @@ -78,7 +78,7 @@ static const PangoOTFeatureMap gpos_features[] = }; static void -syriac_engine_shape (PangoEngineShape *engine, +syriac_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED, PangoFont *font, const char *text, gint length, diff --git a/modules/thai/thai-fc.c b/modules/thai/thai-fc.c index 40f3acc..66dccbb 100644 --- a/modules/thai/thai-fc.c +++ b/modules/thai/thai-fc.c @@ -200,10 +200,11 @@ get_glyph_index_tis (ThaiFontInfo *font_info, guchar c) return lao_0[c]; switch (font_info->font_set) { + default: + case THAI_FONT_NONE: return 0; case THAI_FONT_TIS: return tis620_0[c & 0x7f]; case THAI_FONT_TIS_MAC: return tis620_1[c & 0x7f]; case THAI_FONT_TIS_WIN: return tis620_2[c & 0x7f]; - default: return 0; } } @@ -253,7 +254,7 @@ static const PangoOTFeatureMap gpos_features[] = }; static void -thai_engine_shape (PangoEngineShape *engine, +thai_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED, PangoFont *font, const char *text, gint length, @@ -312,7 +313,7 @@ thai_engine_shape (PangoEngineShape *engine, } PangoGlyph -thai_make_unknown_glyph (ThaiFontInfo *font_info, gunichar uc) +thai_make_unknown_glyph (ThaiFontInfo *font_info G_GNUC_UNUSED, gunichar uc) { return PANGO_GET_UNKNOWN_GLYPH (uc); } diff --git a/modules/thai/thai-lang.c b/modules/thai/thai-lang.c index c27ce0b..3157144 100644 --- a/modules/thai/thai-lang.c +++ b/modules/thai/thai-lang.c @@ -65,12 +65,12 @@ utf8_to_tis (const char *text, int len, thchar_t *tis_text, int *tis_cnt) } static void -thai_engine_break (PangoEngineLang *engine, +thai_engine_break (PangoEngineLang *engine G_GNUC_UNUSED, const char *text, int len, - PangoAnalysis *analysis, + PangoAnalysis *analysis G_GNUC_UNUSED, PangoLogAttr *attrs, - int attrs_len) + int attrs_len G_GNUC_UNUSED) { thchar_t tis_stack[512]; int brk_stack[512]; @@ -83,13 +83,13 @@ thai_engine_break (PangoEngineLang *engine, cnt = g_utf8_strlen (text, len) + 1; tis_text = tis_stack; - if (cnt > G_N_ELEMENTS (tis_stack)) + if (cnt > (int) G_N_ELEMENTS (tis_stack)) tis_text = g_new (thchar_t, cnt); utf8_to_tis (text, len, tis_text, &cnt); brk_pnts = brk_stack; - if (cnt > G_N_ELEMENTS (brk_stack)) + if (cnt > (int) G_N_ELEMENTS (brk_stack)) brk_pnts = g_new (int, cnt); /* find line break positions */ diff --git a/modules/thai/thai-shaper.c b/modules/thai/thai-shaper.c index e80bb3c..4ed173c 100644 --- a/modules/thai/thai-shaper.c +++ b/modules/thai/thai-shaper.c @@ -398,7 +398,7 @@ get_glyphs_list (ThaiFontInfo *font_info, { gint i; - switch (script) + switch ((int) script) { case PANGO_SCRIPT_THAI: switch (font_info->font_set) diff --git a/modules/tibetan/tibetan-fc.c b/modules/tibetan/tibetan-fc.c index 0691ad0..51600fc 100644 --- a/modules/tibetan/tibetan-fc.c +++ b/modules/tibetan/tibetan-fc.c @@ -412,7 +412,7 @@ get_index (PangoFcFont *fc_font, gunichar wc) static void -tibetan_engine_shape (PangoEngineShape *engine, +tibetan_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED, PangoFont *font, const char *text, int length, -- 2.7.4