Updated the copyright headers and the version to 1.1.6.

[selector.git] / selector.c

diff --git a/selector.c b/selector.c
index 06c43e3..0cb82ea 100644 (file)
--- a/selector.c
+++ b/selector.c
@@ -3,7 +3,7 @@
  *  selector is a simple command line utility for selection of strings
  *  with a dynamic pattern-matching.
  *
- *  Copyright (c) 2009, 2010, 2011 Francois Fleuret
+ *  Copyright (c) 2009, 2010, 2011, 2012 Francois Fleuret
  *  Written by Francois Fleuret <francois@fleuret.org>
  *
  *  This file is part of selector.
@@ -45,7 +45,7 @@
 #include <getopt.h>
 #include <limits.h>
 
-#define VERSION "1.1.5"
+#define VERSION "1.1.6"
 
 #define BUFFER_SIZE 4096
 
@@ -320,8 +320,9 @@ struct matcher {
 };
 
 /* Routine to add an interval to a sorted list of intervals
-   extermities. Returns the number of extremities. This is an effing
-   nightmare */
+   extremities. Returns the resulting number of extremities.
+
+   This routine is an effing nightmare */
 
 int add_interval(int n, int *switches, int start, int end) {
   int f, g, k;
@@ -624,10 +625,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);