Commit d887ff42 authored by Marco Barisione's avatar Marco Barisione Committed by Marco Barisione

When the compilation of a pattern fails in the error message use the

2007-11-19  Marco Barisione  <marco@barisione.org>

	* glib/gregex.c: When the compilation of a pattern fails in the error
	message use the character offset and not the byte offset.

svn path=/trunk/; revision=5867
parent c8de8180
2007-11-19 Marco Barisione <marco@barisione.org>
* glib/gregex.c: When the compilation of a pattern fails in the error
message use the character offset and not the byte offset.
2007-11-19 10:30:33 Tim Janik <timj@imendio.com>
* configure.in: updated version number to 2.15.0 for development.
......
......@@ -924,11 +924,16 @@ g_regex_new (const gchar *pattern,
* immediately */
if (re == NULL)
{
GError *tmp_error = g_error_new (G_REGEX_ERROR,
G_REGEX_ERROR_COMPILE,
_("Error while compiling regular "
"expression %s at char %d: %s"),
pattern, erroffset, errmsg);
GError *tmp_error;
/* PCRE uses byte offsets but we want to show character offsets */
erroffset = g_utf8_pointer_to_offset (pattern, &pattern[erroffset]);
tmp_error = g_error_new (G_REGEX_ERROR,
G_REGEX_ERROR_COMPILE,
_("Error while compiling regular "
"expression %s at char %d: %s"),
pattern, erroffset, errmsg);
g_propagate_error (error, tmp_error);
return NULL;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment