From owner-svn-src-head@FreeBSD.ORG Thu May 6 17:06:37 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2202E1065670; Thu, 6 May 2010 17:06:37 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 070C48FC0A; Thu, 6 May 2010 17:06:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o46H6a1S035866; Thu, 6 May 2010 17:06:36 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o46H6aVD035858; Thu, 6 May 2010 17:06:36 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201005061706.o46H6aVD035858@svn.freebsd.org> From: Xin LI Date: Thu, 6 May 2010 17:06:36 +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: r207705 - head/usr.bin/find X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 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, 06 May 2010 17:06:37 -0000 Author: delphij Date: Thu May 6 17:06:36 2010 New Revision: 207705 URL: http://svn.freebsd.org/changeset/base/207705 Log: Revert r207677 which is considered a violation of style(9). Pointed out by: bde Pointy hat to: delphij Modified: head/usr.bin/find/find.c head/usr.bin/find/function.c head/usr.bin/find/ls.c head/usr.bin/find/main.c head/usr.bin/find/misc.c head/usr.bin/find/operator.c head/usr.bin/find/option.c Modified: head/usr.bin/find/find.c ============================================================================== --- head/usr.bin/find/find.c Thu May 6 17:03:27 2010 (r207704) +++ head/usr.bin/find/find.c Thu May 6 17:06:36 2010 (r207705) @@ -32,10 +32,15 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * @(#)find.c 8.5 (Berkeley) 8/5/94 */ +#ifndef lint +#if 0 +static char sccsid[] = "@(#)find.c 8.5 (Berkeley) 8/5/94"; +#else +#endif +#endif /* not lint */ + #include __FBSDID("$FreeBSD$"); Modified: head/usr.bin/find/function.c ============================================================================== --- head/usr.bin/find/function.c Thu May 6 17:03:27 2010 (r207704) +++ head/usr.bin/find/function.c Thu May 6 17:06:36 2010 (r207705) @@ -32,10 +32,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * @(#)function.c 8.10 (Berkeley) 5/4/95 */ +#ifndef lint +#if 0 +static const char sccsid[] = "@(#)function.c 8.10 (Berkeley) 5/4/95"; +#endif +#endif /* not lint */ + #include __FBSDID("$FreeBSD$"); Modified: head/usr.bin/find/ls.c ============================================================================== --- head/usr.bin/find/ls.c Thu May 6 17:03:27 2010 (r207704) +++ head/usr.bin/find/ls.c Thu May 6 17:06:36 2010 (r207705) @@ -29,10 +29,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * @(#)ls.c 8.1 (Berkeley) 6/6/93 */ +#ifndef lint +#if 0 +static char sccsid[] = "@(#)ls.c 8.1 (Berkeley) 6/6/93"; +#endif +#endif /* not lint */ + #include __FBSDID("$FreeBSD$"); Modified: head/usr.bin/find/main.c ============================================================================== --- head/usr.bin/find/main.c Thu May 6 17:03:27 2010 (r207704) +++ head/usr.bin/find/main.c Thu May 6 17:06:36 2010 (r207705) @@ -32,8 +32,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * @(#)main.c 8.4 (Berkeley) 5/4/95 */ #ifndef lint @@ -42,6 +40,12 @@ char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ +#ifndef lint +#if 0 +static char sccsid[] = "@(#)main.c 8.4 (Berkeley) 5/4/95"; +#endif +#endif /* not lint */ + #include __FBSDID("$FreeBSD$"); Modified: head/usr.bin/find/misc.c ============================================================================== --- head/usr.bin/find/misc.c Thu May 6 17:03:27 2010 (r207704) +++ head/usr.bin/find/misc.c Thu May 6 17:06:36 2010 (r207705) @@ -32,10 +32,15 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * @(#)misc.c 8.2 (Berkeley) 4/1/94 */ +#ifndef lint +#if 0 +static char sccsid[] = "@(#)misc.c 8.2 (Berkeley) 4/1/94"; +#else +#endif +#endif /* not lint */ + #include __FBSDID("$FreeBSD$"); Modified: head/usr.bin/find/operator.c ============================================================================== --- head/usr.bin/find/operator.c Thu May 6 17:03:27 2010 (r207704) +++ head/usr.bin/find/operator.c Thu May 6 17:06:36 2010 (r207705) @@ -32,10 +32,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * @(#)operator.c 8.1 (Berkeley) 6/6/93 */ +#ifndef lint +#if 0 +static char sccsid[] = "@(#)operator.c 8.1 (Berkeley) 6/6/93"; +#endif +#endif /* not lint */ + #include __FBSDID("$FreeBSD$"); Modified: head/usr.bin/find/option.c ============================================================================== --- head/usr.bin/find/option.c Thu May 6 17:03:27 2010 (r207704) +++ head/usr.bin/find/option.c Thu May 6 17:06:36 2010 (r207705) @@ -32,10 +32,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * @(#)option.c 8.2 (Berkeley) 4/16/94 */ +#ifndef lint +/* +static char sccsid[] = "@(#)option.c 8.2 (Berkeley) 4/16/94"; +*/ +#endif /* not lint */ + #include __FBSDID("$FreeBSD$"); @@ -51,7 +55,7 @@ __FBSDID("$FreeBSD$"); #include "find.h" -int typecompare(const void *, const void *); +static int typecompare(const void *, const void *); /* NB: the following table must be sorted lexically. */ /* Options listed with C++ comments are in gnu find, but not our find */ @@ -190,7 +194,7 @@ lookup_option(const char *name) sizeof(options)/sizeof(OPTION), sizeof(OPTION), typecompare)); } -int +static int typecompare(const void *a, const void *b) { return (strcmp(((const OPTION *)a)->name, ((const OPTION *)b)->name));