From: Thomas Hindoe Paaboel Andersen Date: Fri, 10 Apr 2015 21:26:21 +0000 (+0200) Subject: tmpfiles: fix build with clang X-Git-Tag: v220~486 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=75c2a9fd13bf2553e303443b5f25adf093892099;p=thirdparty%2Fsystemd.git tmpfiles: fix build with clang Clang is not happy about using the cleanup attribute in switches --- diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index 3ca9b4a2636..ad5f3f6c6ed 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -1082,6 +1082,7 @@ static const char *creation_mode_verb_table[_CREATION_MODE_MAX] = { DEFINE_PRIVATE_STRING_TABLE_LOOKUP_TO_STRING(creation_mode_verb, CreationMode); static int create_item(Item *i) { + _cleanup_free_ char *resolved = NULL; struct stat st; int r = 0; CreationMode creation; @@ -1106,8 +1107,6 @@ static int create_item(Item *i) { break; case COPY_FILES: { - _cleanup_free_ char *resolved = NULL; - r = specifier_printf(i->argument, specifier_table, NULL, &resolved); if (r < 0) return log_error_errno(r, "Failed to substitute specifiers in copy source %s: %m", i->argument); @@ -1233,8 +1232,6 @@ static int create_item(Item *i) { } case CREATE_SYMLINK: { - _cleanup_free_ char *resolved = NULL; - r = specifier_printf(i->argument, specifier_table, NULL, &resolved); if (r < 0) return log_error_errno(r, "Failed to substitute specifiers in symlink target %s: %m", i->argument);