From a74c1a1a7c4e6626ac9f2fb58b8b4578ee8e47c0 Mon Sep 17 00:00:00 2001 From: Marco Barisione Date: Sun, 17 Feb 2008 14:26:30 +0000 Subject: [PATCH] Avoid some useless casts from const gchar * to gchar *. (#516597, patch by 2008-02-17 Marco Barisione * glib/gregex.c: (translate_compile_error), (g_regex_new): Avoid some useless casts from const gchar * to gchar *. (#516597, patch by Yevgen Muntyan) svn path=/trunk/; revision=6528 --- ChangeLog | 6 ++++++ glib/gregex.c | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e97a2fd86..3307cc963 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-02-17 Marco Barisione + + * glib/gregex.c: (translate_compile_error), (g_regex_new): Avoid some + useless casts from const gchar * to gchar *. (#516597, patch by + Yevgen Muntyan) + 2008-02-17 Marco Barisione * glib/gregex.c: (match_info_new), (g_match_info_next): Don't return diff --git a/glib/gregex.c b/glib/gregex.c index 18db8d49f..8d438751e 100644 --- a/glib/gregex.c +++ b/glib/gregex.c @@ -180,7 +180,7 @@ match_error (gint errcode) } static void -translate_compile_error (gint *errcode, gchar **errmsg) +translate_compile_error (gint *errcode, const gchar **errmsg) { /* Compile errors are created adding 100 to the error code returned * by PCRE. @@ -1075,7 +1075,7 @@ g_regex_new (const gchar *pattern, { GRegex *regex; pcre *re; - gchar *errmsg; + const gchar *errmsg; gint erroffset; gint errcode; gboolean optimize = FALSE; @@ -1142,7 +1142,7 @@ g_regex_new (const gchar *pattern, /* compile the pattern */ re = pcre_compile2 (pattern, compile_options, &errcode, - (const gchar **)&errmsg, &erroffset, NULL); + &errmsg, &erroffset, NULL); /* if the compilation failed, set the error member and return * immediately */ @@ -1189,7 +1189,7 @@ g_regex_new (const gchar *pattern, if (optimize) { - regex->extra = pcre_study (regex->pcre_re, 0, (const gchar **)&errmsg); + regex->extra = pcre_study (regex->pcre_re, 0, &errmsg); if (errmsg != NULL) { GError *tmp_error = g_error_new (G_REGEX_ERROR,