Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Dec 2015 21:15:03 +0000 (UTC)
From:      Garrett Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r292170 - stable/10/lib/libc/regex/grot
Message-ID:  <201512132115.tBDLF3Xb084311@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Sun Dec 13 21:15:03 2015
New Revision: 292170
URL: https://svnweb.freebsd.org/changeset/base/292170

Log:
  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

Modified:
  stable/10/lib/libc/regex/grot/Makefile
  stable/10/lib/libc/regex/grot/main.c
  stable/10/lib/libc/regex/grot/split.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/regex/grot/Makefile
==============================================================================
--- stable/10/lib/libc/regex/grot/Makefile	Sun Dec 13 21:14:04 2015	(r292169)
+++ stable/10/lib/libc/regex/grot/Makefile	Sun Dec 13 21:15:03 2015	(r292170)
@@ -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

Modified: stable/10/lib/libc/regex/grot/main.c
==============================================================================
--- stable/10/lib/libc/regex/grot/main.c	Sun Dec 13 21:14:04 2015	(r292169)
+++ stable/10/lib/libc/regex/grot/main.c	Sun Dec 13 21:15:03 2015	(r292170)
@@ -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
  */

Modified: stable/10/lib/libc/regex/grot/split.c
==============================================================================
--- stable/10/lib/libc/regex/grot/split.c	Sun Dec 13 21:14:04 2015	(r292169)
+++ stable/10/lib/libc/regex/grot/split.c	Sun Dec 13 21:15:03 2015	(r292170)
@@ -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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512132115.tBDLF3Xb084311>