Changeset 118c919 for viewwin.c

Timestamp:

Sep 21, 2010, 5:33:11 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.7, release-1.8, release-1.9

Children:

b120bd3

Parents:

4a41f16

git-author:

David Benjamin <davidben@mit.edu> (09/18/10 17:35:30)

git-committer:

David Benjamin <davidben@mit.edu> (09/21/10 17:33:11)

Message:

Name search argument consider_current

Adding yet another enum for a boolean value is overkill.

File:

• viewwin.c (modified) (6 diffs)

viewwin.c

@@ -144 +144 @@
 char *owl_viewwin_command_search(owl_viewwin *v, int argc, const char *const *argv, const char *buff)
 {
-  int direction, mode;
+  int direction, consider_current;
   const char *buffstart;
 
@@ -155 +155 @@
 
   if (argc==1 || (argc==2 && !strcmp(argv[1], "-r"))) {
-    mode = OWL_SEARCH_CONTINUE;
+    consider_current = false;
   } else {
     owl_function_set_search(buffstart);
-    mode = OWL_SEARCH_MATCH_CURRENT;
-  }
-
-  if (!owl_viewwin_search(v, owl_global_get_search_re(&g), mode, direction))
+    consider_current = true;
+  }
+
+  if (!owl_viewwin_search(v, owl_global_get_search_re(&g), consider_current, direction))
     owl_function_error("No more matches");
   return NULL;
@@ -177 +177 @@
   owl_function_set_search(line);
   if (!owl_viewwin_search(data->v, owl_global_get_search_re(&g),
-                          OWL_SEARCH_MATCH_CURRENT, data->direction))
+                          true, data->direction))
     owl_function_error("No matches");
 }
@@ -368 +368 @@
  * found.
  *
- * If mode is OWL_SEARCH_MATCH_CURRENT then stay on the current line
+ * If consider_current is true then stay on the current line
  * if it matches.
  */
-int owl_viewwin_search(owl_viewwin *v, const owl_regex *re, int mode, int direction)
+int owl_viewwin_search(owl_viewwin *v, const owl_regex *re, int consider_current, int direction)
 {
   int start, end, offset;
@@ -379 +379 @@
   if (direction == OWL_DIRECTION_DOWNWARDS) {
     offset = owl_fmtext_search(&v->fmtext, re,
-                               (mode == OWL_SEARCH_CONTINUE) ? end : start);
+                               consider_current ? start : end);
     if (offset < 0)
       return 0;
@@ -391 +391 @@
      * them. */
     buf = owl_fmtext_get_text(&v->fmtext);
-    lineend = (mode == OWL_SEARCH_CONTINUE) ? start : end;
+    lineend = consider_current ? end : start;
     while (lineend > 0) {
       linestartp = memrchr(buf, '\n', lineend - 1);