X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ffstab-generator%2Ffstab-generator.c;h=251a346c4d131a2c6ab81d18bd2fac7400d423fd;hb=fb0951b02ebf51a93acf12721d8857d31ce57ba3;hp=f832730b4041ee2bb8e2ce29d1a3e7bd6750f88f;hpb=9473414219330b9febc1d0712bbf49ad74cf962f;p=elogind.git

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index f832730b4..251a346c4 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -47,7 +47,7 @@ static int device_name(const char *path, char **unit) {
 
         p = unit_name_from_path(path, ".device");
         if (!p)
-                return -ENOMEM;
+                return log_oom();
 
         *unit = p;
         return 1;
@@ -98,15 +98,13 @@ static int add_swap(const char *what, struct mntent *me) {
 
         name = unit_name_from_path(what, ".swap");
         if (!name) {
-                log_error("Out of memory");
-                r = -ENOMEM;
+                r = log_oom();
                 goto finish;
         }
 
-        unit = join(arg_dest, "/", name, NULL);
+        unit = strjoin(arg_dest, "/", name, NULL);
         if (!unit) {
-                log_error("Out of memory");
-                r = -ENOMEM;
+                r = log_oom();
                 goto finish;
         }
 
@@ -146,10 +144,9 @@ static int add_swap(const char *what, struct mntent *me) {
         }
 
         if (!noauto) {
-                lnk = join(arg_dest, "/" SPECIAL_SWAP_TARGET ".wants/", name, NULL);
+                lnk = strjoin(arg_dest, "/" SPECIAL_SWAP_TARGET ".wants/", name, NULL);
                 if (!lnk) {
-                        log_error("Out of memory");
-                        r = -ENOMEM;
+                        r = log_oom();
                         goto finish;
                 }
 
@@ -161,18 +158,14 @@ static int add_swap(const char *what, struct mntent *me) {
                 }
 
                 r = device_name(what, &device);
-                if (r < 0) {
-                        log_error("Out of memory");
-                        r = -ENOMEM;
+                if (r < 0)
                         goto finish;
-                }
 
                 if (r > 0) {
                         free(lnk);
-                        lnk = join(arg_dest, "/", device, ".wants/", name, NULL);
+                        lnk = strjoin(arg_dest, "/", device, ".wants/", name, NULL);
                         if (!lnk) {
-                                log_error("Out of memory");
-                                r = -ENOMEM;
+                                r = log_oom();
                                 goto finish;
                         }
 
@@ -255,16 +248,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");
-                r = -ENOMEM;
+        if (!name) {
+                r = log_oom();
                 goto finish;
         }
 
-        unit = join(arg_dest, "/", name, NULL);
+        unit = strjoin(arg_dest, "/", name, NULL);
         if (!unit) {
-                log_error("Out of memory");
-                r = -ENOMEM;
+                r = log_oom();
                 goto finish;
         }
 
@@ -321,10 +312,9 @@ static int add_mount(const char *what, const char *where, struct mntent *me) {
         }
 
         if (!noauto) {
-                lnk = join(arg_dest, "/", post, nofail || automount ? ".wants/" : ".requires/", name, NULL);
+                lnk = strjoin(arg_dest, "/", post, nofail || automount ? ".wants/" : ".requires/", name, NULL);
                 if (!lnk) {
-                        log_error("Out of memory");
-                        r = -ENOMEM;
+                        r = log_oom();
                         goto finish;
                 }
 
@@ -339,24 +329,20 @@ static int add_mount(const char *what, const char *where, struct mntent *me) {
                     !path_equal(where, "/")) {
 
                         r = device_name(what, &device);
-                        if (r < 0) {
-                                log_error("Out of memory");
-                                r = -ENOMEM;
+                        if (r < 0)
                                 goto finish;
-                        }
 
                         if (r > 0) {
                                 free(lnk);
-                                lnk = join(arg_dest, "/", device, ".wants/", name, NULL);
+                                lnk = strjoin(arg_dest, "/", device, ".wants/", name, NULL);
                                 if (!lnk) {
-                                        log_error("Out of memory");
-                                        r = -ENOMEM;
+                                        r = log_oom();
                                         goto finish;
                                 }
 
                                 mkdir_parents_label(lnk, 0755);
                                 if (symlink(unit, lnk) < 0) {
-                                        log_error("Failed to creat symlink: %m");
+                                        log_error("Failed to create symlink: %m");
                                         r = -errno;
                                         goto finish;
                                 }
@@ -367,15 +353,13 @@ 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");
-                        r = -ENOMEM;
+                        r = log_oom();
                         goto finish;
                 }
 
-                automount_unit = join(arg_dest, "/", automount_name, NULL);
+                automount_unit = strjoin(arg_dest, "/", automount_name, NULL);
                 if (!automount_unit) {
-                        log_error("Out of memory");
-                        r = -ENOMEM;
+                        r = log_oom();
                         goto finish;
                 }
 
@@ -408,10 +392,9 @@ static int add_mount(const char *what, const char *where, struct mntent *me) {
                 }
 
                 free(lnk);
-                lnk = join(arg_dest, "/", post, nofail ? ".wants/" : ".requires/", automount_name, NULL);
+                lnk = strjoin(arg_dest, "/", post, nofail ? ".wants/" : ".requires/", automount_name, NULL);
                 if (!lnk) {
-                        log_error("Out of memory");
-                        r = -ENOMEM;
+                        r = log_oom();
                         goto finish;
                 }
 
@@ -459,16 +442,14 @@ static int parse_fstab(void) {
 
                 what = fstab_node_to_udev_node(me->mnt_fsname);
                 if (!what) {
-                        log_error("Out of memory");
-                        r = -ENOMEM;
+                        r = log_oom();
                         goto finish;
                 }
 
                 where = strdup(me->mnt_dir);
                 if (!where) {
-                        log_error("Out of memory");
+                        r = log_oom();
                         free(what);
-                        r = -ENOMEM;
                         goto finish;
                 }
 
@@ -513,7 +494,7 @@ static int parse_proc_cmdline(void) {
 
                 word = strndup(w, l);
                 if (!word) {
-                        r = -ENOMEM;
+                        r = log_oom();
                         goto finish;
                 }