mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

(mc_search__cond_struct_new_regex_hex_add): refactoring to get rid of extra memory allocation.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2013-08-09 11:15:21 +04:00
parent bb2f5d35f3
commit 00f6272364
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/search/regex.c
View File

@ -119,12 +119,12 @@ mc_search__regex_str_append_if_special (GString * copy_to, const GString * regex
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
static void static void
mc_search__cond_struct_new_regex_hex_add (const char *charset, GString * str_to, mc_search__cond_struct_new_regex_hex_add (const char *charset, GString * str_to,
const char *one_char, gsize str_len) const char *one_char, gsize str_len)
{ {
GString *upp, *low; GString *upp, *low;
gchar *tmp_str;
gsize loop; gsize loop;
upp = mc_search__toupper_case_str (charset, one_char, str_len); upp = mc_search__toupper_case_str (charset, one_char, str_len);
@ -132,23 +132,20 @@ mc_search__cond_struct_new_regex_hex_add (const char *charset, GString * str_to,
for (loop = 0; loop < upp->len; loop++) for (loop = 0; loop < upp->len; loop++)
{ {
gchar tmp_str[10 + 1]; /* longest content is "[\\x%02X\\x%02X]" */
gint tmp_len;
if (loop < low->len) if (loop >= low->len || upp->str[loop] == low->str[loop])
{ tmp_len =
if (upp->str[loop] == low->str[loop]) g_snprintf (tmp_str, sizeof (tmp_str), "\\x%02X", (unsigned char) upp->str[loop]);
tmp_str = g_strdup_printf ("\\x%02X", (unsigned char) upp->str[loop]);
else else
tmp_str = tmp_len =
g_strdup_printf ("[\\x%02X\\x%02X]", (unsigned char) upp->str[loop], g_snprintf (tmp_str, sizeof (tmp_str), "[\\x%02X\\x%02X]",
(unsigned char) low->str[loop]); (unsigned char) upp->str[loop], (unsigned char) low->str[loop]);
}
else g_string_append_len (str_to, tmp_str, tmp_len);
{
tmp_str = g_strdup_printf ("\\x%02X", (unsigned char) upp->str[loop]);
}
g_string_append (str_to, tmp_str);
g_free (tmp_str);
} }
g_string_free (upp, TRUE); g_string_free (upp, TRUE);
g_string_free (low, TRUE); g_string_free (low, TRUE);
} }