Message ID | 20231214180110.130991-1-prestwoj@gmail.com (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | [1/5] network: remove 'path' from settings_load_pt_ecc | expand |
Context | Check | Description |
---|---|---|
tedd_an/pre-ci_am | success | Success |
prestwoj/iwd-alpine-ci-fetch | success | Fetch PR |
prestwoj/iwd-ci-fetch | success | Fetch PR |
prestwoj/iwd-ci-gitlint | success | GitLint |
prestwoj/iwd-ci-makedistcheck | success | Make Distcheck |
prestwoj/iwd-alpine-ci-makedistcheck | success | Make Distcheck |
prestwoj/iwd-ci-build | success | Build - Configure |
prestwoj/iwd-alpine-ci-build | success | Build - Configure |
prestwoj/iwd-ci-makecheckvalgrind | success | Make Check w/Valgrind |
prestwoj/iwd-ci-makecheck | success | Make Check |
prestwoj/iwd-ci-clang | success | clang PASS |
prestwoj/iwd-alpine-ci-makecheckvalgrind | success | Make Check w/Valgrind |
prestwoj/iwd-alpine-ci-makecheck | success | Make Check |
prestwoj/iwd-ci-incremental_build | success | Incremental Build with patches |
prestwoj/iwd-alpine-ci-incremental_build | success | Incremental Build with patches |
prestwoj/iwd-ci-testrunner | fail | test-runner - FAIL: testDPP |
Hi James, On 12/14/23 12:01, James Prestwood wrote: > The path argument was used purely for debugging. It can be just as > informational printing just the SSID of the profile that failed to > parse the setting without requiring callers allocate a string to > call the function. > --- > src/network.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > Applied, thanks. Regards, -Denis
diff --git a/src/network.c b/src/network.c index 79f964b2..41c5460b 100644 --- a/src/network.c +++ b/src/network.c @@ -556,7 +556,6 @@ int network_handshake_setup(struct network *network, struct scan_bss *bss, } static int network_settings_load_pt_ecc(struct network *network, - const char *path, unsigned int group, struct l_ecc_point **out_pt) { @@ -581,7 +580,7 @@ static int network_settings_load_pt_ecc(struct network *network, return 0; bad_format: - l_error("%s: invalid %s format", path, key); + l_error("%s profile: invalid %s format", network->ssid, key); generate: if (!network->passphrase) @@ -656,12 +655,10 @@ static int network_load_psk(struct network *network, struct scan_bss *bss) network_reset_psk(network); network->passphrase = l_steal_ptr(passphrase); - if (network_settings_load_pt_ecc(network, path, - 19, &network->sae_pt_19) > 0) + if (network_settings_load_pt_ecc(network, 19, &network->sae_pt_19) > 0) network->sync_settings = true; - if (network_settings_load_pt_ecc(network, path, - 20, &network->sae_pt_20) > 0) + if (network_settings_load_pt_ecc(network, 20, &network->sae_pt_20) > 0) network->sync_settings = true; network->psk = l_steal_ptr(psk);