From owner-svn-src-all@freebsd.org  Thu Oct  6 13:37:47 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 ACE6ABE9470;
 Thu,  6 Oct 2016 13:37:47 +0000 (UTC)
 (envelope-from emaste@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 7EEBAEB6;
 Thu,  6 Oct 2016 13:37:47 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u96Dbkf6099612;
 Thu, 6 Oct 2016 13:37:46 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u96Dbk4x099610;
 Thu, 6 Oct 2016 13:37:46 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201610061337.u96Dbk4x099610@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 6 Oct 2016 13:37:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r306758 - head/usr.bin/locate/locate
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Oct 2016 13:37:47 -0000

Author: emaste
Date: Thu Oct  6 13:37:46 2016
New Revision: 306758
URL: https://svnweb.freebsd.org/changeset/base/306758

Log:
  locate: ANSIfy

Modified:
  head/usr.bin/locate/locate/locate.c
  head/usr.bin/locate/locate/util.c

Modified: head/usr.bin/locate/locate/locate.c
==============================================================================
--- head/usr.bin/locate/locate/locate.c	Thu Oct  6 13:21:42 2016	(r306757)
+++ head/usr.bin/locate/locate/locate.c	Thu Oct  6 13:37:46 2016	(r306758)
@@ -134,9 +134,7 @@ extern int	check_bigram_char(int);
 extern char 	*patprep(char *);
 
 int
-main(argc, argv)
-        int argc;
-        char **argv;
+main(int argc, char **argv)
 {
         register int ch;
         char **dbv = NULL;
@@ -225,10 +223,13 @@ main(argc, argv)
 }
 
 
+/*
+ * Arguments:
+ * db	database
+ * s	search strings
+ */
 void
-search_fopen(db, s)
-	char *db; /* database */
-	char **s; /* search strings */
+search_fopen(char *db, char **s)
 {
 	FILE *fp;
 #ifdef DEBUG
@@ -275,10 +276,13 @@ search_fopen(db, s)
 } 
 
 #ifdef MMAP
+/*
+ * Arguments:
+ * db	database
+ * s	search strings
+ */
 void
-search_mmap(db, s)
-	char *db; /* database */
-	char **s; /* search strings */
+search_mmap(char *db, char **s)
 {
         struct stat sb;
         int fd;

Modified: head/usr.bin/locate/locate/util.c
==============================================================================
--- head/usr.bin/locate/locate/util.c	Thu Oct  6 13:21:42 2016	(r306757)
+++ head/usr.bin/locate/locate/util.c	Thu Oct  6 13:37:46 2016	(r306758)
@@ -83,10 +83,7 @@ check_bigram_char(ch)
  *
  */
 char **
-colon(dbv, path, dot)
-	char **dbv;
-	char *path;
-	char *dot; /* default for single ':' */
+colon(char **dbv, char *path, char *dot)
 {
 	int vlen, slen;
 	char *c, *ch, *p;