diff options
author | ngie <ngie@FreeBSD.org> | 2015-12-05 02:23:44 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2015-12-05 02:23:44 +0000 |
commit | 9e66d95c5d014b6f37a110113c70ddb7781e386b (patch) | |
tree | eba40fdfcca561a7c57ecc410dd90861af535d04 /lib/libc/regex | |
parent | 06d2ea67281a4f7640db2bee3afad963c8d74cb7 (diff) | |
download | FreeBSD-src-9e66d95c5d014b6f37a110113c70ddb7781e386b.zip FreeBSD-src-9e66d95c5d014b6f37a110113c70ddb7781e386b.tar.gz |
split.ih:
- Create automatically generated include header for split.c
main.c:
- Use function definitions from debug.ih and split.ih instead of externs
Sponsored by: EMC / Isilon Storage Division
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, 6 insertions, 4 deletions
diff --git a/lib/libc/regex/grot/Makefile b/lib/libc/regex/grot/Makefile index 3e41724..e715dd8 100644 --- a/lib/libc/regex/grot/Makefile +++ b/lib/libc/regex/grot/Makefile @@ -62,7 +62,8 @@ regexec.o: engine.c engine.ih regerror.o: regerror.ih regerror.o: utils.h debug.o: debug.ih -main.o: main.ih +main.o: debug.ih main.ih split.ih +split.o: split.ih r: re tests ./re <tests diff --git a/lib/libc/regex/grot/main.c b/lib/libc/regex/grot/main.c index 880e69e..4ce9d87 100644 --- a/lib/libc/regex/grot/main.c +++ b/lib/libc/regex/grot/main.c @@ -9,7 +9,9 @@ __FBSDID("$FreeBSD$"); #include <string.h> #include <unistd.h> +#include "debug.ih" #include "main.ih" +#include "split.ih" char *progname; int debug = 0; @@ -22,9 +24,6 @@ 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 07ab8f1..c5d5264 100644 --- a/lib/libc/regex/grot/split.c +++ b/lib/libc/regex/grot/split.c @@ -4,6 +4,8 @@ __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); |