Bug 481537 – compiler warning fixes Patch from Kjartan Maraas

2007-10-15  Behdad Esfahbod  <behdad@gnome.org>

        Bug 481537 – compiler warning fixes
        Patch from Kjartan Maraas

        * pango/break.c (pango_get_log_attrs):
        * pango/pango-attributes.c (pango_attr_list_insert_internal):
        * pango/pango-layout.c (process_item), (justify_clusters):
        * pango/pango-markup.c (span_parse_boolean):
        * pango/pango-ot-ruleset.c (pango_ot_ruleset_finalize),
        (pango_ot_ruleset_new):
        * pango/pango-utils.c (pango_scan_int):
        * pango/pangocairo-font.c (_pango_cairo_font_install):
        * pango/pangofc-font.c (pango_fc_font_create_metrics_for_context):
        * pango/pangoft2.c (load_fallback_face):
        * pango/pangox-fontmap.c (pango_x_get_coverage_win):
        * pango/pangox.c (itemize_string_foreach):
        Fix warnings.


svn path=/trunk/; revision=2444

12 files changed, 28 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index c0e401b3..501cadb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2007-10-15  Behdad Esfahbod  <behdad@gnome.org>
+
+	Bug 481537 – compiler warning fixes
+	Patch from Kjartan Maraas
+
+	* pango/break.c (pango_get_log_attrs):
+	* pango/pango-attributes.c (pango_attr_list_insert_internal):
+	* pango/pango-layout.c (process_item), (justify_clusters):
+	* pango/pango-markup.c (span_parse_boolean):
+	* pango/pango-ot-ruleset.c (pango_ot_ruleset_finalize),
+	(pango_ot_ruleset_new):
+	* pango/pango-utils.c (pango_scan_int):
+	* pango/pangocairo-font.c (_pango_cairo_font_install):
+	* pango/pangofc-font.c (pango_fc_font_create_metrics_for_context):
+	* pango/pangoft2.c (load_fallback_face):
+	* pango/pangox-fontmap.c (pango_x_get_coverage_win):
+	* pango/pangox.c (itemize_string_foreach):
+	Fix warnings.
+
 2007-10-11  Behdad Esfahbod  <behdad@gnome.org>
 
 	Bug 485566 – Cache one OpenType Buffer
diff --git a/pango/break.c b/pango/break.c
index e079a113..de849348 100644
--- a/pango/break.c
+++ b/pango/break.c
@@ -1682,7 +1682,7 @@ pango_get_log_attrs (const char    *text,
   PangoEngineLang *range_engine;
   static guint engine_type_id = 0;
   static guint render_type_id = 0;
-  PangoAnalysis analysis = { 0 };
+  PangoAnalysis analysis = { NULL };
   PangoScriptIter *iter;
 
   g_return_if_fail (length == 0 || text != NULL);
diff --git a/pango/pango-attributes.c b/pango/pango-attributes.c
index e054b14d..a9a4c26a 100644
--- a/pango/pango-attributes.c
+++ b/pango/pango-attributes.c
@@ -1166,7 +1166,7 @@ pango_attr_list_insert_internal (PangoAttrList  *list,
   else if (((PangoAttribute *)list->attributes_tail->data)->start_index < start_index ||
 	   (!before && ((PangoAttribute *)list->attributes_tail->data)->start_index == start_index))
     {
-      g_slist_append (list->attributes_tail, attr);
+      list->attributes_tail = g_slist_append (list->attributes_tail, attr);
       list->attributes_tail = list->attributes_tail->next;
       g_assert (list->attributes_tail);
     }
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 04d56a5a..a002b028 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -3201,7 +3201,6 @@ process_item (PangoLayout     *layout,
 	  else
 	    {
 	      PangoItem *new_item;
-	      int new_break_width;
 
 	      length = g_utf8_offset_to_pointer (layout->text + item->offset, break_num_chars) - (layout->text + item->offset);
 
@@ -4733,7 +4732,6 @@ static void
 justify_clusters (PangoLayoutLine *line,
 		  ParaBreakState  *state)
 {
-  int offset;
   int total_remaining_width, total_gaps = 0;
   int added_so_far, gaps_so_far;
   gboolean is_hinted;
@@ -4759,8 +4757,6 @@ justify_clusters (PangoLayoutLine *line,
 	{
 	  PangoLayoutRun *run = run_iter->data;
 	  PangoGlyphString *glyphs = run->glyphs;
-	  PangoGlyphItemIter cluster_iter;
-	  gboolean have_cluster;
 	  gboolean is_first_gap = TRUE;
 
 	  int i;
diff --git a/pango/pango-markup.c b/pango/pango-markup.c
index 47fda6fc..af337e17 100644
--- a/pango/pango-markup.c
+++ b/pango/pango-markup.c
@@ -876,8 +876,6 @@ span_parse_boolean (const char *attr_name,
 		    int line_number,
 		    GError **error)
 {
-  const char *end = attr_val;
-
   if (strcmp (attr_val, "true") == 0 ||
       strcmp (attr_val, "yes") == 0 ||
       strcmp (attr_val, "t") == 0 ||
diff --git a/pango/pango-ot-ruleset.c b/pango/pango-ot-ruleset.c
index f484c4e0..ddd92c3f 100644
--- a/pango/pango-ot-ruleset.c
+++ b/pango/pango-ot-ruleset.c
@@ -93,7 +93,7 @@ pango_ot_ruleset_finalize (GObject *object)
 
   g_array_free (ruleset->rules, TRUE);
   if (ruleset->info)
-    g_object_remove_weak_pointer (ruleset->info, &ruleset->info);
+    g_object_remove_weak_pointer (G_OBJECT (ruleset->info), &ruleset->info);
 
   parent_class->finalize (object);
 }
@@ -175,7 +175,7 @@ pango_ot_ruleset_new (PangoOTInfo *info)
   ruleset = g_object_new (PANGO_TYPE_OT_RULESET, NULL);
 
   ruleset->info = info;
-  g_object_add_weak_pointer (ruleset->info, &ruleset->info);
+  g_object_add_weak_pointer (G_OBJECT (ruleset->info), &ruleset->info);
 
   return ruleset;
 }
diff --git a/pango/pango-utils.c b/pango/pango-utils.c
index 3f36478c..47b402b7 100644
--- a/pango/pango-utils.c
+++ b/pango/pango-utils.c
@@ -512,7 +512,6 @@ pango_scan_string (const char **pos, GString *out)
 gboolean
 pango_scan_int (const char **pos, int *out)
 {
-  unsigned int i = 0;
   char *end;
   long temp;
 
diff --git a/pango/pangocairo-font.c b/pango/pangocairo-font.c
index 8c6ab66b..c33d3fde 100644
--- a/pango/pangocairo-font.c
+++ b/pango/pangocairo-font.c
@@ -189,7 +189,7 @@ gboolean
 _pango_cairo_font_install (PangoFont *font,
 			   cairo_t   *cr)
 {
-  cairo_scaled_font_t *scaled_font = pango_cairo_font_get_scaled_font (font);
+  cairo_scaled_font_t *scaled_font = pango_cairo_font_get_scaled_font ((PangoCairoFont *)font);
 
   if (G_UNLIKELY (scaled_font == NULL || cairo_scaled_font_status (scaled_font) != CAIRO_STATUS_SUCCESS))
     return FALSE;
diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c
index f48cffb7..40fd3a40 100644
--- a/pango/pangofc-font.c
+++ b/pango/pangofc-font.c
@@ -441,7 +441,7 @@ pango_fc_font_create_metrics_for_context (PangoFcFont   *fcfont,
   PangoRectangle extents;
   PangoLanguage *language = pango_context_get_language (context);
   const char *sample_str = pango_language_get_sample_string (language);
-  PangoFontDescription *desc = pango_font_describe_with_absolute_size (fcfont);
+  PangoFontDescription *desc = pango_font_describe_with_absolute_size (PANGO_FONT (fcfont));
 
   metrics = pango_font_metrics_new ();
 
diff --git a/pango/pangoft2.c b/pango/pangoft2.c
index e8800344..f2d85af9 100644
--- a/pango/pangoft2.c
+++ b/pango/pangoft2.c
@@ -100,7 +100,7 @@ load_fallback_face (PangoFT2Font *ft2font,
 			 FC_PIXEL_SIZE, FcTypeDouble, (double)ft2font->size / PANGO_SCALE,
 			 NULL);
 
-  _pango_ft2_font_map_default_substitute (fcfont->fontmap, sans);
+  _pango_ft2_font_map_default_substitute ((PangoFcFontMap *)fcfont->fontmap, sans);
 
   matched = FcFontMatch (NULL, sans, &result);
 
diff --git a/pango/pangox-fontmap.c b/pango/pangox-fontmap.c
index b4f5043f..f4b5eafe 100644
--- a/pango/pangox-fontmap.c
+++ b/pango/pangox-fontmap.c
@@ -645,7 +645,7 @@ pango_x_get_coverage_win (PangoXFontMap *xfontmap)
 	    XCreateWindow (persistant_display,
 			   DefaultRootWindow (persistant_display),
 			   -100, -100, 10, 10, 0, 0,
-			   InputOnly, CopyFromParent,
+			   InputOnly, (Visual *)CopyFromParent,
 			   CWOverrideRedirect, &attr);
 
 	  XChangeProperty (persistant_display,
diff --git a/pango/pangox.c b/pango/pangox.c
index 0a55cf30..924164d3 100644
--- a/pango/pangox.c
+++ b/pango/pangox.c
@@ -761,7 +761,7 @@ itemize_string_foreach (PangoFont     *font,
 	  (finished ||
 	   (shaper != last_shaper || last_level != embedding_levels[i])))
 	{
-	  PangoAnalysis analysis = {0};
+	  PangoAnalysis analysis = { NULL };
 	  int j;
 
 	  analysis.shape_engine = last_shaper;