Standarize on one spelling of symlink error message

It's polite to print the name of the link that wasn't created,
and it makes little sense to print the target.

diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index a0fd7a078f17985d256b365bcd09244b66c21214..89adb0b4a3445e34430a705a68024f47f005a792 100644 (file)
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -334,7 +334,7 @@ int mount_cgroup_controllers(char ***join_controllers) {
                         char **i;
 
                         for (i = *k; *i; i++) {
                         char **i;
 
                         for (i = *k; *i; i++) {

-                                char *t;
+                                _cleanup_free_ char *t;

 
                                 t = strappend("/sys/fs/cgroup/", *i);
                                 if (!t) {
 
                                 t = strappend("/sys/fs/cgroup/", *i);
                                 if (!t) {


@@ -344,10 +344,8 @@ int mount_cgroup_controllers(char ***join_controllers) {
                                 }
 
                                 r = symlink(options, t);
                                 }
 
                                 r = symlink(options, t);

-                                free(t);
-

                                 if (r < 0 && errno != EEXIST) {
                                 if (r < 0 && errno != EEXIST) {

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

                                         r = -errno;
                                         free(options);
                                         goto finish;
                                         r = -errno;
                                         free(options);
                                         goto finish;

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index b31329dc09d051b37f1993129662ad93f2a96855..228039d91f0ea2bd2560fc2ce0e12718551fb765 100644 (file)
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -179,7 +179,7 @@ static int create_disk(
 
                 mkdir_parents_label(to, 0755);
                 if (symlink(from, to) < 0) {
 
                 mkdir_parents_label(to, 0755);
                 if (symlink(from, to) < 0) {

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

                         return -errno;
                 }
 
                         return -errno;
                 }
 


@@ -193,7 +193,7 @@ static int create_disk(
 
                 mkdir_parents_label(to, 0755);
                 if (symlink(from, to) < 0) {
 
                 mkdir_parents_label(to, 0755);
                 if (symlink(from, to) < 0) {

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

                         return -errno;
                 }
         }
                         return -errno;
                 }
         }


@@ -209,7 +209,7 @@ static int create_disk(
 
         mkdir_parents_label(to, 0755);
         if (symlink(from, to) < 0) {
 
         mkdir_parents_label(to, 0755);
         if (symlink(from, to) < 0) {

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

                 return -errno;
         }
 
                 return -errno;
         }
 

diff --git a/src/efi-boot-generator/efi-boot-generator.c b/src/efi-boot-generator/efi-boot-generator.c
index 88fa220d2f4fb6416cba523ca5d8977c760e548d..4367c536b0ca7e371e6a80887c5b9cff7bd480fe 100644 (file)
--- a/src/efi-boot-generator/efi-boot-generator.c
+++ b/src/efi-boot-generator/efi-boot-generator.c
@@ -115,7 +115,7 @@ int main(int argc, char *argv[]) {
         mkdir_parents(name, 0755);
 
         if (symlink("../boot.automount", name) < 0) {
         mkdir_parents(name, 0755);
 
         if (symlink("../boot.automount", name) < 0) {

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

                 return EXIT_FAILURE;
         }
 
                 return EXIT_FAILURE;
         }
 

diff --git a/src/getty-generator/getty-generator.c b/src/getty-generator/getty-generator.c
index e811830a6bd0a816b8edcc743102e81965a5ff7a..4b7a60a4ecef0da55a5302df22cedf2c9da82be9 100644 (file)
--- a/src/getty-generator/getty-generator.c
+++ b/src/getty-generator/getty-generator.c
@@ -55,7 +55,7 @@ static int add_symlink(const char *fservice, const char *tservice) {
                         /* In case console=hvc0 is passed this will very likely result in EEXIST */
                         r = 0;
                 else {
                         /* In case console=hvc0 is passed this will very likely result in EEXIST */
                         r = 0;
                 else {

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

                         r = -errno;
                 }
         }
                         r = -errno;
                 }
         }

diff --git a/src/rc-local-generator/rc-local-generator.c b/src/rc-local-generator/rc-local-generator.c
index 448980ba2da7f2a8da701bac5279ec29d9b6648e..92655012502cd2a4ebba6b872f3302ff5701244d 100644 (file)
--- a/src/rc-local-generator/rc-local-generator.c
+++ b/src/rc-local-generator/rc-local-generator.c
@@ -59,7 +59,7 @@ static int add_symlink(const char *service, const char *where) {
                 if (errno == EEXIST)
                         r = 0;
                 else {
                 if (errno == EEXIST)
                         r = 0;
                 else {

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

                         r = -errno;
                 }
         }
                         r = -errno;
                 }
         }

diff --git a/src/system-update-generator/system-update-generator.c b/src/system-update-generator/system-update-generator.c
index 6660192f5e06beb650792f6ceefa5c4a3beea60a..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)


@@ -51,13 +51,10 @@ static int generate_symlink(void) {
                 return log_oom();
 
         if (symlink(SYSTEM_DATA_UNIT_PATH "/system-update.target", p) < 0) {
                 return log_oom();
 
         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);
-

         return 0;
 }
 
         return 0;
 }
 

diff --git a/src/udev/udev-watch.c b/src/udev/udev-watch.c
index 311f5bdf235f3e942a750387791c3d4f2c7a49fb..9b694c66667e03e560aa4e6a1e1d937c2f5973f3 100644 (file)
--- a/src/udev/udev-watch.c
+++ b/src/udev/udev-watch.c
@@ -116,7 +116,7 @@ void udev_watch_begin(struct udev *udev, struct udev_device *dev)
         unlink(filename);
         r = symlink(udev_device_get_id_filename(dev), filename);
         if (r < 0)
         unlink(filename);
         r = symlink(udev_device_get_id_filename(dev), filename);
         if (r < 0)

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

 
         udev_device_set_watch_handle(dev, wd);
 }
 
         udev_device_set_watch_handle(dev, wd);
 }