From owner-svn-src-stable-10@freebsd.org  Sun Dec 13 21:14:06 2015
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 49580A431F2;
 Sun, 13 Dec 2015 21:14:06 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 027451255;
 Sun, 13 Dec 2015 21:14:05 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBDLE55b084209;
 Sun, 13 Dec 2015 21:14:05 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBDLE4WX084206;
 Sun, 13 Dec 2015 21:14:04 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201512132114.tBDLE4WX084206@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sun, 13 Dec 2015 21:14:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r292169 - stable/10/lib/libc/regex/grot
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Dec 2015 21:14:06 -0000

Author: ngie
Date: Sun Dec 13 21:14:04 2015
New Revision: 292169
URL: https://svnweb.freebsd.org/changeset/base/292169

Log:
  Revert r292168 -- I used the wrong commit message by accident

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:09:46 2015	(r292168)
+++ stable/10/lib/libc/regex/grot/Makefile	Sun Dec 13 21:14:04 2015	(r292169)
@@ -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

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

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