From owner-svn-src-head@freebsd.org Thu Sep 7 17:20:48 2017 Return-Path: Delivered-To: svn-src-head@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 80945E04095; Thu, 7 Sep 2017 17:20:48 +0000 (UTC) (envelope-from rlibby@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 3BB0AA75; Thu, 7 Sep 2017 17:20:48 +0000 (UTC) (envelope-from rlibby@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v87HKl05048948; Thu, 7 Sep 2017 17:20:47 GMT (envelope-from rlibby@FreeBSD.org) Received: (from rlibby@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v87HKlmk048946; Thu, 7 Sep 2017 17:20:47 GMT (envelope-from rlibby@FreeBSD.org) Message-Id: <201709071720.v87HKlmk048946@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rlibby set sender to rlibby@FreeBSD.org using -f From: Ryan Libby Date: Thu, 7 Sep 2017 17:20:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r323276 - head/usr.sbin/crunch/crunchgen X-SVN-Group: head X-SVN-Commit-Author: rlibby X-SVN-Commit-Paths: head/usr.sbin/crunch/crunchgen X-SVN-Commit-Revision: 323276 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Sep 2017 17:20:48 -0000 Author: rlibby Date: Thu Sep 7 17:20:47 2017 New Revision: 323276 URL: https://svnweb.freebsd.org/changeset/base/323276 Log: crunchgen: quiet -Wmissing-prototypes Reviewed by: emaste (previous version) Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D12107 Modified: head/usr.sbin/crunch/crunchgen/crunched_main.c head/usr.sbin/crunch/crunchgen/crunchgen.c Modified: head/usr.sbin/crunch/crunchgen/crunched_main.c ============================================================================== --- head/usr.sbin/crunch/crunchgen/crunched_main.c Thu Sep 7 16:54:47 2017 (r323275) +++ head/usr.sbin/crunch/crunchgen/crunched_main.c Thu Sep 7 17:20:47 2017 (r323276) @@ -47,6 +47,8 @@ struct stub { extern char *__progname; extern struct stub entry_points[]; +static void crunched_usage(void); + int main(int argc, char **argv, char **envp) { @@ -72,22 +74,6 @@ main(int argc, char **argv, char **envp) int -crunched_here(char *path) -{ - char *slash, *basename; - struct stub *ep; - - slash = strrchr(path, '/'); - basename = slash? slash+1 : path; - - for(ep=entry_points; ep->name != NULL; ep++) - if(!strcmp(basename, ep->name)) - return 1; - return 0; -} - - -int crunched_main(int argc, char **argv, char **envp) { char *slash; @@ -104,7 +90,7 @@ crunched_main(int argc, char **argv, char **envp) } -int +static void crunched_usage() { int columns, len; Modified: head/usr.sbin/crunch/crunchgen/crunchgen.c ============================================================================== --- head/usr.sbin/crunch/crunchgen/crunchgen.c Thu Sep 7 16:54:47 2017 (r323275) +++ head/usr.sbin/crunch/crunchgen/crunchgen.c Thu Sep 7 17:20:47 2017 (r323276) @@ -1105,6 +1105,7 @@ prog_makefile_rules(FILE *outmk, prog_t *p) fprintf(outmk, "%s_stub.c:\n", p->name); fprintf(outmk, "\techo \"" + "extern int main(int argc, char **argv, char **envp); " "int _crunched_%s_stub(int argc, char **argv, char **envp)" "{return main(argc,argv,envp);}\" >%s_stub.c\n", p->ident, p->name);