From owner-svn-src-all@FreeBSD.ORG Sat Nov 6 15:04:56 2010 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 D3AE51065728; Sat, 6 Nov 2010 15:04:56 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B679E8FC0A; Sat, 6 Nov 2010 15:04:56 +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 oA6F4ufY034951; Sat, 6 Nov 2010 15:04:56 GMT (envelope-from uqs@svn.freebsd.org) Received: (from uqs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oA6F4uEN034949; Sat, 6 Nov 2010 15:04:56 GMT (envelope-from uqs@svn.freebsd.org) Message-Id: <201011061504.oA6F4uEN034949@svn.freebsd.org> From: Ulrich Spoerlein Date: Sat, 6 Nov 2010 15:04:56 +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: r214886 - head/usr.bin/setchannel 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: Sat, 06 Nov 2010 15:04:56 -0000 Author: uqs Date: Sat Nov 6 15:04:56 2010 New Revision: 214886 URL: http://svn.freebsd.org/changeset/base/214886 Log: Apply style(9) and unbreak build. This went unnoticed during the WARNS bump, as this tool is not connected to the build. Modified: head/usr.bin/setchannel/setchannel.c Modified: head/usr.bin/setchannel/setchannel.c ============================================================================== --- head/usr.bin/setchannel/setchannel.c Sat Nov 6 15:04:48 2010 (r214885) +++ head/usr.bin/setchannel/setchannel.c Sat Nov 6 15:04:56 2010 (r214886) @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 2003, 2004, 2005 * John Wehle . All rights reserved. * @@ -28,40 +28,34 @@ /* Set the channel of the tuner card. */ -#include -#include +#include +#include + #include #include #include +#include +#include #include -#include -#include -#include #include -#if __FreeBSD_version < 503001 -# include -# include -#else -# include -# include -#endif - +#include +#include static void -usage() +usage(void) { printf ("Usage: setchannel [-a {on|off}] [-c | -r | -s | -t] " "[-g geom] [-m chnl_set] [chnl | freq]\n" " -a Enable / disable AFC.\n" " -c Select composite input.\n" - " -d Select tuner unit number.\n" - " -r Select radio input.\n" + " -d Select tuner unit number.\n" + " -r Select radio input.\n" " -s Select svideo input.\n" - " -t Select tuner.\n" + " -t Select tuner.\n" " -g Select geometry.\n" - " 352x240 or 352x288 = VCD\n" + " 352x240 or 352x288 = VCD\n" " 480x480 or 480x576 = SVCD\n" " 352x480 or 352x576 = DVD (half D1)\n" " 720x480 or 720x576 = DVD (full D1)\n" @@ -74,7 +68,7 @@ usage() " %u = Japan Cable / NTSC\n" " %u = Australia / PAL\n" " %u = France / SECAM\n" - " chnl Channel\n" + " chnl Channel\n" " freq Frequency in MHz (must include decimal point).\n", CHNLSET_NABCST, CHNLSET_CABLEIRC, CHNLSET_WEUROPE, CHNLSET_JPNBCST, CHNLSET_JPNCABLE, CHNLSET_AUSTRALIA, CHNLSET_FRANCE); @@ -94,7 +88,7 @@ main(int argc, char *argv[]) int channel_set; int i; int status; - int unit; + int unit; int tfd; unsigned int channel; unsigned int fraction; @@ -111,7 +105,7 @@ main(int argc, char *argv[]) device = 0; freq = 0; status = 0; - unit = 0; + unit = 0; x_size = 0; y_size = 0; @@ -214,11 +208,11 @@ main(int argc, char *argv[]) exit(1); } - sprintf(dev_name, DEVNAME_BASE "%d", unit); - tfd = open(dev_name, O_RDONLY); + sprintf(dev_name, DEVNAME_BASE "%d", unit); + tfd = open(dev_name, O_RDONLY); if (tfd < 0) { fprintf(stderr, "Can't open %s: %s (%d)\n", dev_name, - strerror(errno), errno); + strerror(errno), errno); exit(1); }