From 8d59d66188e1028f12a611de416856fa6312eb4a Mon Sep 17 00:00:00 2001
From: Slava Zanko <slavazanko@gmail.com>
Date: Thu, 21 Oct 2010 12:25:38 +0300
Subject: [PATCH] Removed mc_search_cond_t->len (used
 mc_search_cond_t->str->len instead).

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
---
 lib/search/glob.c     | 2 +-
 lib/search/hex.c      | 2 +-
 lib/search/internal.h | 1 -
 lib/search/normal.c   | 2 +-
 lib/search/search.c   | 1 -
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/search/glob.c b/lib/search/glob.c
index ad0c42506..c791a8d2f 100644
--- a/lib/search/glob.c
+++ b/lib/search/glob.c
@@ -163,7 +163,7 @@ mc_search__cond_struct_new_init_glob (const char *charset, mc_search_t * lc_mc_s
                                       mc_search_cond_t * mc_search_cond)
 {
     GString *tmp =
-        mc_search__glob_translate_to_regex (mc_search_cond->str->str, &mc_search_cond->len);
+        mc_search__glob_translate_to_regex (mc_search_cond->str->str, &mc_search_cond->str->len);
 
     g_string_free (mc_search_cond->str, TRUE);
 
diff --git a/lib/search/hex.c b/lib/search/hex.c
index b8d772967..bb93cd9c2 100644
--- a/lib/search/hex.c
+++ b/lib/search/hex.c
@@ -101,7 +101,7 @@ mc_search__cond_struct_new_init_hex (const char *charset, mc_search_t * lc_mc_se
                                      mc_search_cond_t * mc_search_cond)
 {
     GString *tmp =
-        mc_search__hex_translate_to_regex (mc_search_cond->str->str, &mc_search_cond->len);
+        mc_search__hex_translate_to_regex (mc_search_cond->str->str, &mc_search_cond->str->len);
 
     g_string_free (mc_search_cond->str, TRUE);
     mc_search_cond->str = tmp;
diff --git a/lib/search/internal.h b/lib/search/internal.h
index 0d69d2fab..edb5e9f72 100644
--- a/lib/search/internal.h
+++ b/lib/search/internal.h
@@ -27,7 +27,6 @@ typedef struct mc_search_cond_struct {
     GString *upper;
     GString *lower;
     mc_search_regex_t *regex_handle;
-    gsize len;
     gchar *charset;
 } mc_search_cond_t;
 
diff --git a/lib/search/normal.c b/lib/search/normal.c
index fbb6790cc..9a2b92904 100644
--- a/lib/search/normal.c
+++ b/lib/search/normal.c
@@ -89,7 +89,7 @@ mc_search__cond_struct_new_init_normal (const char *charset, mc_search_t * lc_mc
                                         mc_search_cond_t * mc_search_cond)
 {
     GString *tmp =
-        mc_search__normal_translate_to_regex (mc_search_cond->str->str, &mc_search_cond->len);
+        mc_search__normal_translate_to_regex (mc_search_cond->str->str, &mc_search_cond->str->len);
 
     g_string_free (mc_search_cond->str, TRUE);
     if (lc_mc_search->whole_words)
diff --git a/lib/search/search.c b/lib/search/search.c
index 625c5da66..f79bc02a4 100644
--- a/lib/search/search.c
+++ b/lib/search/search.c
@@ -64,7 +64,6 @@ mc_search__cond_struct_new (mc_search_t * lc_mc_search, const char *str,
     mc_search_cond = g_malloc0 (sizeof (mc_search_cond_t));
 
     mc_search_cond->str = g_string_new_len (str, str_len);
-    mc_search_cond->len = str_len;
     mc_search_cond->charset = g_strdup (charset);
 
     switch (lc_mc_search->search_type) {