summaryrefslogtreecommitdiff
path: root/src/fstab-generator/fstab-generator.c
diff options
context:
space:
mode:
authorShawn Landden <shawnlandden@gmail.com>2012-07-24 21:12:43 -0700
committerKay Sievers <kay@vrfy.org>2012-07-25 11:23:57 +0200
commit669241a076108e0483d7d8475beaa506106d077e (patch)
tree33039c6539c1e37c26a9900eddc3fcc2320c617c /src/fstab-generator/fstab-generator.c
parent22cfbae09d7791c52901c53b240e28c63eee93d4 (diff)
use "Out of memory." consistantly (or with "\n")
glibc/glib both use "out of memory" consistantly so maybe we should consider that instead of this. Eliminates one string out of a number of binaries. Also fixes extra newline in udev/scsi_id
Diffstat (limited to 'src/fstab-generator/fstab-generator.c')
-rw-r--r--src/fstab-generator/fstab-generator.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 3a59b85d66..89a4d13504 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -98,14 +98,14 @@ static int add_swap(const char *what, struct mntent *me) {
name = unit_name_from_path(what, ".swap");
if (!name) {
- log_error("Out of memory");
+ log_error("Out of memory.");
r = -ENOMEM;
goto finish;
}
unit = strjoin(arg_dest, "/", name, NULL);
if (!unit) {
- log_error("Out of memory");
+ log_error("Out of memory.");
r = -ENOMEM;
goto finish;
}
@@ -148,7 +148,7 @@ static int add_swap(const char *what, struct mntent *me) {
if (!noauto) {
lnk = strjoin(arg_dest, "/" SPECIAL_SWAP_TARGET ".wants/", name, NULL);
if (!lnk) {
- log_error("Out of memory");
+ log_error("Out of memory.");
r = -ENOMEM;
goto finish;
}
@@ -162,7 +162,7 @@ static int add_swap(const char *what, struct mntent *me) {
r = device_name(what, &device);
if (r < 0) {
- log_error("Out of memory");
+ log_error("Out of memory.");
r = -ENOMEM;
goto finish;
}
@@ -171,7 +171,7 @@ static int add_swap(const char *what, struct mntent *me) {
free(lnk);
lnk = strjoin(arg_dest, "/", device, ".wants/", name, NULL);
if (!lnk) {
- log_error("Out of memory");
+ log_error("Out of memory.");
r = -ENOMEM;
goto finish;
}
@@ -256,14 +256,14 @@ static int add_mount(const char *what, const char *where, struct mntent *me) {
name = unit_name_from_path(where, ".mount");
if (!name) {
- log_error("Out of memory");
+ log_error("Out of memory.");
r = -ENOMEM;
goto finish;
}
unit = strjoin(arg_dest, "/", name, NULL);
if (!unit) {
- log_error("Out of memory");
+ log_error("Out of memory.");
r = -ENOMEM;
goto finish;
}
@@ -323,7 +323,7 @@ static int add_mount(const char *what, const char *where, struct mntent *me) {
if (!noauto) {
lnk = strjoin(arg_dest, "/", post, nofail || automount ? ".wants/" : ".requires/", name, NULL);
if (!lnk) {
- log_error("Out of memory");
+ log_error("Out of memory.");
r = -ENOMEM;
goto finish;
}
@@ -340,7 +340,7 @@ static int add_mount(const char *what, const char *where, struct mntent *me) {
r = device_name(what, &device);
if (r < 0) {
- log_error("Out of memory");
+ log_error("Out of memory.");
r = -ENOMEM;
goto finish;
}
@@ -349,7 +349,7 @@ static int add_mount(const char *what, const char *where, struct mntent *me) {
free(lnk);
lnk = strjoin(arg_dest, "/", device, ".wants/", name, NULL);
if (!lnk) {
- log_error("Out of memory");
+ log_error("Out of memory.");
r = -ENOMEM;
goto finish;
}
@@ -367,14 +367,14 @@ static int add_mount(const char *what, const char *where, struct mntent *me) {
if (automount && !path_equal(where, "/")) {
automount_name = unit_name_from_path(where, ".automount");
if (!name) {
- log_error("Out of memory");
+ log_error("Out of memory.");
r = -ENOMEM;
goto finish;
}
automount_unit = strjoin(arg_dest, "/", automount_name, NULL);
if (!automount_unit) {
- log_error("Out of memory");
+ log_error("Out of memory.");
r = -ENOMEM;
goto finish;
}
@@ -410,7 +410,7 @@ static int add_mount(const char *what, const char *where, struct mntent *me) {
free(lnk);
lnk = strjoin(arg_dest, "/", post, nofail ? ".wants/" : ".requires/", automount_name, NULL);
if (!lnk) {
- log_error("Out of memory");
+ log_error("Out of memory.");
r = -ENOMEM;
goto finish;
}
@@ -459,14 +459,14 @@ static int parse_fstab(void) {
what = fstab_node_to_udev_node(me->mnt_fsname);
if (!what) {
- log_error("Out of memory");
+ log_error("Out of memory.");
r = -ENOMEM;
goto finish;
}
where = strdup(me->mnt_dir);
if (!where) {
- log_error("Out of memory");
+ log_error("Out of memory.");
free(what);
r = -ENOMEM;
goto finish;