From owner-svn-src-stable@freebsd.org Fri Apr 13 02:40:11 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 328F4F8273D; Fri, 13 Apr 2018 02:40:11 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D9876784D2; Fri, 13 Apr 2018 02:40:10 +0000 (UTC) (envelope-from kevans@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D04DB13D39; Fri, 13 Apr 2018 02:40:10 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3D2eAYZ015093; Fri, 13 Apr 2018 02:40:10 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3D2eA1K015091; Fri, 13 Apr 2018 02:40:10 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201804130240.w3D2eA1K015091@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Fri, 13 Apr 2018 02:40:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r332462 - stable/11/usr.bin/locate/locate X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: stable/11/usr.bin/locate/locate X-SVN-Commit-Revision: 332462 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Apr 2018 02:40:11 -0000 Author: kevans Date: Fri Apr 13 02:40:10 2018 New Revision: 332462 URL: https://svnweb.freebsd.org/changeset/base/332462 Log: MFC r306758 (emaste): locate: ANSIfy Modified: stable/11/usr.bin/locate/locate/locate.c stable/11/usr.bin/locate/locate/util.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/locate/locate/locate.c ============================================================================== --- stable/11/usr.bin/locate/locate/locate.c Fri Apr 13 00:29:42 2018 (r332461) +++ stable/11/usr.bin/locate/locate/locate.c Fri Apr 13 02:40:10 2018 (r332462) @@ -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: stable/11/usr.bin/locate/locate/util.c ============================================================================== --- stable/11/usr.bin/locate/locate/util.c Fri Apr 13 00:29:42 2018 (r332461) +++ stable/11/usr.bin/locate/locate/util.c Fri Apr 13 02:40:10 2018 (r332462) @@ -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;