Silence compiler warnings.

2005-11-28  Matthias Clasen  <mclasen@redhat.com>

	* gobjectnotifyqueue.c (g_object_notify_queue_thaw):
	* gobject-query.c (main): Silence compiler warnings.

	* glib-genmarshal.c (main): Use G_N_ELEMENTS.

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 3b49bac..1dd51cc 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-28  Matthias Clasen  <mclasen@redhat.com>
+
+       * gobjectnotifyqueue.c (g_object_notify_queue_thaw): 
+       * gobject-query.c (main): Silence compiler warnings.
+
+       * glib-genmarshal.c (main): Use G_N_ELEMENTS.
+
 2005-11-27  Matthias Clasen  <mclasen@redhat.com>
 
        * gboxed.h: Declare g_hash_table_get_type.

diff --git a/gobject/glib-genmarshal.c b/gobject/glib-genmarshal.c
index 1403fb8..102be18 100644 (file)
--- a/gobject/glib-genmarshal.c
+++ b/gobject/glib-genmarshal.c
@@ -622,7 +622,7 @@ main (int   argc,
 
   /* add standard marshallers of the GObject library */
   if (std_includes)
-    for (i = 0; i < sizeof (gobject_marshallers) / sizeof (gobject_marshallers[0]); i++)
+    for (i = 0; i < G_N_ELEMENTS (gobject_marshallers); i++)
       {
        gchar *tmp = g_strdup (gobject_marshallers[i]);
        

diff --git a/gobject/gobject-query.c b/gobject/gobject-query.c
index 5b4ff71..6934748 100644 (file)
--- a/gobject/gobject-query.c
+++ b/gobject/gobject-query.c
@@ -122,7 +122,7 @@ main (gint   argc,
   GLogLevelFlags fatal_mask;
   gboolean gen_froots = 0;
   gboolean gen_tree = 0;
-  guint i;
+  gint i;
   gchar *iindent = "";
 
   f_out = stdout;

diff --git a/gobject/gobjectnotifyqueue.c b/gobject/gobjectnotifyqueue.c
index e02e6d0..65c8e95 100644 (file)
--- a/gobject/gobjectnotifyqueue.c
+++ b/gobject/gobjectnotifyqueue.c
@@ -106,7 +106,7 @@ g_object_notify_queue_thaw (GObject            *object,
   for (slist = nqueue->pspecs; slist; slist = slist->next)
     {
       GParamSpec *pspec = slist->data;
-      gint i = 0;
+      guint i = 0;
 
       /* dedup, make pspecs in the list unique */
     redo_dedup_check: