From owner-svn-src-all@FreeBSD.ORG  Sat Mar  2 16:38:59 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id A7FA5452;
 Sat,  2 Mar 2013 16:38:59 +0000 (UTC)
 (envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8005E6EA;
 Sat,  2 Mar 2013 16:38:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r22Gcxba058042;
 Sat, 2 Mar 2013 16:38:59 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r22GcxVI058039;
 Sat, 2 Mar 2013 16:38:59 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201303021638.r22GcxVI058039@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 2 Mar 2013 16:38:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r247638 - stable/9/libexec/tftpd
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Sat, 02 Mar 2013 16:38:59 -0000

Author: marius
Date: Sat Mar  2 16:38:58 2013
New Revision: 247638
URL: http://svnweb.freebsd.org/changeset/base/247638

Log:
  MFC: r241720 (partial)
  
  Fix warnings found by -Wmising-variable-declarations.

Modified:
  stable/9/libexec/tftpd/tftp-io.c
  stable/9/libexec/tftpd/tftp-utils.c
  stable/9/libexec/tftpd/tftpd.c
Directory Properties:
  stable/9/libexec/tftpd/   (props changed)

Modified: stable/9/libexec/tftpd/tftp-io.c
==============================================================================
--- stable/9/libexec/tftpd/tftp-io.c	Sat Mar  2 16:33:43 2013	(r247637)
+++ stable/9/libexec/tftpd/tftp-io.c	Sat Mar  2 16:38:58 2013	(r247638)
@@ -53,7 +53,7 @@ struct sockaddr_storage me_sock;
 
 static int send_packet(int peer, uint16_t block, char *pkt, int size);
 
-struct errmsg {
+static struct errmsg {
 	int	e_code;
 	const char	*e_msg;
 } errmsgs[] = {
@@ -374,7 +374,7 @@ send_data(int peer, uint16_t block, char
 /*
  * Receive a packet
  */
-jmp_buf	timeoutbuf;
+static jmp_buf timeoutbuf;
 
 static void
 timeout(int sig __unused)

Modified: stable/9/libexec/tftpd/tftp-utils.c
==============================================================================
--- stable/9/libexec/tftpd/tftp-utils.c	Sat Mar  2 16:33:43 2013	(r247637)
+++ stable/9/libexec/tftpd/tftp-utils.c	Sat Mar  2 16:38:58 2013	(r247638)
@@ -121,7 +121,7 @@ get_field(int peer, char *buffer, ssize_
 /*
  * Logging functions
  */
-int	_tftp_logtostdout = 1;
+static int _tftp_logtostdout = 1;
 
 void
 tftp_openlog(const char *ident, int logopt, int facility)

Modified: stable/9/libexec/tftpd/tftpd.c
==============================================================================
--- stable/9/libexec/tftpd/tftpd.c	Sat Mar  2 16:33:43 2013	(r247637)
+++ stable/9/libexec/tftpd/tftpd.c	Sat Mar  2 16:38:58 2013	(r247638)
@@ -107,9 +107,9 @@ static void	tftp_xmitfile(int peer, cons
 static int	validate_access(int peer, char **, int);
 static char	peername[NI_MAXHOST];
 
-FILE *file;
+static FILE *file;
 
-struct formats {
+static struct formats {
 	const char	*f_mode;
 	int	f_convert;
 } formats[] = {