From 8b75e12b138827b0bcc7516184a5fce2fb6f35a9 Mon Sep 17 00:00:00 2001 From: Soeren Sandmann Date: Tue, 30 Sep 2003 13:36:25 +0000 Subject: [PATCH] make the argument const to get rid of warning Tue Sep 30 15:31:16 2003 Soeren Sandmann * glib/guniprop.c (has_more_above): make the argument const to get rid of warning * glib/garray.c (g_byte_array_remove_range): insert cast to get rid of warning --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-12 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ glib/garray.c | 2 +- glib/guniprop.c | 4 ++-- 8 files changed, 51 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cbc779097..bc32bd105 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Sep 30 15:31:16 2003 Soeren Sandmann + + * glib/guniprop.c (has_more_above): make the argument const to + get rid of warning + + * glib/garray.c (g_byte_array_remove_range): insert cast to get + rid of warning + 2003-09-29 Tor Lillqvist * tests/testglib.c (main): Use hardcoded name for DLL, as there is diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index cbc779097..bc32bd105 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Tue Sep 30 15:31:16 2003 Soeren Sandmann + + * glib/guniprop.c (has_more_above): make the argument const to + get rid of warning + + * glib/garray.c (g_byte_array_remove_range): insert cast to get + rid of warning + 2003-09-29 Tor Lillqvist * tests/testglib.c (main): Use hardcoded name for DLL, as there is diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index cbc779097..bc32bd105 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,11 @@ +Tue Sep 30 15:31:16 2003 Soeren Sandmann + + * glib/guniprop.c (has_more_above): make the argument const to + get rid of warning + + * glib/garray.c (g_byte_array_remove_range): insert cast to get + rid of warning + 2003-09-29 Tor Lillqvist * tests/testglib.c (main): Use hardcoded name for DLL, as there is diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index cbc779097..bc32bd105 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Tue Sep 30 15:31:16 2003 Soeren Sandmann + + * glib/guniprop.c (has_more_above): make the argument const to + get rid of warning + + * glib/garray.c (g_byte_array_remove_range): insert cast to get + rid of warning + 2003-09-29 Tor Lillqvist * tests/testglib.c (main): Use hardcoded name for DLL, as there is diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index cbc779097..bc32bd105 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Tue Sep 30 15:31:16 2003 Soeren Sandmann + + * glib/guniprop.c (has_more_above): make the argument const to + get rid of warning + + * glib/garray.c (g_byte_array_remove_range): insert cast to get + rid of warning + 2003-09-29 Tor Lillqvist * tests/testglib.c (main): Use hardcoded name for DLL, as there is diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index cbc779097..bc32bd105 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Tue Sep 30 15:31:16 2003 Soeren Sandmann + + * glib/guniprop.c (has_more_above): make the argument const to + get rid of warning + + * glib/garray.c (g_byte_array_remove_range): insert cast to get + rid of warning + 2003-09-29 Tor Lillqvist * tests/testglib.c (main): Use hardcoded name for DLL, as there is diff --git a/glib/garray.c b/glib/garray.c index c7c6dacaf..75ec5d5f8 100644 --- a/glib/garray.c +++ b/glib/garray.c @@ -705,7 +705,7 @@ g_byte_array_remove_range (GByteArray *array, g_return_val_if_fail (index_ < array->len, FALSE); g_return_val_if_fail (index_ + length <= array->len, FALSE); - return g_array_remove_range ((GArray*) array, index_, length); + return (GByteArray *)g_array_remove_range ((GArray*) array, index_, length); } void diff --git a/glib/guniprop.c b/glib/guniprop.c index 349870a8e..8603a81b2 100644 --- a/glib/guniprop.c +++ b/glib/guniprop.c @@ -741,9 +741,9 @@ g_utf8_strup (const gchar *str, /* traverses the string checking for characters with combining class == 230 * until a base character is found */ static gboolean -has_more_above (gchar *str) +has_more_above (const gchar *str) { - gchar *p = str; + const gchar *p = str; gint combining_class; while (*p)