From 6045958babfa2321d949c5940d5755959ae00431 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 22 Nov 2023 11:52:39 +0100 Subject: [PATCH] machine-credential: fix error logging Remove duplicate logging: let exclusively machine_credential_load()/machine_credential_set() log, and not the caller again. --- src/nspawn/nspawn.c | 9 +++------ src/shared/machine-credential.c | 10 +++------- src/vmspawn/vmspawn.c | 8 ++------ 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 38196ef3d63..8ac86eeb559 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -1569,19 +1569,16 @@ static int parse_argv(int argc, char *argv[]) { case ARG_SET_CREDENTIAL: r = machine_credential_set(&arg_credentials, &arg_n_credentials, optarg); - if (r == -ENOMEM) - return log_oom(); if (r < 0) - return log_error_errno(r, "Failed to set credential from %s: %m", optarg); + return r; + arg_settings_mask |= SETTING_CREDENTIALS; break; case ARG_LOAD_CREDENTIAL: r = machine_credential_load(&arg_credentials, &arg_n_credentials, optarg); - if (r == -ENOMEM) - return log_oom(); if (r < 0) - return log_error_errno(r, "Failed to load credential from %s: %m", optarg); + return r; arg_settings_mask |= SETTING_CREDENTIALS; break; diff --git a/src/shared/machine-credential.c b/src/shared/machine-credential.c index 752bf0da9c5..9c3a352e94c 100644 --- a/src/shared/machine-credential.c +++ b/src/shared/machine-credential.c @@ -39,8 +39,6 @@ int machine_credential_set(MachineCredential **credentials, size_t *n_credential assert(creds || n_creds == 0); r = extract_first_word(&p, &word, ":", EXTRACT_DONT_COALESCE_SEPARATORS); - if (r == -ENOMEM) - return r; if (r < 0) return log_error_errno(r, "Failed to parse --set-credential= parameter: %m"); if (r == 0 || !p) @@ -59,7 +57,7 @@ int machine_credential_set(MachineCredential **credentials, size_t *n_credential GREEDY_REALLOC(creds, n_creds + 1); if (!creds) - return -ENOMEM; + return log_oom(); creds[n_creds++] = (MachineCredential) { .id = TAKE_PTR(word), @@ -85,8 +83,6 @@ int machine_credential_load(MachineCredential **credentials, size_t *n_credentia assert(creds || n_creds == 0); r = extract_first_word(&p, &word, ":", EXTRACT_DONT_COALESCE_SEPARATORS); - if (r == -ENOMEM) - return -ENOMEM; if (r < 0) return log_error_errno(r, "Failed to parse --load-credential= parameter: %m"); if (r == 0 || !p) @@ -110,7 +106,7 @@ int machine_credential_load(MachineCredential **credentials, size_t *n_credentia j = path_join(e, p); if (!j) - return -ENOMEM; + return log_oom(); } r = read_full_file_full(AT_FDCWD, j ?: p, UINT64_MAX, SIZE_MAX, @@ -122,7 +118,7 @@ int machine_credential_load(MachineCredential **credentials, size_t *n_credentia GREEDY_REALLOC(creds, n_creds + 1); if (!creds) - return -ENOMEM; + return log_oom(); creds[n_creds++] = (MachineCredential) { .id = TAKE_PTR(word), diff --git a/src/vmspawn/vmspawn.c b/src/vmspawn/vmspawn.c index 6cfaed97f0f..ebae681893e 100644 --- a/src/vmspawn/vmspawn.c +++ b/src/vmspawn/vmspawn.c @@ -225,20 +225,16 @@ static int parse_argv(int argc, char *argv[]) { case ARG_SET_CREDENTIAL: { r = machine_credential_set(&arg_credentials, &arg_n_credentials, optarg); - if (r == -ENOMEM) - return log_oom(); if (r < 0) - return log_error_errno(r, "Failed to set credential from %s: %m", optarg); + return r; arg_settings_mask |= SETTING_CREDENTIALS; break; } case ARG_LOAD_CREDENTIAL: { r = machine_credential_load(&arg_credentials, &arg_n_credentials, optarg); - if (r == -ENOMEM) - return log_oom(); if (r < 0) - return log_error_errno(r, "Failed to load credential from %s: %m", optarg); + return r; arg_settings_mask |= SETTING_CREDENTIALS; break; -- 2.39.5