chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a24d03b
)
cryptsetup-generator: use log_oom() everywhere
author
Michal Schmidt
<mschmidt@redhat.com>
Fri, 23 Nov 2012 13:16:34 +0000
(14:16 +0100)
committer
Michal Schmidt
<mschmidt@redhat.com>
Fri, 23 Nov 2012 13:19:30 +0000
(14:19 +0100)
src/cryptsetup/cryptsetup-generator.c
patch
|
blob
|
history
diff --git
a/src/cryptsetup/cryptsetup-generator.c
b/src/cryptsetup/cryptsetup-generator.c
index 386714b4fd09e8ac67bec1f6854c9328993fa11e..ef16fbc2f521ba21652f8b20ef1201ab21ed831d 100644
(file)
--- a/
src/cryptsetup/cryptsetup-generator.c
+++ b/
src/cryptsetup/cryptsetup-generator.c
@@
-83,29
+83,25
@@
static int create_disk(
n = unit_name_from_path_instance("systemd-cryptsetup", name, ".service");
if (!n) {
n = unit_name_from_path_instance("systemd-cryptsetup", name, ".service");
if (!n) {
- r = -ENOMEM;
- log_error("Failed to allocate unit name.");
+ r = log_oom();
goto fail;
}
p = strjoin(arg_dest, "/", n, NULL);
if (!p) {
goto fail;
}
p = strjoin(arg_dest, "/", n, NULL);
if (!p) {
- r = -ENOMEM;
- log_error("Failed to allocate unit file name.");
+ r = log_oom();
goto fail;
}
u = fstab_node_to_udev_node(device);
if (!u) {
goto fail;
}
u = fstab_node_to_udev_node(device);
if (!u) {
- r = -ENOMEM;
- log_error("Failed to allocate device node.");
+ r = log_oom();
goto fail;
}
d = unit_name_from_path(u, ".device");
if (!d) {
goto fail;
}
d = unit_name_from_path(u, ".device");
if (!d) {
- r = -ENOMEM;
- log_error("Failed to allocate device name.");
+ r = log_oom();
goto fail;
}
goto fail;
}
@@
-169,7
+165,7
@@
static int create_disk(
}
if (asprintf(&from, "../%s", n) < 0) {
}
if (asprintf(&from, "../%s", n) < 0) {
- r =
-ENOMEM
;
+ r =
log_oom()
;
goto fail;
}
goto fail;
}
@@
-177,7
+173,7
@@
static int create_disk(
to = strjoin(arg_dest, "/", d, ".wants/", n, NULL);
if (!to) {
to = strjoin(arg_dest, "/", d, ".wants/", n, NULL);
if (!to) {
- r =
-ENOMEM
;
+ r =
log_oom()
;
goto fail;
}
goto fail;
}
@@
-195,7
+191,7
@@
static int create_disk(
else
to = strjoin(arg_dest, "/cryptsetup.target.wants/", n, NULL);
if (!to) {
else
to = strjoin(arg_dest, "/cryptsetup.target.wants/", n, NULL);
if (!to) {
- r =
-ENOMEM
;
+ r =
log_oom()
;
goto fail;
}
goto fail;
}
@@
-213,7
+209,7
@@
static int create_disk(
e = unit_name_escape(name);
to = strjoin(arg_dest, "/dev-mapper-", e, ".device.requires/", n, NULL);
if (!to) {
e = unit_name_escape(name);
to = strjoin(arg_dest, "/dev-mapper-", e, ".device.requires/", n, NULL);
if (!to) {
- r =
-ENOMEM
;
+ r =
log_oom()
;
goto fail;
}
goto fail;
}
@@
-260,7
+256,7
@@
static int parse_proc_cmdline(void) {
word = strndup(w, l);
if (!word) {
word = strndup(w, l);
if (!word) {
- r =
-ENOMEM
;
+ r =
log_oom()
;
goto finish;
}
goto finish;
}