aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2013-09-01 13:30:12 +0100
committerSteve Holme <steve_holme@hotmail.com>2013-09-01 13:30:12 +0100
commit322f0bc2f1af4a985e85ee5c8639e3b454314ccd (patch)
tree8949e5cc2bf099738cb801e8c4f649ef3648281f /lib
parentaf4bddf20b5d99cce55367ec63f793e1ce262e3d (diff)
url.c: Fixed compilation warning
An enumerated type is mixed with another type
Diffstat (limited to 'lib')
-rw-r--r--lib/url.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/url.c b/lib/url.c
index 2f72bc146..0ec0a96b9 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -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
* option or a .netrc file, if applicable.
*/
-static int override_login(struct SessionHandle *data,
- struct connectdata *conn,
- char **userp, char **passwdp, char **optionsp)
+static CURLcode override_login(struct SessionHandle *data,
+ struct connectdata *conn,
+ char **userp, char **passwdp, char **optionsp)
{
if(data->set.str[STRING_USERNAME]) {
free(*userp);
@@ -4838,6 +4838,7 @@ static int override_login(struct SessionHandle *data,
conn->bits.user_passwd = TRUE; /* enable user+password */
}
}
+
return CURLE_OK;
}