1From 5cd94a0982e4a910ee33ec58f7678429ec067b6f Mon Sep 17 00:00:00 2001 2From: Aleksei Rybalkin <aleksei@rybalkin.org> 3Date: Thu, 14 Jul 2022 13:14:31 +0000 4Subject: [PATCH] gregex: use %s format specifier for localized error message 5 6Conflict:NA 7Reference:https://gitlab.gnome.org/GNOME/glib/-/commit/5cd94a0982e4a910ee33ec58f7678429ec067b6f 8 9--- 10 glib/gregex.c | 9 ++++++--- 11 1 file changed, 6 insertions(+), 3 deletions(-) 12 13diff --git a/glib/gregex.c b/glib/gregex.c 14index 55672249cb..5fc7b16bc8 100644 15--- a/glib/gregex.c 16+++ b/glib/gregex.c 17@@ -1661,6 +1661,7 @@ regex_compile (const gchar *pattern, 18 if (re == NULL) 19 { 20 GError *tmp_error; 21+ gchar *offset_str; 22 23 /* Translate the PCRE error code to GRegexError and use a translated 24 * error message if possible */ 25@@ -1669,11 +1670,13 @@ regex_compile (const gchar *pattern, 26 /* PCRE uses byte offsets but we want to show character offsets */ 27 erroffset = g_utf8_pointer_to_offset (pattern, &pattern[erroffset]); 28 29+ offset_str = g_strdup_printf ("%" G_GSIZE_FORMAT, erroffset); 30 tmp_error = g_error_new (G_REGEX_ERROR, errcode, 31- _("Error while compiling regular " 32- "expression %s at char %" G_GSIZE_FORMAT ": %s"), 33- pattern, erroffset, errmsg); 34+ _("Error while compiling regular expression ‘%s’ " 35+ "at char %s: %s"), 36+ pattern, offset_str, errmsg); 37 g_propagate_error (error, tmp_error); 38+ g_free (offset_str); 39 40 return NULL; 41 } 42-- 43GitLab 44 45