Fixed a bug when the -y option is not there.

[selector.git] / selector.c

diff --git a/selector.c b/selector.c
index cf90315..effd014 100644 (file)
--- a/selector.c
+++ b/selector.c
@@ -410,25 +410,6 @@ int match(struct matcher *matcher, char *string, int *nb_switches, int *switches
           *nb_switches = add_interval(*nb_switches, switches,
                                       (int) (where - string),
                                       (int) (where - string) + strlen(matcher->patterns[n]));
-#warning CHECK THE INTERVALS
-          {
-            /* int i; */
-            /* FILE *out = fopen("/tmp/intervals", "w"); */
-            /* for(k = 0; k < (*nb_switches)/2; k++) { */
-            /* i = 0; */
-            /* for(; i < switches[2 * k]; i++) fprintf(out, "-"); */
-            /* for(; i < switches[2 * k + 1]; i++) fprintf(out, "%c", string[i]); */
-            /* for(; i < strlen(string); i++) fprintf(out, "-"); */
-            /* fprintf(out, "\n"); */
-            /* } */
-            /* fclose(out); */
-            int k;
-            for(k = 0; k < *nb_switches - 1; k++) {
-              if(switches[k] > switches[k+1]) {
-                abort();
-              }
-            }
-          }
         }
       }
     }
@@ -643,10 +624,14 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
 
   initialize_matcher(&matcher, use_regexp, case_sensitive, pattern);
 
-  if(show_hits && matcher.nb_patterns >= 0) {
-    switches = safe_malloc(sizeof(int) * matcher.nb_patterns * 2);
+  if(show_hits) {
+    if(matcher.nb_patterns >= 0) {
+      switches = safe_malloc(sizeof(int) * matcher.nb_patterns * 2);
+    } else {
+      switches = safe_malloc(sizeof(int) * 2);
+    }
   } else {
-    switches = safe_malloc(sizeof(int) * 2);
+    switches = 0;
   }
 
   console_width = getmaxx(stdscr);