Changeset 9c1e61d4

Timestamp:

Sep 18, 2010, 5:07:40 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

b6cf72f

Parents:

a728387

git-author:

David Benjamin <davidben@mit.edu> (08/15/10 19:40:03)

git-committer:

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

Message:

Add OWL_SEARCH_CONTINUE and OWL_SEARCH_MATCH_CURRENT

Instead of having a confusing mode argument, define more constants.

Files:

• commands.c (modified) (1 diff)
• functions.c (modified) (2 diffs)
• owl.h (modified) (1 diff)
• viewwin.c (modified) (3 diffs)

commands.c

@@ -2538 +2538 @@
     
   if (argc==1 || (argc==2 && !strcmp(argv[1], "-r"))) {
-    owl_function_search_helper(1, direction);
+    owl_function_search_helper(OWL_SEARCH_CONTINUE, direction);
   } else {
     owl_function_set_search(buffstart);
-    owl_function_search_helper(0, direction);
+    owl_function_search_helper(OWL_SEARCH_MATCH_CURRENT, direction);
   }
   

functions.c

@@ -2904 +2904 @@
    * OWL_DIRECTION_UPWARDS then search backwards.
    *
-   * If mode==0 then it will stay on the current message if it
-   * contains the string.
+   * If mode is OWL_SEARCH_MATCH_CURRENT then it will stay on the
+   * current message if it contains the string.
    */
 
@@ -2921 +2921 @@
   }
 
-  if (mode==0) {
+  if (mode == OWL_SEARCH_MATCH_CURRENT) {
     start=curmsg;
   } else if (direction==OWL_DIRECTION_DOWNWARDS) {

owl.h

@@ -138 +138 @@
 #define OWL_DIRECTION_DOWNWARDS 1
 #define OWL_DIRECTION_UPWARDS   2
+
+#define OWL_SEARCH_MATCH_CURRENT 0
+#define OWL_SEARCH_CONTINUE      1
 
 #define OWL_LOGGING_DIRECTION_BOTH 0

viewwin.c

@@ -300 +300 @@
  * found.
  *
- * If mode==0 then stay on the current line if it matches.
+ * If mode is OWL_SEARCH_MATCH_CURRENT then stay on the current line
+ * if it matches.
  */
 int owl_viewwin_search(owl_viewwin *v, const owl_regex *re, int mode, int direction)
@@ -309 +310 @@
   owl_fmtext_line_extents(&v->fmtext, v->topline, &start, &end);
   if (direction == OWL_DIRECTION_DOWNWARDS) {
-    offset = owl_fmtext_search(&v->fmtext, re, mode ? end : start);
+    offset = owl_fmtext_search(&v->fmtext, re,
+                               (mode == OWL_SEARCH_CONTINUE) ? end : start);
     if (offset < 0)
       return 0;
@@ -321 +323 @@
      * them. */
     buf = owl_fmtext_get_text(&v->fmtext);
-    lineend = mode ? start : end;
+    lineend = (mode == OWL_SEARCH_CONTINUE) ? start : end;
     while (lineend > 0) {
       linestartp = memrchr(buf, '\n', lineend - 1);