Browse Source

Removed mc_search_cond_t->len (used mc_search_cond_t->str->len instead).

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Slava Zanko 14 years ago
parent
commit
8d59d66188
5 changed files with 3 additions and 5 deletions
  1. 1 1
      lib/search/glob.c
  2. 1 1
      lib/search/hex.c
  3. 0 1
      lib/search/internal.h
  4. 1 1
      lib/search/normal.c
  5. 0 1
      lib/search/search.c

+ 1 - 1
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);
 

+ 1 - 1
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;

+ 0 - 1
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;
 

+ 1 - 1
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)

+ 0 - 1
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) {