From 3543f8218b732132dff6d0dccb2ce357e4154801 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 3 Dec 2014 03:13:34 +0100 Subject: [PATCH] machine-id-setup: casting const away is ugly, let's not do it if there's no reason to --- src/core/machine-id-setup.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c index 77f047d..d8600bd 100644 --- a/src/core/machine-id-setup.c +++ b/src/core/machine-id-setup.c @@ -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) { -- 2.7.4