From 884d7c76abd746fbce937fd54cde4db30b93a02a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 31 Jan 2004 02:12:06 +0000 Subject: [PATCH] Don't return FALSE from a pointer function. (#131472, Morten Welinder) 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) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/garray.c | 6 +++--- 7 files changed, 33 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d3b9e2..70dadd3 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 2d3b9e2..70dadd3 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 2d3b9e2..70dadd3 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 2d3b9e2..70dadd3 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 2d3b9e2..70dadd3 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 2d3b9e2..70dadd3 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 21faff3..8869236 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); } -- 2.7.4