From owner-svn-src-head@FreeBSD.ORG Tue Apr 7 20:34:35 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 11C15106564A; Tue, 7 Apr 2009 20:34:35 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E95068FC15; Tue, 7 Apr 2009 20:34:34 +0000 (UTC) (envelope-from obrien@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 n37KYYNJ027076; Tue, 7 Apr 2009 20:34:34 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n37KYY6J027072; Tue, 7 Apr 2009 20:34:34 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <200904072034.n37KYY6J027072@svn.freebsd.org> From: "David E. O'Brien" Date: Tue, 7 Apr 2009 20:34:34 +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: r190828 - head/libexec/ftpd 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: Tue, 07 Apr 2009 20:34:35 -0000 Author: obrien Date: Tue Apr 7 20:34:34 2009 New Revision: 190828 URL: http://svn.freebsd.org/changeset/base/190828 Log: Move variable externs into extern.h so they are checked against the definitions. Modified: head/libexec/ftpd/extern.h head/libexec/ftpd/ftpcmd.y head/libexec/ftpd/ftpd.c Modified: head/libexec/ftpd/extern.h ============================================================================== --- head/libexec/ftpd/extern.h Tue Apr 7 20:15:51 2009 (r190827) +++ head/libexec/ftpd/extern.h Tue Apr 7 20:34:34 2009 (r190828) @@ -73,6 +73,35 @@ void yyerror(char *); int yyparse(void); int ls_main(int, char **); +extern int assumeutf8; +extern char cbuf[]; +extern union sockunion data_dest; +extern int epsvall; +extern int form; +extern int ftpdebug; +extern int guest; +extern union sockunion his_addr; +extern char *homedir; +extern int hostinfo; +extern char *hostname; +extern int maxtimeout; +extern int logged_in; +extern int logging; +extern int noepsv; +extern int noguestretr; +extern int noretr; +extern int paranoid; +extern struct passwd *pw; +extern int pdata; +extern char proctitle[]; +extern int readonly; +extern off_t restart_point; +extern int timeout; +extern char tmpline[]; +extern int type; +extern char *typenames[]; /* defined in included from ftpd.c */ +extern int usedefault; + struct sockaddr_in; struct sockaddr_in6; union sockunion { Modified: head/libexec/ftpd/ftpcmd.y ============================================================================== --- head/libexec/ftpd/ftpcmd.y Tue Apr 7 20:15:51 2009 (r190827) +++ head/libexec/ftpd/ftpcmd.y Tue Apr 7 20:34:34 2009 (r190828) @@ -76,31 +76,6 @@ __FBSDID("$FreeBSD$"); #include "extern.h" #include "pathnames.h" -extern union sockunion data_dest, his_addr; -extern int hostinfo; -extern int logged_in; -extern struct passwd *pw; -extern int guest; -extern char *homedir; -extern int paranoid; -extern int logging; -extern int type; -extern int form; -extern int ftpdebug; -extern int timeout; -extern int maxtimeout; -extern int pdata; -extern char *hostname; -extern char proctitle[]; -extern int usedefault; -extern char tmpline[]; -extern int readonly; -extern int assumeutf8; -extern int noepsv; -extern int noretr; -extern int noguestretr; -extern char *typenames[]; /* defined in included from ftpd.c */ - off_t restart_point; static int cmd_type; @@ -110,8 +85,6 @@ static int state; char cbuf[512]; char *fromname = NULL; -extern int epsvall; - %} %union { Modified: head/libexec/ftpd/ftpd.c ============================================================================== --- head/libexec/ftpd/ftpd.c Tue Apr 7 20:15:51 2009 (r190827) +++ head/libexec/ftpd/ftpd.c Tue Apr 7 20:34:34 2009 (r190828) @@ -105,9 +105,6 @@ __FBSDID("$FreeBSD$"); static char version[] = "Version 6.00LS"; #undef main -extern off_t restart_point; -extern char cbuf[]; - union sockunion ctrl_addr; union sockunion data_source; union sockunion data_dest;