From 6ee0ed5750a8336d4fece8543559b3e62c20294d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 17 Jun 2009 15:14:47 +0300 Subject: [PATCH 1/2] Ticket #409: search: build failure on glib <2.14 During constant renaming #ifdef'ed path was broken. Signed-off-by: Sergei Trofimovich --- src/search/regex.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/search/regex.c b/src/search/regex.c index 9470a9dc9..e7e63e3d5 100644 --- a/src/search/regex.c +++ b/src/search/regex.c @@ -259,10 +259,10 @@ mc_search__regex_found_cond_one (mc_search_t * mc_search, mc_search_regex_t * re } #else /* HAVE_LIBPCRE */ - if (regexec (regex, search_str->str, MC_SEARCH__NUM_REPL_ARGS, mc_search->regex_match_info, 0)) + if (regexec (regex, search_str->str, MC_SEARCH__NUM_REPLACE_ARGS, mc_search->regex_match_info, 0)) return COND__NOT_FOUND; - for (mc_search->num_rezults = 0; mc_search->num_rezults < MC_SEARCH__NUM_REPL_ARGS; + for (mc_search->num_rezults = 0; mc_search->num_rezults < MC_SEARCH__NUM_REPLACE_ARGS; mc_search->num_rezults++) { if (mc_search->regex_match_info[mc_search->num_rezults].rm_eo == 0) break; @@ -549,7 +549,7 @@ mc_search__cond_struct_new_init_regex (const char *charset, mc_search_t * mc_sea mc_search_cond->regex_handle = NULL; return; } - mc_search->regex_match_info = g_new0 (mc_search_matchinfo_t, MC_SEARCH__NUM_REPL_ARGS); + mc_search->regex_match_info = g_new0 (mc_search_matchinfo_t, MC_SEARCH__NUM_REPLACE_ARGS); #endif /* HAVE_LIBPCRE */ #endif /* GLIB_CHECK_VERSION (2, 14, 0) */ } From f4611f3651e6c47587511b6fce93fc0c0b94926b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 17 Jun 2009 15:52:21 +0300 Subject: [PATCH 2/2] Ticket #409: search: build failure on glib <2.14 During constant renaming #ifdef'ed path was broken. Signed-off-by: Sergei Trofimovich --- src/search/regex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/search/regex.c b/src/search/regex.c index e7e63e3d5..872671b73 100644 --- a/src/search/regex.c +++ b/src/search/regex.c @@ -253,7 +253,7 @@ mc_search__regex_found_cond_one (mc_search_t * mc_search, mc_search_regex_t * re #if HAVE_LIBPCRE mc_search->num_rezults = pcre_exec (regex, mc_search->regex_match_info, search_str->str, search_str->len, 0, 0, mc_search->iovector, - MC_SEARCH__PCRE_MAX_MATCHES); + MC_SEARCH__NUM_REPLACE_ARGS); if (mc_search->num_rezults < 0) { return COND__NOT_FOUND; }