[systemd-commits] src/tmpfiles
Thomas H.P. Andersen
phomes at kemper.freedesktop.org
Fri Apr 10 14:28:17 PDT 2015
src/tmpfiles/tmpfiles.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit 75c2a9fd13bf2553e303443b5f25adf093892099
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date: Fri Apr 10 23:26:21 2015 +0200
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 3ca9b4a..ad5f3f6 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);
More information about the systemd-commits
mailing list