diff options
author | Daniel Stenberg <daniel@haxx.se> | 2022-10-13 14:59:34 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2022-10-13 23:42:07 +0200 |
commit | 57e2bb52aaa7d16adef6d3d1c4b75c242148a85e (patch) | |
tree | f94c0dbceecc1f87796fffd0869089b529af8942 | |
parent | c4715b1c92fe12bb2bb77655bff12aa27a25c78b (diff) | |
download | curl-57e2bb52aaa7d16adef6d3d1c4b75c242148a85e.tar.gz |
netrc: remove the two 'changed' arguments
As no user of these functions used the returned content.
-rw-r--r-- | lib/netrc.c | 21 | ||||
-rw-r--r-- | lib/netrc.h | 8 | ||||
-rw-r--r-- | lib/url.c | 3 | ||||
-rw-r--r-- | tests/unit/unit1304.c | 35 |
4 files changed, 15 insertions, 52 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. @@ -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", diff --git a/tests/unit/unit1304.c b/tests/unit/unit1304.c index 090e8adee..3fab94b85 100644 --- a/tests/unit/unit1304.c +++ b/tests/unit/unit1304.c @@ -49,8 +49,6 @@ static void unit_stop(void) UNITTEST_START int result; - bool login_changed; - bool password_changed; static const char * const filename1 = "log/netrc1304"; memcpy(filename, filename1, strlen(filename1)); @@ -59,7 +57,7 @@ UNITTEST_START * Test a non existent host in our netrc file. */ result = Curl_parsenetrc("test.example.com", &login, &password, - &login_changed, &password_changed, filename); + filename); fail_unless(result == 1, "Host not found should return 1"); abort_unless(password != NULL, "returned NULL!"); fail_unless(password[0] == 0, "password should not have been changed"); @@ -73,15 +71,13 @@ UNITTEST_START login = strdup("me"); abort_unless(login != NULL, "returned NULL!"); result = Curl_parsenetrc("example.com", &login, &password, - &login_changed, &password_changed, filename); + filename); fail_unless(result == 0, "Host should have been found"); abort_unless(password != NULL, "returned NULL!"); fail_unless(password[0] == 0, "password should not have been changed"); - fail_unless(!password_changed, "password should not have been changed"); abort_unless(login != NULL, "returned NULL!"); fail_unless(strncmp(login, "me", 2) == 0, "login should not have been changed"); - fail_unless(!login_changed, "login should not have been changed"); /* * Test a non existent login and host in our netrc file. @@ -90,7 +86,7 @@ UNITTEST_START login = strdup("me"); abort_unless(login != NULL, "returned NULL!"); result = Curl_parsenetrc("test.example.com", &login, &password, - &login_changed, &password_changed, filename); + filename); fail_unless(result == 1, "Host not found should return 1"); abort_unless(password != NULL, "returned NULL!"); fail_unless(password[0] == 0, "password should not have been changed"); @@ -106,15 +102,13 @@ UNITTEST_START login = strdup("admi"); abort_unless(login != NULL, "returned NULL!"); result = Curl_parsenetrc("example.com", &login, &password, - &login_changed, &password_changed, filename); + filename); fail_unless(result == 0, "Host should have been found"); abort_unless(password != NULL, "returned NULL!"); fail_unless(password[0] == 0, "password should not have been changed"); - fail_unless(!password_changed, "password should not have been changed"); abort_unless(login != NULL, "returned NULL!"); fail_unless(strncmp(login, "admi", 4) == 0, "login should not have been changed"); - fail_unless(!login_changed, "login should not have been changed"); /* * Test a non existent login (superstring of an existing one) @@ -124,15 +118,13 @@ UNITTEST_START login = strdup("adminn"); abort_unless(login != NULL, "returned NULL!"); result = Curl_parsenetrc("example.com", &login, &password, - &login_changed, &password_changed, filename); + filename); fail_unless(result == 0, "Host should have been found"); abort_unless(password != NULL, "returned NULL!"); fail_unless(password[0] == 0, "password should not have been changed"); - fail_unless(!password_changed, "password should not have been changed"); abort_unless(login != NULL, "returned NULL!"); fail_unless(strncmp(login, "adminn", 6) == 0, "login should not have been changed"); - fail_unless(!login_changed, "login should not have been changed"); /* * Test for the first existing host in our netrc file @@ -142,15 +134,13 @@ UNITTEST_START login = strdup(""); abort_unless(login != NULL, "returned NULL!"); result = Curl_parsenetrc("example.com", &login, &password, - &login_changed, &password_changed, filename); + filename); fail_unless(result == 0, "Host should have been found"); abort_unless(password != NULL, "returned NULL!"); fail_unless(strncmp(password, "passwd", 6) == 0, "password should be 'passwd'"); - fail_unless(password_changed, "password should have been changed"); abort_unless(login != NULL, "returned NULL!"); fail_unless(strncmp(login, "admin", 5) == 0, "login should be 'admin'"); - fail_unless(login_changed, "login should have been changed"); /* * Test for the first existing host in our netrc file @@ -159,16 +149,13 @@ UNITTEST_START free(password); password = strdup(""); abort_unless(password != NULL, "returned NULL!"); - result = Curl_parsenetrc("example.com", &login, &password, - &login_changed, &password_changed, filename); + result = Curl_parsenetrc("example.com", &login, &password, filename); fail_unless(result == 0, "Host should have been found"); abort_unless(password != NULL, "returned NULL!"); fail_unless(strncmp(password, "passwd", 6) == 0, "password should be 'passwd'"); - fail_unless(password_changed, "password should have been changed"); abort_unless(login != NULL, "returned NULL!"); fail_unless(strncmp(login, "admin", 5) == 0, "login should be 'admin'"); - fail_unless(!login_changed, "login should not have been changed"); /* * Test for the second existing host in our netrc file @@ -181,15 +168,13 @@ UNITTEST_START login = strdup(""); abort_unless(login != NULL, "returned NULL!"); result = Curl_parsenetrc("curl.example.com", &login, &password, - &login_changed, &password_changed, filename); + filename); fail_unless(result == 0, "Host should have been found"); abort_unless(password != NULL, "returned NULL!"); fail_unless(strncmp(password, "none", 4) == 0, "password should be 'none'"); - fail_unless(password_changed, "password should have been changed"); abort_unless(login != NULL, "returned NULL!"); fail_unless(strncmp(login, "none", 4) == 0, "login should be 'none'"); - fail_unless(login_changed, "login should have been changed"); /* * Test for the second existing host in our netrc file @@ -199,14 +184,12 @@ UNITTEST_START password = strdup(""); abort_unless(password != NULL, "returned NULL!"); result = Curl_parsenetrc("curl.example.com", &login, &password, - &login_changed, &password_changed, filename); + filename); fail_unless(result == 0, "Host should have been found"); abort_unless(password != NULL, "returned NULL!"); fail_unless(strncmp(password, "none", 4) == 0, "password should be 'none'"); - fail_unless(password_changed, "password should have been changed"); abort_unless(login != NULL, "returned NULL!"); fail_unless(strncmp(login, "none", 4) == 0, "login should be 'none'"); - fail_unless(!login_changed, "login should not have been changed"); UNITTEST_STOP |