]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
tmpfiles: fix build with clang
authorThomas Hindoe Paaboel Andersen <phomes@gmail.com>
Fri, 10 Apr 2015 21:26:21 +0000 (23:26 +0200)
committerThomas Hindoe Paaboel Andersen <phomes@gmail.com>
Fri, 10 Apr 2015 21:28:08 +0000 (23:28 +0200)
Clang is not happy about using the cleanup attribute in switches

src/tmpfiles/tmpfiles.c

index 3ca9b4a263695f29e878b81bfb981c53f873c867..ad5f3f6c6ed8575bcfde5f74e97155c04d96f958 100644 (file)
@@ -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);