SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

import-ceds: use the right error variables at four places

Browse Source
This commit is contained in:
Lennart Poettering
2022-07-14 21:52:11 +09:00
committed by Yu Watanabe
parent 0fde330d66
commit 1ab8cd794c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/import-creds.c
+4 -4
View File
@@ -226,7 +226,7 @@ static int import_credentials_boot(void) {
if (nfd == -EEXIST)
continue;
if (nfd < 0)
return r;
return nfd;
r = copy_bytes(cfd, nfd, st.st_size, 0);
if (r < 0) {
@@ -325,7 +325,7 @@ static int proc_cmdline_callback(const char *key, const char *value, void *data)
if (nfd == -EEXIST)
return 0;
if (nfd < 0)
return r;
return nfd;
r = loop_write(nfd, colon, l, /* do_poll= */ false);
if (r < 0) {
@@ -417,7 +417,7 @@ static int import_credentials_qemu(ImportCredentialContext *c) {
rfd = openat(vfd, "raw", O_RDONLY|O_CLOEXEC);
if (rfd < 0) {
log_warning_errno(r, "Failed to open '" QEMU_FWCFG_PATH "'/%s/raw, ignoring: %m", d->d_name);
log_warning_errno(errno, "Failed to open '" QEMU_FWCFG_PATH "'/%s/raw, ignoring: %m", d->d_name);
continue;
}
@@ -429,7 +429,7 @@ static int import_credentials_qemu(ImportCredentialContext *c) {
if (nfd == -EEXIST)
continue;
if (nfd < 0)
return r;
return nfd;
r = copy_bytes(rfd, nfd, sz, 0);
if (r < 0) {