generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gcc -Wshadow complaints fixed

Browse Source
This commit is contained in:
Daniel Stenberg 2003-10-18 20:14:33 +00:00
parent f0089b6291
commit 65dab79ca5
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/connect.h
View File

@ -23,7 +23,7 @@
* $Id$ * $Id$
***************************************************************************/ ***************************************************************************/
int Curl_nonblock(int socket, /* operate on this */ int Curl_nonblock(int sockfd, /* operate on this */
int nonblock /* TRUE or FALSE */); int nonblock /* TRUE or FALSE */);
CURLcode Curl_is_connected(struct connectdata *conn, CURLcode Curl_is_connected(struct connectdata *conn,

5
lib/ftp.c
View File

@ -319,7 +319,6 @@ CURLcode Curl_GetFTPResponse(ssize_t *nreadp, /* return number of bytes read */
if(*ptr=='\n') { if(*ptr=='\n') {
/* a newline is CRLF in ftp-talk, so the CR is ignored as /* a newline is CRLF in ftp-talk, so the CR is ignored as
the line isn't really terminated until the LF comes */ the line isn't really terminated until the LF comes */
CURLcode result;
/* output debug output if that is requested */ /* output debug output if that is requested */
if(data->set.verbose) if(data->set.verbose)
@ -1908,9 +1907,9 @@ CURLcode Curl_ftp_nextconnect(struct connectdata *conn)
char *bytes; char *bytes;
bytes=strstr(buf, " bytes"); bytes=strstr(buf, " bytes");
if(bytes--) { if(bytes--) {
int index=bytes-buf; int in=bytes-buf;
/* this is a hint there is size information in there! ;-) */ /* this is a hint there is size information in there! ;-) */
while(--index) { while(--in) {
/* scan for the parenthesis and break there */ /* scan for the parenthesis and break there */
if('(' == *bytes) if('(' == *bytes)
break; break;

14
lib/url.c
View File

@ -157,10 +157,10 @@ static bool safe_strequal(char* str1, char* str2);
extern sigjmp_buf curl_jmpenv; extern sigjmp_buf curl_jmpenv;
#endif #endif
static static
RETSIGTYPE alarmfunc(int signal) RETSIGTYPE alarmfunc(int sig)
{ {
/* this is for "-ansi -Wall -pedantic" to stop complaining! (rabe) */ /* this is for "-ansi -Wall -pedantic" to stop complaining! (rabe) */
(void)signal; (void)sig;
#ifdef HAVE_SIGSETJMP #ifdef HAVE_SIGSETJMP
siglongjmp(curl_jmpenv, 1); siglongjmp(curl_jmpenv, 1);
#endif #endif
@ -2248,8 +2248,8 @@ static CURLcode CreateConnection(struct SessionHandle *data,
if(proxy && *proxy) { if(proxy && *proxy) {
/* we have a proxy here to set */ /* we have a proxy here to set */
char *ptr; char *ptr;
char user[MAX_CURL_USER_LENGTH]; char proxyuser[MAX_CURL_USER_LENGTH];
char passwd[MAX_CURL_PASSWORD_LENGTH]; char proxypasswd[MAX_CURL_PASSWORD_LENGTH];
/* skip the possible protocol piece */ /* skip the possible protocol piece */
ptr=strstr(proxy, "://"); ptr=strstr(proxy, "://");
@ -2262,16 +2262,16 @@ static CURLcode CreateConnection(struct SessionHandle *data,
ptr = strchr(ptr, '@'); ptr = strchr(ptr, '@');
if(ptr && (2 == sscanf(proxy, "%" MAX_CURL_USER_LENGTH_TXT"[^:]:" if(ptr && (2 == sscanf(proxy, "%" MAX_CURL_USER_LENGTH_TXT"[^:]:"
"%" MAX_CURL_PASSWORD_LENGTH_TXT "[^@]", "%" MAX_CURL_PASSWORD_LENGTH_TXT "[^@]",
user, passwd))) { proxyuser, proxypasswd))) {
/* found user and password, rip them out */ /* found user and password, rip them out */
Curl_safefree(conn->proxyuser); Curl_safefree(conn->proxyuser);
conn->proxyuser = strdup(user); conn->proxyuser = strdup(proxyuser);
if(!conn->proxyuser) if(!conn->proxyuser)
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
Curl_safefree(conn->proxypasswd); Curl_safefree(conn->proxypasswd);
conn->proxypasswd = strdup(passwd); conn->proxypasswd = strdup(proxypasswd);
if(!conn->proxypasswd) if(!conn->proxypasswd)
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;

12
lib/urldata.h
View File

@ -454,29 +454,29 @@ struct connectdata {
/* These two functions MUST be set by the curl_connect() function to be /* These two functions MUST be set by the curl_connect() function to be
be protocol dependent */ be protocol dependent */
CURLcode (*curl_do)(struct connectdata *connect); CURLcode (*curl_do)(struct connectdata *);
CURLcode (*curl_done)(struct connectdata *connect); CURLcode (*curl_done)(struct connectdata *);
/* If the curl_do() function is better made in two halves, this /* If the curl_do() function is better made in two halves, this
* curl_do_more() function will be called afterwards, if set. For example * curl_do_more() function will be called afterwards, if set. For example
* for doing the FTP stuff after the PASV/PORT command. * for doing the FTP stuff after the PASV/PORT command.
*/ */
CURLcode (*curl_do_more)(struct connectdata *connect); CURLcode (*curl_do_more)(struct connectdata *);
/* This function *MAY* be set to a protocol-dependent function that is run /* This function *MAY* be set to a protocol-dependent function that is run
* after the connect() and everything is done, as a step in the connection. * after the connect() and everything is done, as a step in the connection.
*/ */
CURLcode (*curl_connect)(struct connectdata *connect); CURLcode (*curl_connect)(struct connectdata *);
/* This function *MAY* be set to a protocol-dependent function that is run /* This function *MAY* be set to a protocol-dependent function that is run
* by the curl_disconnect(), as a step in the disconnection. * by the curl_disconnect(), as a step in the disconnection.
*/ */
CURLcode (*curl_disconnect)(struct connectdata *connect); CURLcode (*curl_disconnect)(struct connectdata *);
/* This function *MAY* be set to a protocol-dependent function that is run /* This function *MAY* be set to a protocol-dependent function that is run
* in the curl_close() function if protocol-specific cleanups are required. * in the curl_close() function if protocol-specific cleanups are required.
*/ */
CURLcode (*curl_close)(struct connectdata *connect); CURLcode (*curl_close)(struct connectdata *);
/**** curl_get() phase fields */ /**** curl_get() phase fields */