From owner-svn-src-all@FreeBSD.ORG Fri Oct 14 07:25:21 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6BE4D106564A; Fri, 14 Oct 2011 07:25:21 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 42BBD8FC0A; Fri, 14 Oct 2011 07:25:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9E7PLcv052186; Fri, 14 Oct 2011 07:25:21 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9E7PLbL052182; Fri, 14 Oct 2011 07:25:21 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201110140725.p9E7PLbL052182@svn.freebsd.org> From: Ed Schouten Date: Fri, 14 Oct 2011 07:25:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226360 - head/usr.bin/tr X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Oct 2011 07:25:21 -0000 Author: ed Date: Fri Oct 14 07:25:20 2011 New Revision: 226360 URL: http://svn.freebsd.org/changeset/base/226360 Log: Build tr(1) with WARNS=6. Modified: head/usr.bin/tr/Makefile head/usr.bin/tr/cset.c head/usr.bin/tr/str.c Modified: head/usr.bin/tr/Makefile ============================================================================== --- head/usr.bin/tr/Makefile Fri Oct 14 07:24:48 2011 (r226359) +++ head/usr.bin/tr/Makefile Fri Oct 14 07:25:20 2011 (r226360) @@ -4,6 +4,4 @@ PROG= tr SRCS= cmap.c cset.c str.c tr.c -WARNS?= 1 - .include Modified: head/usr.bin/tr/cset.c ============================================================================== --- head/usr.bin/tr/cset.c Fri Oct 14 07:24:48 2011 (r226359) +++ head/usr.bin/tr/cset.c Fri Oct 14 07:25:20 2011 (r226360) @@ -153,11 +153,11 @@ cset_in_hard(struct cset *cs, wchar_t ch struct csclass *csc; for (csc = cs->cs_classes; csc != NULL; csc = csc->csc_next) - if (csc->csc_invert ^ iswctype(ch, csc->csc_type) != 0) + if ((csc->csc_invert ^ iswctype(ch, csc->csc_type)) != 0) return (cs->cs_invert ^ true); if (cs->cs_root != NULL) { cs->cs_root = cset_splay(cs->cs_root, ch); - return (cs->cs_invert ^ cset_rangecmp(cs->cs_root, ch) == 0); + return ((cs->cs_invert ^ cset_rangecmp(cs->cs_root, ch)) == 0); } return (cs->cs_invert ^ false); } Modified: head/usr.bin/tr/str.c ============================================================================== --- head/usr.bin/tr/str.c Fri Oct 14 07:24:48 2011 (r226359) +++ head/usr.bin/tr/str.c Fri Oct 14 07:25:20 2011 (r226360) @@ -57,8 +57,7 @@ static int genrange(STR *, int); static void genseq(STR *); wint_t -next(s) - STR *s; +next(STR *s) { int is_octal; wint_t ch; @@ -135,8 +134,7 @@ next(s) } static int -bracket(s) - STR *s; +bracket(STR *s) { char *p; @@ -173,8 +171,7 @@ bracket(s) } static void -genclass(s) - STR *s; +genclass(STR *s) { if ((s->cclass = wctype(s->str)) == 0) @@ -190,8 +187,7 @@ genclass(s) } static void -genequiv(s) - STR *s; +genequiv(STR *s) { int i, p, pri; char src[2], dst[3]; @@ -295,8 +291,7 @@ genrange(STR *s, int was_octal) } static void -genseq(s) - STR *s; +genseq(STR *s) { char *ep; wchar_t wc;