From 083b345c2ebdbe20c44b30e4429eeedc9b0b68db Mon Sep 17 00:00:00 2001 From: shivers Date: Sun, 22 Oct 1995 10:05:39 +0000 Subject: [PATCH] Renamed rescm.c to re1.c --- scsh/{rescm.c => re1.c} | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) rename scsh/{rescm.c => re1.c} (82%) diff --git a/scsh/rescm.c b/scsh/re1.c similarity index 82% rename from scsh/rescm.c rename to scsh/re1.c index ead82ac..7df2494 100644 --- a/scsh/rescm.c +++ b/scsh/re1.c @@ -6,6 +6,9 @@ #include "regexp.h" #include "cstuff.h" +/* Make sure our exports match up w/the implementation: */ +#include "re1.h" + #ifndef NULL #define NULL 0 #endif @@ -21,7 +24,7 @@ void regerror(char *msg) {regexp_error = msg;} ** Returns boolean match/no-match in hit. */ -char *reg_match(char *re, char *string, int start, +char *reg_match(const char *re, const char *string, int start, scheme_value start_vec, scheme_value end_vec, int *hit) { regexp *prog = regcomp(re); @@ -55,11 +58,11 @@ char *reg_match(char *re, char *string, int start, } -char *filter_stringvec(char *re, char **stringvec, int *nummatch) +char *filter_stringvec(const char *re, char const **stringvec, int *nummatch) { regexp *prog = regcomp(re); - char **p = stringvec; - char **q = p; + char const **p = stringvec; + char const **q = p; if( !prog ) return regexp_error; @@ -70,5 +73,5 @@ char *filter_stringvec(char *re, char **stringvec, int *nummatch) Free(prog); *nummatch = q-stringvec; - return ""; + return NULL; }