From owner-svn-src-all@FreeBSD.ORG  Tue Jul 20 17:42:13 2010
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 746EB106567B;
	Tue, 20 Jul 2010 17:42:13 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6365E8FC21;
	Tue, 20 Jul 2010 17:42:13 +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 o6KHgDTR063253;
	Tue, 20 Jul 2010 17:42:13 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6KHgDa2063251;
	Tue, 20 Jul 2010 17:42:13 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201007201742.o6KHgDa2063251@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 20 Jul 2010 17:42:13 +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: r210300 - head/usr.sbin/watchdogd
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: Tue, 20 Jul 2010 17:42:13 -0000

Author: delphij
Date: Tue Jul 20 17:42:13 2010
New Revision: 210300
URL: http://svn.freebsd.org/changeset/base/210300

Log:
  Staticify local variables.
  
  While I'm there also add a 'static' keyword for a function to make it
  consistent with prototype.
  
  Reviewed by:	phk
  MFC after:	3 months

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

Modified: head/usr.sbin/watchdogd/watchdogd.c
==============================================================================
--- head/usr.sbin/watchdogd/watchdogd.c	Tue Jul 20 17:16:57 2010	(r210299)
+++ head/usr.sbin/watchdogd/watchdogd.c	Tue Jul 20 17:42:13 2010	(r210300)
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 2003-2004  Sean M. Kelly <smkelly@FreeBSD.org>
  * All rights reserved.
  *
@@ -58,17 +58,15 @@ static int	watchdog_onoff(int onoff);
 static int	watchdog_patpat(u_int timeout);
 static void	usage(void);
 
-int debugging = 0;
-int end_program = 0;
-const char *pidfile = _PATH_VARRUN "watchdogd.pid";
-int reset_mib[3];
-size_t reset_miblen = 3;
-u_int timeout = WD_TO_16SEC;
-u_int passive = 0;
-int is_daemon = 0;
-int fd = -1;
-int nap = 1;
-char *test_cmd = NULL;
+static int debugging = 0;
+static int end_program = 0;
+static const char *pidfile = _PATH_VARRUN "watchdogd.pid";
+static u_int timeout = WD_TO_16SEC;
+static u_int passive = 0;
+static int is_daemon = 0;
+static int fd = -1;
+static int nap = 1;
+static char *test_cmd = NULL;
 
 /*
  * Periodically pat the watchdog, preventing it from firing.
@@ -195,7 +193,7 @@ watchdog_loop(void)
  * Reset the watchdog timer. This function must be called periodically
  * to keep the watchdog from firing.
  */
-int
+static int
 watchdog_patpat(u_int t)
 {