diff options
Diffstat (limited to 'source3/client')
| -rw-r--r-- | source3/client/client.c | 20 | ||||
| -rw-r--r-- | source3/client/clitar.c | 6 |
2 files changed, 18 insertions, 8 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index d5dece1626..0d1fe6721c 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -47,6 +47,9 @@ extern BOOL doencrypt; extern pstring user_socket_options; +static int process_tok(fstring tok); +static void cmd_help(char *dum_in, char *dum_out); + /* 30 second timeout on most commands */ #define CLIENT_TIMEOUT (30*1000) #define SHORT_TIMEOUT (5*1000) @@ -134,7 +137,7 @@ extern int Client; /**************************************************************************** send an SMBclose on an SMB file handle ****************************************************************************/ -void cli_smb_close(char *inbuf, char *outbuf, int clnt_fd, int c_num, int f_num) +static void cli_smb_close(char *inbuf, char *outbuf, int clnt_fd, int c_num, int f_num) { bzero(outbuf,smb_size); set_message(outbuf,3,0,True); @@ -149,6 +152,7 @@ void cli_smb_close(char *inbuf, char *outbuf, int clnt_fd, int c_num, int f_num) client_receive_smb(clnt_fd,inbuf,CLIENT_TIMEOUT); } + /**************************************************************************** write to a local file with CR/LF->LF translation if appropriate. return the number taken from the buffer. This may not equal the number written. @@ -472,7 +476,7 @@ static void display_finfo(file_info *finfo) DEBUG(0,(" %-30s%7.7s%10d %s", CNV_LANG(finfo->name), attrib_string(finfo->mode), - finfo->size, + (int)finfo->size, asctime(LocalTime(&t)))); #endif /* LARGE_SMB_OFF_T */ dir_total += finfo->size; @@ -1206,7 +1210,7 @@ static void do_get(char *rname,char *lname,file_info *finfo1) #else /* LARGE_SMB_OFF_T */ DEBUG(2,("getting file %s of size %d bytes as %s ", CNV_LANG(finfo.name), - finfo.size, + (int)finfo.size, lname)); #endif /* LARGE_SMB_OFF_T */ @@ -1220,7 +1224,8 @@ static void do_get(char *rname,char *lname,file_info *finfo1) #ifdef LARGE_SMB_OFF_T DEBUG(3,("nread=%d max_xmit=%d fsize=%.0f\n",nread,max_xmit,(double)finfo.size)); #else /* LARGE_SMB_OFF_T */ - DEBUG(3,("nread=%d max_xmit=%d fsize=%d\n",nread,max_xmit,finfo.size)); + DEBUG(3,("nread=%d max_xmit=%d fsize=%d\n",nread,max_xmit, + (int)finfo.size)); #endif /* LARGE_SMB_OFF_T */ /* 3 possible read types. readbraw if a large block is required. @@ -1902,7 +1907,8 @@ static void do_put(char *rname,char *lname,file_info *finfo) #ifdef LARGE_SMB_OFF_T DEBUG(1,("putting file %s of size %.0f bytes as %s ",lname,(double)finfo->size,CNV_LANG(rname))); #else /* LARGE_SMB_OFF_T */ - DEBUG(1,("putting file %s of size %d bytes as %s ",lname,finfo->size,CNV_LANG(rname))); + DEBUG(1,("putting file %s of size %d bytes as %s ",lname, + (int)finfo->size,CNV_LANG(rname))); #endif /* LARGE_SMB_OFF_T */ if (!maxwrite) @@ -3318,7 +3324,7 @@ static int process_tok(fstring tok) /**************************************************************************** help ****************************************************************************/ -void cmd_help(char *dum_in, char *dum_out) +static void cmd_help(char *dum_in, char *dum_out) { int i=0,j; fstring buf; @@ -3339,6 +3345,8 @@ void cmd_help(char *dum_in, char *dum_out) } } + + /**************************************************************************** wait for keyboard activity, swallowing network packets ****************************************************************************/ diff --git a/source3/client/clitar.c b/source3/client/clitar.c index 502a867f60..376d3aeac6 100644 --- a/source3/client/clitar.c +++ b/source3/client/clitar.c @@ -39,6 +39,8 @@ #include "includes.h" #include "clitar.h" +static int clipfind(char **aret, int ret, char *tok); + typedef struct file_info_struct file_info2; struct file_info_struct @@ -973,7 +975,7 @@ static BOOL ensurepath(char *fname, char *inbuf, char *outbuf) return True; } -int padit(char *buf, int bufsize, int padsize) +static int padit(char *buf, int bufsize, int padsize) { int berr= 0; int bytestowrite; @@ -2294,7 +2296,7 @@ int process_tar(char *inbuf, char *outbuf) /**************************************************************************** Find a token (filename) in a clip list ***************************************************************************/ -int clipfind(char **aret, int ret, char *tok) +static int clipfind(char **aret, int ret, char *tok) { if (aret==NULL) return 0; |