Changeset 72f613a for fmtext.c

Timestamp:

Sep 18, 2010, 3:17:27 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:

449c682

Parents:

9c678a5

git-author:

David Benjamin <davidben@mit.edu> (07/31/10 18:07:44)

git-committer:

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

Message:

Make owl_fmtext_search take and return an offset

File:

• fmtext.c (modified) (1 diff)

fmtext.c

@@ -620 +620 @@
 }
 
-/* return 1 if the string is found, 0 if not.  This is a case
- *  insensitive search.
+/* Search 'f' for the regex 're' for matches starting at
+ * 'start'. Returns the offset of the first match, -1 if not
+ * found. This is a case-insensitive search.
  */
-int owl_fmtext_search(const owl_fmtext *f, const owl_regex *re)
-{
-  if (owl_regex_compare(re, f->textbuff, NULL, NULL) == 0) return(1);
-  return(0);
+int owl_fmtext_search(const owl_fmtext *f, const owl_regex *re, int start)
+{
+  int offset;
+  if (start > f->textlen ||
+      owl_regex_compare(re, f->textbuff + start, &offset, NULL) != 0)
+    return -1;
+  return offset + start;
 }