summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorngie <ngie@FreeBSD.org>2015-12-13 21:15:03 +0000
committerngie <ngie@FreeBSD.org>2015-12-13 21:15:03 +0000
commite999176b6bf8f524f072ecbc48c8e26a3cbe6778 (patch)
tree3705cab50e561b728e85c49dd6abc99e53d97881 /lib
parent1299d77d5065856f8bbd0aff31b276bf2aaba48a (diff)
downloadFreeBSD-src-e999176b6bf8f524f072ecbc48c8e26a3cbe6778.zip
FreeBSD-src-e999176b6bf8f524f072ecbc48c8e26a3cbe6778.tar.gz
MFC r291837:
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')
-rw-r--r--lib/libc/regex/grot/Makefile3
-rw-r--r--lib/libc/regex/grot/main.c5
-rw-r--r--lib/libc/regex/grot/split.c2
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 5b50671..eee541b 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);
OpenPOWER on IntegriCloud