From 219bfc4ac4706b7d77f612fc9199b0ffa5ea36a5 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 22 Sep 2004 18:14:55 +0000 Subject: Cleanups from 'sparse', #149922, Kjartan Maraas Wed Sep 22 14:07:47 2004 Owen Taylor Cleanups from 'sparse', #149922, Kjartan Maraas * pango/pango-utils.c (read_config): () => (void) in definition. * pango/pangofc-fontmap.c (pango_fc_font_map_list_families): Initialize *n_families, not n_families. * pango/pangofc-fontmap.c pango/pangoft2.c opentype/ftxgdef.c opentype/ftxgpos.c opentype/ftxgsub.c: : Fix various 0/NULL confusion. --- ChangeLog | 14 ++++++++++++++ ChangeLog.pre-1-10 | 14 ++++++++++++++ ChangeLog.pre-1-6 | 14 ++++++++++++++ ChangeLog.pre-1-8 | 14 ++++++++++++++ pango/opentype/ftxgdef.c | 2 +- pango/opentype/ftxgpos.c | 6 +++--- pango/opentype/ftxgsub.c | 2 +- pango/pango-utils.c | 2 +- pango/pangofc-fontmap.c | 6 +++--- pango/pangoft2.c | 2 +- 10 files changed, 66 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index a21aafd3..5c3302e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +Wed Sep 22 14:07:47 2004 Owen Taylor + + Cleanups from 'sparse', #149922, Kjartan Maraas + + * pango/pango-utils.c (read_config): () => (void) in + definition. + + * pango/pangofc-fontmap.c (pango_fc_font_map_list_families): + Initialize *n_families, not n_families. + + * pango/pangofc-fontmap.c pango/pangoft2.c opentype/ftxgdef.c + opentype/ftxgpos.c opentype/ftxgsub.c: : Fix various 0/NULL + confusion. + Mon Sep 20 13:57:35 2004 Owen Taylor * modules/indic/mprefixups.c (indic_mprefixups_apply): diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index a21aafd3..5c3302e3 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,17 @@ +Wed Sep 22 14:07:47 2004 Owen Taylor + + Cleanups from 'sparse', #149922, Kjartan Maraas + + * pango/pango-utils.c (read_config): () => (void) in + definition. + + * pango/pangofc-fontmap.c (pango_fc_font_map_list_families): + Initialize *n_families, not n_families. + + * pango/pangofc-fontmap.c pango/pangoft2.c opentype/ftxgdef.c + opentype/ftxgpos.c opentype/ftxgsub.c: : Fix various 0/NULL + confusion. + Mon Sep 20 13:57:35 2004 Owen Taylor * modules/indic/mprefixups.c (indic_mprefixups_apply): diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index a21aafd3..5c3302e3 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,17 @@ +Wed Sep 22 14:07:47 2004 Owen Taylor + + Cleanups from 'sparse', #149922, Kjartan Maraas + + * pango/pango-utils.c (read_config): () => (void) in + definition. + + * pango/pangofc-fontmap.c (pango_fc_font_map_list_families): + Initialize *n_families, not n_families. + + * pango/pangofc-fontmap.c pango/pangoft2.c opentype/ftxgdef.c + opentype/ftxgpos.c opentype/ftxgsub.c: : Fix various 0/NULL + confusion. + Mon Sep 20 13:57:35 2004 Owen Taylor * modules/indic/mprefixups.c (indic_mprefixups_apply): diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index a21aafd3..5c3302e3 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,17 @@ +Wed Sep 22 14:07:47 2004 Owen Taylor + + Cleanups from 'sparse', #149922, Kjartan Maraas + + * pango/pango-utils.c (read_config): () => (void) in + definition. + + * pango/pangofc-fontmap.c (pango_fc_font_map_list_families): + Initialize *n_families, not n_families. + + * pango/pangofc-fontmap.c pango/pangoft2.c opentype/ftxgdef.c + opentype/ftxgpos.c opentype/ftxgsub.c: : Fix various 0/NULL + confusion. + Mon Sep 20 13:57:35 2004 Owen Taylor * modules/indic/mprefixups.c (indic_mprefixups_apply): diff --git a/pango/opentype/ftxgdef.c b/pango/opentype/ftxgdef.c index 449b2e2d..60ad5816 100644 --- a/pango/opentype/ftxgdef.c +++ b/pango/opentype/ftxgdef.c @@ -179,7 +179,7 @@ if ( !retptr ) return TT_Err_Invalid_Argument; - if (( error = tt_face->goto_table( tt_face, TTAG_GDEF, stream, 0 ) )) + if (( error = tt_face->goto_table( tt_face, TTAG_GDEF, stream, NULL ) )) return error; if (( error = TT_New_GDEF_Table ( face, &gdef ) )) diff --git a/pango/opentype/ftxgpos.c b/pango/opentype/ftxgpos.c index 962b6663..3ac13482 100644 --- a/pango/opentype/ftxgpos.c +++ b/pango/opentype/ftxgpos.c @@ -102,7 +102,7 @@ if ( !stream ) return TT_Err_Invalid_Face_Handle; - if (( error = tt_face->goto_table( tt_face, TTAG_GPOS, stream, 0 ) )) + if (( error = tt_face->goto_table( tt_face, TTAG_GPOS, stream, NULL ) )) return error; base_offset = FILE_Pos(); @@ -663,7 +663,7 @@ { an->af.af3.XDeviceTable.StartSize = 0; an->af.af3.XDeviceTable.EndSize = 0; - an->af.af3.XDeviceTable.DeltaValue = 0; + an->af.af3.XDeviceTable.DeltaValue = NULL; } if ( ACCESS_Frame( 2L ) ) @@ -688,7 +688,7 @@ { an->af.af3.YDeviceTable.StartSize = 0; an->af.af3.YDeviceTable.EndSize = 0; - an->af.af3.YDeviceTable.DeltaValue = 0; + an->af.af3.YDeviceTable.DeltaValue = NULL; } break; diff --git a/pango/opentype/ftxgsub.c b/pango/opentype/ftxgsub.c index a5fb6026..b7e4c135 100644 --- a/pango/opentype/ftxgsub.c +++ b/pango/opentype/ftxgsub.c @@ -90,7 +90,7 @@ if ( !retptr ) return TT_Err_Invalid_Argument; - if (( error = tt_face->goto_table( tt_face, TTAG_GSUB, stream, 0 ) )) + if (( error = tt_face->goto_table( tt_face, TTAG_GSUB, stream, NULL ) )) return error; base_offset = FILE_Pos(); diff --git a/pango/pango-utils.c b/pango/pango-utils.c index 8768f84f..2c9e18d4 100644 --- a/pango/pango-utils.c +++ b/pango/pango-utils.c @@ -583,7 +583,7 @@ read_config_file (const char *filename, gboolean enoent_error) } static void -read_config () +read_config (void) { if (!config_hash) { diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index 6e54b632..8786e04a 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -449,7 +449,7 @@ pango_fc_font_map_list_families (PangoFontMap *fontmap, if (families) *families = NULL; if (n_families) - n_families = 0; + *n_families = 0; return; } @@ -592,7 +592,7 @@ pango_fc_make_pattern (const PangoFontDescription *description) size = (double) pango_font_description_get_size (description) / PANGO_SCALE; - pattern = FcPatternBuild (0, + pattern = FcPatternBuild (NULL, FC_WEIGHT, FcTypeInteger, weight, FC_SLANT, FcTypeInteger, slant, #ifdef FC_WIDTH @@ -751,7 +751,7 @@ pango_fc_font_map_get_patterns (PangoFontMap *fontmap, pango_fc_default_substitute (fcfontmap, pattern); - font_patterns = FcFontSort (NULL, pattern, FcTrue, 0, &res); + font_patterns = FcFontSort (NULL, pattern, FcTrue, NULL, &res); if (!font_patterns) { diff --git a/pango/pangoft2.c b/pango/pangoft2.c index 7860b042..78e9fb6d 100644 --- a/pango/pangoft2.c +++ b/pango/pangoft2.c @@ -120,7 +120,7 @@ load_fallback_face (PangoFT2Font *ft2font, FC_SIZE, FcTypeDouble, (double)pango_font_description_get_size (fcfont->description)/PANGO_SCALE, NULL); - matched = FcFontMatch (0, sans, &result); + matched = FcFontMatch (NULL, sans, &result); if (FcPatternGetString (matched, FC_FILE, 0, &filename2) != FcResultMatch) goto bail1; -- cgit v1.2.1