diff options
| author | Herb Lewis <herb@samba.org> | 2005-04-06 16:28:04 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:56:30 -0500 |
| commit | 978ca8486031e43754a3c23757f361bf3a85f335 (patch) | |
| tree | 109bd3ff560afcbd74296990d9554859cb2fb78f /source3/libsmb | |
| parent | 60dd0d0f9c277eb9852924aea81fee06b7395832 (diff) | |
| download | samba-978ca8486031e43754a3c23757f361bf3a85f335.tar.gz samba-978ca8486031e43754a3c23757f361bf3a85f335.tar.bz2 samba-978ca8486031e43754a3c23757f361bf3a85f335.zip | |
r6225: get rid of warnings from my compiler about nested externs
(This used to be commit efea76ac71412f8622cd233912309e91b9ea52da)
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/cliconnect.c | 3 | ||||
| -rw-r--r-- | source3/libsmb/clientgen.c | 3 | ||||
| -rw-r--r-- | source3/libsmb/clilist.c | 4 | ||||
| -rw-r--r-- | source3/libsmb/nmblib.c | 5 |
4 files changed, 8 insertions, 7 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index 4208d6378d..5a9992d4e0 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -23,6 +23,7 @@ #include "includes.h" +extern pstring user_socket_options; static const struct { int prot; @@ -1200,7 +1201,6 @@ BOOL cli_session_request(struct cli_state *cli, { char *p; int len = 4; - extern pstring user_socket_options; memcpy(&(cli->calling), calling, sizeof(*calling)); memcpy(&(cli->called ), called , sizeof(*called )); @@ -1290,7 +1290,6 @@ BOOL cli_session_request(struct cli_state *cli, BOOL cli_connect(struct cli_state *cli, const char *host, struct in_addr *ip) { - extern pstring user_socket_options; int name_type = 0x20; char *p; diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index b7bc780a1a..e787650c2f 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -22,6 +22,8 @@ #include "includes.h" +extern int smb_read_error; + /**************************************************************************** Change the timeout (in milliseconds). ****************************************************************************/ @@ -81,7 +83,6 @@ static BOOL client_receive_smb(int fd,char *buffer, unsigned int timeout) BOOL cli_receive_smb(struct cli_state *cli) { - extern int smb_read_error; BOOL ret; /* fd == -1 causes segfaults -- Tom (tom@ninja.nl) */ diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c index 0f1b9efed0..79c2ef66a1 100644 --- a/source3/libsmb/clilist.c +++ b/source3/libsmb/clilist.c @@ -22,6 +22,8 @@ #include "includes.h" +extern file_info def_finfo; + /**************************************************************************** Interpret a long filename structure - this is mostly guesses at the moment. The length of the structure is returned @@ -32,7 +34,6 @@ static size_t interpret_long_filename(struct cli_state *cli, int level,char *p,file_info *finfo) { - extern file_info def_finfo; file_info finfo2; int len; char *base = p; @@ -332,7 +333,6 @@ int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute, static int interpret_short_filename(struct cli_state *cli, char *p,file_info *finfo) { - extern file_info def_finfo; *finfo = def_finfo; diff --git a/source3/libsmb/nmblib.c b/source3/libsmb/nmblib.c index 1c93f7b1e2..164f85be7b 100644 --- a/source3/libsmb/nmblib.c +++ b/source3/libsmb/nmblib.c @@ -21,6 +21,9 @@ #include "includes.h" +extern struct in_addr lastip; +extern int lastport; + int num_good_sends = 0; int num_good_receives = 0; @@ -692,8 +695,6 @@ void free_packet(struct packet_struct *packet) struct packet_struct *parse_packet(char *buf,int length, enum packet_type packet_type) { - extern struct in_addr lastip; - extern int lastport; struct packet_struct *p; BOOL ok=False; |