Standarize on one spelling of symlink error message

[elogind.git] / src / system-update-generator / system-update-generator.c

diff --git a/src/system-update-generator/system-update-generator.c b/src/system-update-generator/system-update-generator.c
index d148550e7c93c14a3a61eb86eb54ceb627bc7610..13b8a0c426393819e2031d110a8a5587559503fe 100644 (file)
--- a/src/system-update-generator/system-update-generator.c
+++ b/src/system-update-generator/system-update-generator.c
@@ -36,7 +36,7 @@ static const char *arg_dest = "/tmp";
 
 static int generate_symlink(void) {
         struct stat st;
 
 static int generate_symlink(void) {
         struct stat st;

-        char *p;
+        char _cleanup_free_ *p = NULL;

 
         if (lstat("/system-update", &st) < 0) {
                 if (errno == ENOENT)
 
         if (lstat("/system-update", &st) < 0) {
                 if (errno == ENOENT)


@@ -47,32 +47,14 @@ static int generate_symlink(void) {
         }
 
         p = strappend(arg_dest, "/default.target");
         }
 
         p = strappend(arg_dest, "/default.target");

-        if (!p) {
-                log_error("Out of memory.");
-                return -ENOMEM;
-        }
+        if (!p)
+                return log_oom();

 
         if (symlink(SYSTEM_DATA_UNIT_PATH "/system-update.target", p) < 0) {
 
         if (symlink(SYSTEM_DATA_UNIT_PATH "/system-update.target", p) < 0) {

-                free(p);
-                log_error("Failed to create symlink: %m");
+                log_error("Failed to create symlink %s: %m", p);

                 return -errno;
         }
 
                 return -errno;
         }
 

-        free(p);
-
-        /* Also try to disable readahead, but don't try too hard */
-        p = strappend(arg_dest, "/systemd-readahead-collect.service");
-        if (p) {
-                symlink("/dev/null", p);
-                free(p);
-        }
-
-        p = strappend(arg_dest, "/systemd-readahead-replay.service");
-        if (p) {
-                symlink("/dev/null", p);
-                free(p);
-        }
-

         return 0;
 }
 
         return 0;
 }