diff options
author | ngie <ngie@FreeBSD.org> | 2015-12-13 21:14:04 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2015-12-13 21:14:04 +0000 |
commit | 1299d77d5065856f8bbd0aff31b276bf2aaba48a (patch) | |
tree | 2da61b4f97ccfbf272320c5f6462a1026d45a269 /lib/libc/regex | |
parent | 4380394990455e8964f466e8d745af43dc898519 (diff) | |
download | FreeBSD-src-1299d77d5065856f8bbd0aff31b276bf2aaba48a.zip FreeBSD-src-1299d77d5065856f8bbd0aff31b276bf2aaba48a.tar.gz |
Revert r292168 -- I used the wrong commit message by accident
Diffstat (limited to 'lib/libc/regex')
-rw-r--r-- | lib/libc/regex/grot/Makefile | 3 | ||||
-rw-r--r-- | lib/libc/regex/grot/main.c | 5 | ||||
-rw-r--r-- | lib/libc/regex/grot/split.c | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/lib/libc/regex/grot/Makefile b/lib/libc/regex/grot/Makefile index e715dd8..3e41724 100644 --- a/lib/libc/regex/grot/Makefile +++ b/lib/libc/regex/grot/Makefile @@ -62,8 +62,7 @@ regexec.o: engine.c engine.ih regerror.o: regerror.ih regerror.o: utils.h debug.o: debug.ih -main.o: debug.ih main.ih split.ih -split.o: split.ih +main.o: main.ih r: re tests ./re <tests diff --git a/lib/libc/regex/grot/main.c b/lib/libc/regex/grot/main.c index eee541b..5b50671 100644 --- a/lib/libc/regex/grot/main.c +++ b/lib/libc/regex/grot/main.c @@ -9,9 +9,7 @@ __FBSDID("$FreeBSD$"); #include <string.h> #include <unistd.h> -#include "debug.ih" #include "main.ih" -#include "split.ih" char *progname; int debug = 0; @@ -24,6 +22,9 @@ regoff_t startoff = 0; regoff_t endoff = 0; +extern int split(); +extern void regprint(); + /* - main - do the simple case, hand off to regress() for regression */ diff --git a/lib/libc/regex/grot/split.c b/lib/libc/regex/grot/split.c index c5d5264..07ab8f1 100644 --- a/lib/libc/regex/grot/split.c +++ b/lib/libc/regex/grot/split.c @@ -4,8 +4,6 @@ __FBSDID("$FreeBSD$"); #include <stdio.h> #include <string.h> -#include "split.ih" - /* - split - divide a string into fields, like awk split() == int split(char *string, char *fields[], int nfields, char *sep); |