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 <arpa/ftp.h> 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 <arpa/ftp.h> 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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
