summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2022-10-13 14:59:34 +0200
committerDaniel Stenberg <daniel@haxx.se>2022-10-13 23:42:07 +0200
commit57e2bb52aaa7d16adef6d3d1c4b75c242148a85e (patch)
treef94c0dbceecc1f87796fffd0869089b529af8942 /lib
parentc4715b1c92fe12bb2bb77655bff12aa27a25c78b (diff)
downloadcurl-57e2bb52aaa7d16adef6d3d1c4b75c242148a85e.tar.gz
netrc: remove the two 'changed' arguments
As no user of these functions used the returned content.
Diffstat (limited to 'lib')
-rw-r--r--lib/netrc.c21
-rw-r--r--lib/netrc.h8
-rw-r--r--lib/url.c3
3 files changed, 6 insertions, 26 deletions
diff --git a/lib/netrc.c b/lib/netrc.c
index f09c75842..d620d6bb5 100644
--- a/lib/netrc.c
+++ b/lib/netrc.c
@@ -58,8 +58,6 @@ enum host_lookup_state {
static int parsenetrc(const char *host,
char **loginp,
char **passwordp,
- bool *login_changed,
- bool *password_changed,
char *netrcfile)
{
FILE *file;
@@ -248,19 +246,15 @@ static int parsenetrc(const char *host,
out:
if(!retcode) {
/* success */
- *login_changed = FALSE;
- *password_changed = FALSE;
if(login_alloc) {
if(*loginp)
free(*loginp);
*loginp = login;
- *login_changed = TRUE;
}
if(password_alloc) {
if(*passwordp)
free(*passwordp);
*passwordp = password;
- *password_changed = TRUE;
}
}
else {
@@ -281,11 +275,7 @@ static int parsenetrc(const char *host,
* *loginp and *passwordp MUST be allocated if they aren't NULL when passed
* in.
*/
-int Curl_parsenetrc(const char *host,
- char **loginp,
- char **passwordp,
- bool *login_changed,
- bool *password_changed,
+int Curl_parsenetrc(const char *host, char **loginp, char **passwordp,
char *netrcfile)
{
int retcode = 1;
@@ -334,8 +324,7 @@ int Curl_parsenetrc(const char *host,
free(homea);
return -1;
}
- retcode = parsenetrc(host, loginp, passwordp, login_changed,
- password_changed, filealloc);
+ retcode = parsenetrc(host, loginp, passwordp, filealloc);
free(filealloc);
#ifdef WIN32
if(retcode == NETRC_FILE_MISSING) {
@@ -345,16 +334,14 @@ int Curl_parsenetrc(const char *host,
free(homea);
return -1;
}
- retcode = parsenetrc(host, loginp, passwordp, login_changed,
- password_changed, filealloc);
+ retcode = parsenetrc(host, loginp, passwordp, filealloc);
free(filealloc);
}
#endif
free(homea);
}
else
- retcode = parsenetrc(host, loginp, passwordp, login_changed,
- password_changed, netrcfile);
+ retcode = parsenetrc(host, loginp, passwordp, netrcfile);
return retcode;
}
diff --git a/lib/netrc.h b/lib/netrc.h
index 53e315b61..53d005672 100644
--- a/lib/netrc.h
+++ b/lib/netrc.h
@@ -28,12 +28,8 @@
#ifndef CURL_DISABLE_NETRC
/* returns -1 on failure, 0 if the host is found, 1 is the host isn't found */
-int Curl_parsenetrc(const char *host,
- char **loginp,
- char **passwordp,
- bool *login_changed,
- bool *password_changed,
- char *filename);
+int Curl_parsenetrc(const char *host, char **loginp,
+ char **passwordp, char *filename);
/* Assume: (*passwordp)[0]=0, host[0] != 0.
* If (*loginp)[0] = 0, search for login and password within a machine
* section in the netrc.
diff --git a/lib/url.c b/lib/url.c
index 3df92beea..5ace2fdd8 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -2996,8 +2996,6 @@ static CURLcode override_login(struct Curl_easy *data,
char **userp = &conn->user;
char **passwdp = &conn->passwd;
char **optionsp = &conn->options;
- bool netrc_user_changed = FALSE;
- bool netrc_passwd_changed = FALSE;
if(data->set.str[STRING_OPTIONS]) {
free(*optionsp);
@@ -3024,7 +3022,6 @@ static CURLcode override_login(struct Curl_easy *data,
ret = Curl_parsenetrc(conn->host.name,
userp, passwdp,
- &netrc_user_changed, &netrc_passwd_changed,
data->set.str[STRING_NETRC_FILE]);
if(ret > 0) {
infof(data, "Couldn't find host %s in the %s file; using defaults",