From 16811ed60721cd39410d72100b75df9601b88d88 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 15 Jul 2009 21:01:52 +0300 Subject: [PATCH] src/search fixed variable declaration and code mix Signed-off-by: Sergei Trofimovich --- src/search/hex.c | 2 +- src/search/search.c | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/search/hex.c b/src/search/hex.c index fd25c5b10..b7eeebf43 100644 --- a/src/search/hex.c +++ b/src/search/hex.c @@ -71,8 +71,8 @@ mc_search__hex_translate_to_regex (gchar * str, gsize * len) } if (*(tmp_str + loop) == '"') { - loop++; gsize loop2 = 0; + loop++; while (loop + loop2 < *len) { if (*(tmp_str + loop + loop2) == '"' && !strutils_is_char_escaped (tmp_str, tmp_str + loop + loop2)) diff --git a/src/search/search.c b/src/search/search.c index 423ce1feb..96ec61ef8 100644 --- a/src/search/search.c +++ b/src/search/search.c @@ -387,10 +387,12 @@ mc_search_getstart_rezult_by_num (mc_search_t * mc_search, int index) if (mc_search->search_type == MC_SEARCH_T_NORMAL) return 0; #ifdef SEARCH_TYPE_GLIB - gint start_pos; - gint end_pos; - g_match_info_fetch_pos (mc_search->regex_match_info, index, &start_pos, &end_pos); - return (int) start_pos; + { + gint start_pos; + gint end_pos; + g_match_info_fetch_pos (mc_search->regex_match_info, index, &start_pos, &end_pos); + return (int) start_pos; + } #else /* SEARCH_TYPE_GLIB */ return mc_search->iovector[index * 2]; #endif /* SEARCH_TYPE_GLIB */ @@ -407,10 +409,12 @@ mc_search_getend_rezult_by_num (mc_search_t * mc_search, int index) if (mc_search->search_type == MC_SEARCH_T_NORMAL) return 0; #ifdef SEARCH_TYPE_GLIB - gint start_pos; - gint end_pos; - g_match_info_fetch_pos (mc_search->regex_match_info, index, &start_pos, &end_pos); - return (int) end_pos; + { + gint start_pos; + gint end_pos; + g_match_info_fetch_pos (mc_search->regex_match_info, index, &start_pos, &end_pos); + return (int) end_pos; + } #else /* SEARCH_TYPE_GLIB */ return mc_search->iovector[index * 2 + 1]; #endif /* SEARCH_TYPE_GLIB */