diff --git a/ChangeLog b/ChangeLog index 2d3b9e2ae..70dadd3b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Jan 31 03:13:56 2004 Matthias Clasen + + * glib/garray.c (g_byte_array_remove_range): Don't return FALSE + from a pointer function. (#131472, Morten Welinder) + 2004-01-30 Noah Levitt * glib/gunicomp.h: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2d3b9e2ae..70dadd3b0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sat Jan 31 03:13:56 2004 Matthias Clasen + + * glib/garray.c (g_byte_array_remove_range): Don't return FALSE + from a pointer function. (#131472, Morten Welinder) + 2004-01-30 Noah Levitt * glib/gunicomp.h: diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 2d3b9e2ae..70dadd3b0 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Sat Jan 31 03:13:56 2004 Matthias Clasen + + * glib/garray.c (g_byte_array_remove_range): Don't return FALSE + from a pointer function. (#131472, Morten Welinder) + 2004-01-30 Noah Levitt * glib/gunicomp.h: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2d3b9e2ae..70dadd3b0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sat Jan 31 03:13:56 2004 Matthias Clasen + + * glib/garray.c (g_byte_array_remove_range): Don't return FALSE + from a pointer function. (#131472, Morten Welinder) + 2004-01-30 Noah Levitt * glib/gunicomp.h: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2d3b9e2ae..70dadd3b0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sat Jan 31 03:13:56 2004 Matthias Clasen + + * glib/garray.c (g_byte_array_remove_range): Don't return FALSE + from a pointer function. (#131472, Morten Welinder) + 2004-01-30 Noah Levitt * glib/gunicomp.h: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2d3b9e2ae..70dadd3b0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sat Jan 31 03:13:56 2004 Matthias Clasen + + * glib/garray.c (g_byte_array_remove_range): Don't return FALSE + from a pointer function. (#131472, Morten Welinder) + 2004-01-30 Noah Levitt * glib/gunicomp.h: diff --git a/glib/garray.c b/glib/garray.c index 21faff3a4..8869236c6 100644 --- a/glib/garray.c +++ b/glib/garray.c @@ -728,9 +728,9 @@ g_byte_array_remove_range (GByteArray *array, guint index_, guint length) { - g_return_val_if_fail (array, FALSE); - g_return_val_if_fail (index_ < array->len, FALSE); - g_return_val_if_fail (index_ + length <= array->len, FALSE); + g_return_val_if_fail (array, NULL); + g_return_val_if_fail (index_ < array->len, NULL); + g_return_val_if_fail (index_ + length <= array->len, NULL); return (GByteArray *)g_array_remove_range ((GArray*) array, index_, length); }