garray.c (g_ptr_array_remove_index): bugfix: index check for array has

been wrong

diff --git a/ChangeLog b/ChangeLog
index 9ba7458ca7d4c3740529abc3fa6fb0dfe49b54be..b393a6650bfbe0d9925bf74427b97cf76491fcde 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-08-03  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * garray.c (g_ptr_array_remove_index): bugfix: index check for
+       array has been wrong.
+
 Fri Jul 31 22:17:05 1998  Tim Janik  <timj@gtk.org>
 
        * testglib.c (g_node_test): added a GNode test.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9ba7458ca7d4c3740529abc3fa6fb0dfe49b54be..b393a6650bfbe0d9925bf74427b97cf76491fcde 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+1998-08-03  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * garray.c (g_ptr_array_remove_index): bugfix: index check for
+       array has been wrong.
+
 Fri Jul 31 22:17:05 1998  Tim Janik  <timj@gtk.org>
 
        * testglib.c (g_node_test): added a GNode test.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9ba7458ca7d4c3740529abc3fa6fb0dfe49b54be..b393a6650bfbe0d9925bf74427b97cf76491fcde 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+1998-08-03  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * garray.c (g_ptr_array_remove_index): bugfix: index check for
+       array has been wrong.
+
 Fri Jul 31 22:17:05 1998  Tim Janik  <timj@gtk.org>
 
        * testglib.c (g_node_test): added a GNode test.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 9ba7458ca7d4c3740529abc3fa6fb0dfe49b54be..b393a6650bfbe0d9925bf74427b97cf76491fcde 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+1998-08-03  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * garray.c (g_ptr_array_remove_index): bugfix: index check for
+       array has been wrong.
+
 Fri Jul 31 22:17:05 1998  Tim Janik  <timj@gtk.org>
 
        * testglib.c (g_node_test): added a GNode test.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9ba7458ca7d4c3740529abc3fa6fb0dfe49b54be..b393a6650bfbe0d9925bf74427b97cf76491fcde 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+1998-08-03  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * garray.c (g_ptr_array_remove_index): bugfix: index check for
+       array has been wrong.
+
 Fri Jul 31 22:17:05 1998  Tim Janik  <timj@gtk.org>
 
        * testglib.c (g_node_test): added a GNode test.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9ba7458ca7d4c3740529abc3fa6fb0dfe49b54be..b393a6650bfbe0d9925bf74427b97cf76491fcde 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+1998-08-03  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * garray.c (g_ptr_array_remove_index): bugfix: index check for
+       array has been wrong.
+
 Fri Jul 31 22:17:05 1998  Tim Janik  <timj@gtk.org>
 
        * testglib.c (g_node_test): added a GNode test.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9ba7458ca7d4c3740529abc3fa6fb0dfe49b54be..b393a6650bfbe0d9925bf74427b97cf76491fcde 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+1998-08-03  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * garray.c (g_ptr_array_remove_index): bugfix: index check for
+       array has been wrong.
+
 Fri Jul 31 22:17:05 1998  Tim Janik  <timj@gtk.org>
 
        * testglib.c (g_node_test): added a GNode test.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9ba7458ca7d4c3740529abc3fa6fb0dfe49b54be..b393a6650bfbe0d9925bf74427b97cf76491fcde 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+1998-08-03  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * garray.c (g_ptr_array_remove_index): bugfix: index check for
+       array has been wrong.
+
 Fri Jul 31 22:17:05 1998  Tim Janik  <timj@gtk.org>
 
        * testglib.c (g_node_test): added a GNode test.

diff --git a/garray.c b/garray.c
index 16c1063a8018aac0a0682c22b44b3d19baf6743f..6bd0e7af3330c0fc5b8039659045cd56dd0f3041 100644 (file)
--- a/garray.c
+++ b/garray.c
@@ -236,7 +236,7 @@ g_ptr_array_remove_index (GPtrArray* farray,
 
   g_return_if_fail (array);
 
-  g_return_if_fail (index >= array->len);
+  g_return_if_fail (index < array->len);
 
   array->pdata[index] = array->pdata[array->len - 1];
 

diff --git a/glib/garray.c b/glib/garray.c
index 16c1063a8018aac0a0682c22b44b3d19baf6743f..6bd0e7af3330c0fc5b8039659045cd56dd0f3041 100644 (file)
--- a/glib/garray.c
+++ b/glib/garray.c
@@ -236,7 +236,7 @@ g_ptr_array_remove_index (GPtrArray* farray,
 
   g_return_if_fail (array);
 
-  g_return_if_fail (index >= array->len);
+  g_return_if_fail (index < array->len);
 
   array->pdata[index] = array->pdata[array->len - 1];