From 36715ffb1e75a3dbef9c0e62ef0fdd07024a8a7a Mon Sep 17 00:00:00 2001 From: Morten Welinder Date: Wed, 5 Nov 2003 17:15:24 +0000 Subject: [PATCH] Make it compile. (#119337, self.) 2003-11-05 Morten Welinder * glib/garray.c (g_ptr_array_remove_range): Make it compile. (#119337, self.) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-12 | 3 +++ ChangeLog.pre-2-4 | 3 +++ ChangeLog.pre-2-6 | 3 +++ ChangeLog.pre-2-8 | 3 +++ glib/garray.c | 6 +++++- 7 files changed, 23 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d229e38..7f357fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2003-11-05 Morten Welinder + * glib/garray.c (g_ptr_array_remove_range): Make it compile. + (#119337, self.) + * glib/gstring.c (g_string_insert_len): Handle the case where the to-be-inserted string is a substring of the target string. (g_string_assign): Handle "s = s;". diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d229e38..7f357fd 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2003-11-05 Morten Welinder + * glib/garray.c (g_ptr_array_remove_range): Make it compile. + (#119337, self.) + * glib/gstring.c (g_string_insert_len): Handle the case where the to-be-inserted string is a substring of the target string. (g_string_assign): Handle "s = s;". diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index d229e38..7f357fd 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,8 @@ 2003-11-05 Morten Welinder + * glib/garray.c (g_ptr_array_remove_range): Make it compile. + (#119337, self.) + * glib/gstring.c (g_string_insert_len): Handle the case where the to-be-inserted string is a substring of the target string. (g_string_assign): Handle "s = s;". diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d229e38..7f357fd 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,8 @@ 2003-11-05 Morten Welinder + * glib/garray.c (g_ptr_array_remove_range): Make it compile. + (#119337, self.) + * glib/gstring.c (g_string_insert_len): Handle the case where the to-be-inserted string is a substring of the target string. (g_string_assign): Handle "s = s;". diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d229e38..7f357fd 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2003-11-05 Morten Welinder + * glib/garray.c (g_ptr_array_remove_range): Make it compile. + (#119337, self.) + * glib/gstring.c (g_string_insert_len): Handle the case where the to-be-inserted string is a substring of the target string. (g_string_assign): Handle "s = s;". diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d229e38..7f357fd 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2003-11-05 Morten Welinder + * glib/garray.c (g_ptr_array_remove_range): Make it compile. + (#119337, self.) + * glib/gstring.c (g_string_insert_len): Handle the case where the to-be-inserted string is a substring of the target string. (g_string_assign): Handle "s = s;". diff --git a/glib/garray.c b/glib/garray.c index 75ec5d5..e38a5a7 100644 --- a/glib/garray.c +++ b/glib/garray.c @@ -550,7 +550,11 @@ g_ptr_array_remove_range (GPtrArray* farray, array->len -= length; #ifdef ENABLE_GC_FRIENDLY - g_array_elt_zero (array->pdata, array->len, length); + { + guint i; + for (i = 0; i < length; i++) + array->pdata[array->len + i] = NULL; + } #endif /* ENABLE_GC_FRIENDLY */ } -- 2.7.4