machine-credential: fix error logging

Remove duplicate logging: let exclusively
machine_credential_load()/machine_credential_set() log, and not the
caller again.

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 38196ef3d63e6d890bbb60e71b1ab30ead85d618..8ac86eeb559c1dc2596c72dbc9ce7335cb7aff4a 100644 (file)
--- 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 752bf0da9c50453d053c74d8d1859d60c8d241c0..9c3a352e94c877ceee77de0ea605ecdc7b8ec8df 100644 (file)
--- 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 6cfaed97f0f0d76b6f2d2d14b12de2308e56c862..ebae681893ed4a4123d2cfefbab49fd10ab90c6f 100644 (file)
--- 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;