Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-20 07:36:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix double definition of a variable, add extern.

Browse source 
svn path=/trunk/; revision=43571
This commit is contained in:
Dmitry Gorbachev 2009-10-18 18:52:15 +00:00
parent 9698fa5426
commit 417b31c079
3 changed files with 31 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

7
reactos/base/applications/network/ftp/ftp.c
View file

@ -1136,13 +1136,6 @@ null();// (void) signal(SIGINT,oldintr);
null();// (void) signal(SIGINT,oldintr); null();// (void) signal(SIGINT,oldintr);
} }
/*
* Need to start a listen on the data channel
* before we send the command, otherwise the
* server's connect may fail.
*/
int sendport = -1;
int int
initconn() initconn()
{ {

6
reactos/base/applications/network/ftp/ftp_var.h
View file

@ -150,9 +150,9 @@ struct macel {
char *mac_end; /* end of macro in macbuf */ char *mac_end; /* end of macro in macbuf */
}; };
int macnum; /* number of defined macros */ extern int macnum; /* number of defined macros */
struct macel macros[16]; extern struct macel macros[16];
char macbuf[4096]; extern char macbuf[4096];
#if defined(__ANSI__) || defined(sparc) #if defined(__ANSI__) || defined(sparc)
typedef void sig_t; typedef void sig_t;

13
reactos/base/applications/network/ftp/main.c
View file

@ -72,7 +72,7 @@ int autologin;
*/ */
int trace; /* trace packets exchanged */ int trace; /* trace packets exchanged */
int hash; /* print # for each buffer transferred */ int hash; /* print # for each buffer transferred */
int sendport; /* use PORT cmd for each data connection */ //int sendport; /* use PORT cmd for each data connection */
int verbose; /* print messages coming back from server */ int verbose; /* print messages coming back from server */
int connected; /* connected to server */ int connected; /* connected to server */
int fromatty; /* input is from a terminal */ int fromatty; /* input is from a terminal */
@ -121,6 +121,17 @@ int mflag; /* flag: if != 0, then active multi command */
int options; /* used during socket creation */ int options; /* used during socket creation */
int macnum; /* number of defined macros */
struct macel macros[16];
char macbuf[4096];
/*
* Need to start a listen on the data channel
* before we send the command, otherwise the
* server's connect may fail.
*/
int sendport = -1;
static const char *slurpstring(); static const char *slurpstring();