diff options
author | Paolo Bonzini <bonzini@gnu.org> | 2010-03-18 13:44:28 +0100 |
---|---|---|
committer | Paolo Bonzini <bonzini@gnu.org> | 2010-03-22 09:56:16 +0100 |
commit | d50cec2ac8902cc73cef9288671b4f317a68bdf6 (patch) | |
tree | ccf707f988ec7c48a06e74b9068a10297495890f /src | |
parent | 9131ab90daad68365418cfb25e6deb2fb84bfae4 (diff) | |
download | grep-d50cec2ac8902cc73cef9288671b4f317a68bdf6.tar.gz |
grep: libify *search.c
* src/Makefile.am (libsearch_a_SOURCES): Add dfasearch.c, kwsearch.c,
pcresearch.c.
* src/esearch.c, src/fsearch.c, * src/gsearch.c: Only include search.h.
* src/dfasearch.c (GEAcompile, EGexecute): Export.
* src/kwsearch.c (Fcompile, Fexecute): Export.
* src/pcresearch.c (Pcompile, Pexecute): Export.
* src/search.h: Add new exported functions.
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 4 | ||||
-rw-r--r-- | src/dfasearch.c | 5 | ||||
-rw-r--r-- | src/esearch.c | 3 | ||||
-rw-r--r-- | src/fsearch.c | 3 | ||||
-rw-r--r-- | src/gsearch.c | 5 | ||||
-rw-r--r-- | src/kwsearch.c | 4 | ||||
-rw-r--r-- | src/pcresearch.c | 4 | ||||
-rw-r--r-- | src/search.h | 14 |
8 files changed, 28 insertions, 14 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 7ebc126d..65715290 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,8 @@ fgrep_SOURCES = fgrep.c fsearch.c noinst_HEADERS = grep.h dfa.h kwset.h search.h system.h mbsupport.h noinst_LIBRARIES = libsearch.a -libsearch_a_SOURCES = kwset.c dfa.c searchutils.c +libsearch_a_SOURCES = kwset.c dfa.c searchutils.c dfasearch.c kwsearch.c \ + pcresearch.c LDADD = $(LIBINTL) libsearch.a ../lib/libgreputils.a grep_LDADD = $(LDADD) $(PCRE_LIBS) @@ -34,5 +35,4 @@ INCLUDES = -I$(top_srcdir)/lib -DLOCALEDIR=\"$(localedir)\" EXTRA_DIST = \ dosbuf.c \ - pcresearch.c dfasearch.c kwsearch.c \ vms_fab.c vms_fab.h diff --git a/src/dfasearch.c b/src/dfasearch.c index 6a9137a8..996effdb 100644 --- a/src/dfasearch.c +++ b/src/dfasearch.c @@ -110,8 +110,7 @@ kwsmusts (void) } } -/* No __VA_ARGS__ in C89. So we have to do it this way. */ -static void +void GEAcompile (char const *pattern, size_t size, reg_syntax_t syntax_bits) { const char *err; @@ -195,7 +194,7 @@ GEAcompile (char const *pattern, size_t size, reg_syntax_t syntax_bits) free(motif); } -static size_t +size_t EGexecute (char const *buf, size_t size, size_t *match_size, char const *start_ptr) { diff --git a/src/esearch.c b/src/esearch.c index 933ecc88..647d2cbd 100644 --- a/src/esearch.c +++ b/src/esearch.c @@ -1,4 +1,5 @@ -#include "dfasearch.c" +#include <config.h> +#include "search.h" static void Ecompile (char const *pattern, size_t size) diff --git a/src/fsearch.c b/src/fsearch.c index b16e7693..a5244875 100644 --- a/src/fsearch.c +++ b/src/fsearch.c @@ -1,4 +1,5 @@ -#include "kwsearch.c" +#include <config.h> +#include "search.h" struct matcher const matchers[] = { { "fgrep", Fcompile, Fexecute }, diff --git a/src/gsearch.c b/src/gsearch.c index 7156809d..b71d3b72 100644 --- a/src/gsearch.c +++ b/src/gsearch.c @@ -1,6 +1,5 @@ -#include "dfasearch.c" -#include "pcresearch.c" -#include "kwsearch.c" +#include <config.h> +#include "search.h" static void Gcompile (char const *pattern, size_t size) diff --git a/src/kwsearch.c b/src/kwsearch.c index 245ccf0a..2f8e7b73 100644 --- a/src/kwsearch.c +++ b/src/kwsearch.c @@ -29,7 +29,7 @@ any string matching the regexp. */ static kwset_t kwset; -static void +void Fcompile (char const *pattern, size_t size) { char const *beg, *end, *lim, *err, *pat; @@ -74,7 +74,7 @@ Fcompile (char const *pattern, size_t size) error (EXIT_TROUBLE, 0, "%s", err); } -static size_t +size_t Fexecute (char const *buf, size_t size, size_t *match_size, char const *start_ptr) { diff --git a/src/pcresearch.c b/src/pcresearch.c index f09acdc7..4dedf245 100644 --- a/src/pcresearch.c +++ b/src/pcresearch.c @@ -32,7 +32,7 @@ static pcre *cre; static pcre_extra *extra; #endif -static void +void Pcompile (char const *pattern, size_t size) { #if !HAVE_LIBPCRE @@ -99,7 +99,7 @@ Pcompile (char const *pattern, size_t size) #endif } -static size_t +size_t Pexecute (char const *buf, size_t size, size_t *match_size, char const *start_ptr) { diff --git a/src/search.h b/src/search.h index cb3b535f..10e4d5cc 100644 --- a/src/search.h +++ b/src/search.h @@ -37,6 +37,7 @@ #include "kwset.h" #include "xalloc.h" +/* searchutils.c */ void kwsinit (kwset_t *); #ifdef MBS_SUPPORT @@ -44,4 +45,17 @@ char * mbtolower (const char *, size_t *); bool is_mb_middle(const char **, const char *, const char *); #endif +/* dfasearch.c */ +void GEAcompile (char const *, size_t, reg_syntax_t); +size_t EGexecute (char const *, size_t, size_t *, char const *); + +/* kwsearch.c */ +void Fcompile (char const *, size_t); +size_t Fexecute (char const *, size_t, size_t *, char const *); + +/* pcresearch.c */ +void Pcompile (char const *, size_t); +size_t Pexecute (char const *, size_t, size_t *, char const *); + + #endif /* GREP_SEARCH_H */ |