picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use fflush_and_check() in more places

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-05-16 18:11:12 -04:00
parent 0dfb89d3c2
commit 4652c56c59
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cryptsetup/cryptsetup-generator.c
View File

@ -176,9 +176,9 @@ static int create_disk(
"ExecStartPost=/sbin/mkswap '/dev/mapper/%s'\n",
name);
fflush(f);
if (ferror(f))
return log_error_errno(errno, "Failed to write file %s: %m", p);
r = fflush_and_check(f);
if (r < 0)
return log_error_errno(r, "Failed to write file %s: %m", p);
from = strjoina("../", n);

12
src/efi-boot-generator/efi-boot-generator.c
View File

@ -123,9 +123,9 @@ int main(int argc, char *argv[]) {
"Options=umask=0077,noauto\n",
what);
fflush(f);
if (ferror(f)) {
log_error_errno(errno, "Failed to write mount unit file: %m");
r = fflush_and_check(f);
if (r < 0) {
log_error_errno(r, "Failed to write mount unit file: %m");
return EXIT_FAILURE;
}
@ -144,9 +144,9 @@ int main(int argc, char *argv[]) {
"Where=/boot\n"
"TimeoutIdleSec=120\n", f);
fflush(f);
if (ferror(f)) {
log_error_errno(errno, "Failed to write automount unit file: %m");
r = fflush_and_check(f);
if (r < 0) {
log_error_errno(r, "Failed to write automount unit file: %m");
return EXIT_FAILURE;
}

12
src/fstab-generator/fstab-generator.c
View File

@ -275,9 +275,9 @@ static int add_mount(
if (!isempty(filtered) && !streq(filtered, "defaults"))
fprintf(f, "Options=%s\n", filtered);
fflush(f);
if (ferror(f))
return log_error_errno(errno, "Failed to write unit file %s: %m", unit);
r = fflush_and_check(f);
if (r < 0)
return log_error_errno(r, "Failed to write unit file %s: %m", unit);
if (!noauto && post) {
lnk = strjoin(arg_dest, "/", post, nofail || automount ? ".wants/" : ".requires/", name, NULL);
@ -324,9 +324,9 @@ static int add_mount(
if (r < 0)
return r;
fflush(f);
if (ferror(f))
return log_error_errno(errno, "Failed to write unit file %s: %m", automount_unit);
r = fflush_and_check(f);
if (r < 0)
return log_error_errno(r, "Failed to write unit file %s: %m", automount_unit);
free(lnk);
lnk = strjoin(arg_dest, "/", post, nofail ? ".wants/" : ".requires/", automount_name, NULL);