chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: another round of simplifications
[elogind.git]
/
src
/
cryptsetup
/
cryptsetup-generator.c
diff --git
a/src/cryptsetup/cryptsetup-generator.c
b/src/cryptsetup/cryptsetup-generator.c
index b27223cd6c235765bd4559dc1479a14a089d2bcd..45c23bb323072aee38644463ecb4d2d498416fdd 100644
(file)
--- a/
src/cryptsetup/cryptsetup-generator.c
+++ b/
src/cryptsetup/cryptsetup-generator.c
@@
-116,10
+116,8
@@
static int create_disk(
return log_oom();
f = fopen(p, "wxe");
return log_oom();
f = fopen(p, "wxe");
- if (!f) {
- log_error_errno(errno, "Failed to create unit file %s: %m", p);
- return -errno;
- }
+ if (!f)
+ return log_error_errno(errno, "Failed to create unit file %s: %m", p);
fputs(
"# Automatically generated by systemd-cryptsetup-generator\n\n"
fputs(
"# Automatically generated by systemd-cryptsetup-generator\n\n"
@@
-200,10
+198,8
@@
static int create_disk(
name);
fflush(f);
name);
fflush(f);
- if (ferror(f)) {
- log_error_errno(errno, "Failed to write file %s: %m", p);
- return -errno;
- }
+ if (ferror(f))
+ return log_error_errno(errno, "Failed to write file %s: %m", p);
from = strappenda("../", n);
from = strappenda("../", n);
@@
-214,10
+210,8
@@
static int create_disk(
return log_oom();
mkdir_parents_label(to, 0755);
return log_oom();
mkdir_parents_label(to, 0755);
- if (symlink(from, to) < 0) {
- log_error_errno(errno, "Failed to create symlink %s: %m", to);
- return -errno;
- }
+ if (symlink(from, to) < 0)
+ return log_error_errno(errno, "Failed to create symlink %s: %m", to);
free(to);
if (!nofail)
free(to);
if (!nofail)
@@
-228,10
+222,8
@@
static int create_disk(
return log_oom();
mkdir_parents_label(to, 0755);
return log_oom();
mkdir_parents_label(to, 0755);
- if (symlink(from, to) < 0) {
- log_error_errno(errno, "Failed to create symlink %s: %m", to);
- return -errno;
- }
+ if (symlink(from, to) < 0)
+ return log_error_errno(errno, "Failed to create symlink %s: %m", to);
}
free(to);
}
free(to);
@@
-240,10
+232,8
@@
static int create_disk(
return log_oom();
mkdir_parents_label(to, 0755);
return log_oom();
mkdir_parents_label(to, 0755);
- if (symlink(from, to) < 0) {
- log_error_errno(errno, "Failed to create symlink %s: %m", to);
- return -errno;
- }
+ if (symlink(from, to) < 0)
+ return log_error_errno(errno, "Failed to create symlink %s: %m", to);
if (!noauto && !nofail) {
_cleanup_free_ char *dmname;
if (!noauto && !nofail) {
_cleanup_free_ char *dmname;