Return -1 if queue is NULL. (#159530, Philippe Blain)

2004-12-04  Matthias Clasen  <mclasen@redhat.com>

	* glib/gqueue.c (g_queue_link_index): Return -1 if queue is
	NULL.  (#159530, Philippe Blain)

diff --git a/ChangeLog b/ChangeLog
index d685e87..9e49f4b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gqueue.c (g_queue_link_index): Return -1 if queue is 
+       NULL.  (#159530, Philippe Blain)
+
 2004-12-02  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d685e87..9e49f4b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-12-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gqueue.c (g_queue_link_index): Return -1 if queue is 
+       NULL.  (#159530, Philippe Blain)
+
 2004-12-02  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index d685e87..9e49f4b 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2004-12-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gqueue.c (g_queue_link_index): Return -1 if queue is 
+       NULL.  (#159530, Philippe Blain)
+
 2004-12-02  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d685e87..9e49f4b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-12-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gqueue.c (g_queue_link_index): Return -1 if queue is 
+       NULL.  (#159530, Philippe Blain)
+
 2004-12-02  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d685e87..9e49f4b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-12-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gqueue.c (g_queue_link_index): Return -1 if queue is 
+       NULL.  (#159530, Philippe Blain)
+
 2004-12-02  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version.

diff --git a/glib/gqueue.c b/glib/gqueue.c
index 0d57b48..54be19a 100644 (file)
--- a/glib/gqueue.c
+++ b/glib/gqueue.c
@@ -730,7 +730,7 @@ gint
 g_queue_link_index (GQueue *queue,
                    GList  *link_)
 {
-  g_return_val_if_fail (queue != NULL, 0);
+  g_return_val_if_fail (queue != NULL, -1);
 
   return g_list_position (queue->head, link_);
 }