url.c: Fixed compilation warning

An enumerated type is mixed with another type
This commit is contained in:
Steve Holme
2013-09-01 13:30:12 +01:00
parent af4bddf20b
commit 322f0bc2f1

View File

@@ -4795,9 +4795,9 @@ static CURLcode parse_remote_port(struct SessionHandle *data,
* Override the login details from the URL with that in the CURLOPT_USERPWD * Override the login details from the URL with that in the CURLOPT_USERPWD
* option or a .netrc file, if applicable. * option or a .netrc file, if applicable.
*/ */
static int override_login(struct SessionHandle *data, static CURLcode override_login(struct SessionHandle *data,
struct connectdata *conn, struct connectdata *conn,
char **userp, char **passwdp, char **optionsp) char **userp, char **passwdp, char **optionsp)
{ {
if(data->set.str[STRING_USERNAME]) { if(data->set.str[STRING_USERNAME]) {
free(*userp); free(*userp);
@@ -4838,6 +4838,7 @@ static int override_login(struct SessionHandle *data,
conn->bits.user_passwd = TRUE; /* enable user+password */ conn->bits.user_passwd = TRUE; /* enable user+password */
} }
} }
return CURLE_OK; return CURLE_OK;
} }