From 322f0bc2f1af4a985e85ee5c8639e3b454314ccd Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Sun, 1 Sep 2013 13:30:12 +0100 Subject: url.c: Fixed compilation warning An enumerated type is mixed with another type --- lib/url.c | 7 ++++--- 1 file 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; } -- cgit v1.2.3