chiark / gitweb /
machine-id-setup: casting const away is ugly, let's not do it if there's no reason to
authorLennart Poettering <lennart@poettering.net>
Wed, 3 Dec 2014 02:13:34 +0000 (03:13 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 3 Dec 2014 02:13:34 +0000 (03:13 +0100)
src/core/machine-id-setup.c

index 77f047d..d8600bd 100644 (file)
@@ -200,11 +200,13 @@ int machine_id_setup(const char *root) {
                 etc_machine_id = "/etc/machine-id";
                 run_machine_id = "/run/machine-id";
         } else {
-                etc_machine_id = strappenda(root, "/etc/machine-id");
-                path_kill_slashes((char*) etc_machine_id);
+                char *x;
 
-                run_machine_id = strappenda(root, "/run/machine-id");
-                path_kill_slashes((char*) run_machine_id);
+                x = strappenda(root, "/etc/machine-id");
+                etc_machine_id = path_kill_slashes(x);
+
+                x = strappenda(root, "/run/machine-id");
+                run_machine_id = path_kill_slashes(x);
         }
 
         RUN_WITH_UMASK(0000) {