From owner-svn-src-all@FreeBSD.ORG  Wed Jul  1 22:23:27 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 1CD77106566C;
	Wed,  1 Jul 2009 22:23:27 +0000 (UTC)
	(envelope-from stas@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E4DF48FC15;
	Wed,  1 Jul 2009 22:23:26 +0000 (UTC)
	(envelope-from stas@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n61MNQrZ025699;
	Wed, 1 Jul 2009 22:23:26 GMT (envelope-from stas@svn.freebsd.org)
Received: (from stas@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n61MNQO2025697;
	Wed, 1 Jul 2009 22:23:26 GMT (envelope-from stas@svn.freebsd.org)
Message-Id: <200907012223.n61MNQO2025697@svn.freebsd.org>
From: Stanislav Sedov <stas@FreeBSD.org>
Date: Wed, 1 Jul 2009 22:23:26 +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: r195264 - head/usr.sbin/wake
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Jul 2009 22:23:27 -0000

Author: stas
Date: Wed Jul  1 22:23:26 2009
New Revision: 195264
URL: http://svn.freebsd.org/changeset/base/195264

Log:
  - Properly order headers, local variables and prototypes. [1]
  - Remove unneeded headers.
  - Return non-zero error code in usage().
  
  Approved by:	re (kib)
  Suggested by:	bde [1]

Modified:
  head/usr.sbin/wake/wake.c

Modified: head/usr.sbin/wake/wake.c
==============================================================================
--- head/usr.sbin/wake/wake.c	Wed Jul  1 22:20:44 2009	(r195263)
+++ head/usr.sbin/wake/wake.c	Wed Jul  1 22:23:26 2009	(r195264)
@@ -27,28 +27,21 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sysexits.h>
-#include <unistd.h>
-
-#include <sys/param.h>
-#include <sys/queue.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <net/bpf.h>
 #include <net/if.h>
-
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
 #define	_PATH_BPF	"/dev/bpf"
 
 #ifndef SYNC_LEN
@@ -59,18 +52,18 @@ __FBSDID("$FreeBSD$");
 #define	DESTADDR_COUNT	16
 #endif
 
-static void	usage(void);
-static int	wake(const char *iface, const char *host);
 static int	bind_if_to_bpf(char const *ifname, int bpf);
 static int	get_ether(char const *text, struct ether_addr *addr);
 static int	send_wakeup(int bpf, struct ether_addr const *addr);
+static void	usage(void);
+static int	wake(const char *iface, const char *host);
 
 static void
 usage(void)
 {
 
 	(void)fprintf(stderr, "usage: wake interface lladdr...\n");
-	exit(0);
+	exit(1);
 }
 
 static int
@@ -144,10 +137,10 @@ send_wakeup(int bpf, struct ether_addr c
 		struct ether_header hdr;
 		u_char data[SYNC_LEN + ETHER_ADDR_LEN * DESTADDR_COUNT];
 	} __packed pkt;
+	u_char *p;
 	ssize_t bw;
 	ssize_t len;
 	int i;
-	u_char *p;
 
 	(void)memset(pkt.hdr.ether_dhost, 0xff, sizeof(pkt.hdr.ether_dhost));
 	pkt.hdr.ether_type = htons(0);