Drop unused variables to fix build

This is a merge conflict between #22740 and #20156.

diff --git a/src/sysupdate/sysupdate-pattern.c b/src/sysupdate/sysupdate-pattern.c
index 4e0c417217b9d5e7580eca5ada67c0060c06d84b..c9228687f741ee8ecc916721e93aa876754a65c1 100644 (file)
--- a/src/sysupdate/sysupdate-pattern.c
+++ b/src/sysupdate/sysupdate-pattern.c
@@ -189,7 +189,6 @@ static int pattern_split(
 int pattern_match(const char *pattern, const char *s, InstanceMetadata *ret) {
         _cleanup_(instance_metadata_destroy) InstanceMetadata found = INSTANCE_METADATA_NULL;
         _cleanup_(pattern_element_free_allp) PatternElement *elements = NULL;
-        PatternElement *e;
         const char *p;
         int r;
 
@@ -412,7 +411,6 @@ nope:
 
 int pattern_match_many(char **patterns, const char *s, InstanceMetadata *ret) {
         _cleanup_(instance_metadata_destroy) InstanceMetadata found = INSTANCE_METADATA_NULL;
-        char **p;
         int r;
 
         STRV_FOREACH(p, patterns) {
@@ -454,7 +452,6 @@ int pattern_format(
 
         _cleanup_(pattern_element_free_allp) PatternElement *elements = NULL;
         _cleanup_free_ char *j = NULL;
-        PatternElement *e;
         int r;
 
         assert(pattern);

diff --git a/src/sysupdate/sysupdate.c b/src/sysupdate/sysupdate.c
index 82787a7b84dd8ded5e2ad2bf54a1df6cccfa5532..76c5bae0511dfcabead02a0612f197fc27864681 100644 (file)
--- a/src/sysupdate/sysupdate.c
+++ b/src/sysupdate/sysupdate.c
@@ -95,7 +95,6 @@ static int context_read_definitions(
                 const char *node) {
 
         _cleanup_strv_free_ char **files = NULL;
-        char **f;
         int r;
 
         assert(c);
@@ -104,7 +103,7 @@ static int context_read_definitions(
                 r = conf_files_list_strv(&files, ".conf", NULL, CONF_FILES_REGULAR|CONF_FILES_FILTER_MASKED, (const char**) STRV_MAKE(directory));
         else if (component) {
                 _cleanup_strv_free_ char **n = NULL;
-                char **l = CONF_PATHS_STRV(""), **i;
+                char **l = CONF_PATHS_STRV("");
                 size_t k = 0;
 
                 n = new0(char*, strv_length(l) + 1);
@@ -1101,7 +1100,7 @@ static int verb_components(int argc, char **argv, void *userdata) {
         _cleanup_(umount_and_rmdir_and_freep) char *mounted_dir = NULL;
         _cleanup_(set_freep) Set *names = NULL;
         _cleanup_free_ char **z = NULL; /* We use simple free() rather than strv_free() here, since set_free() will free the strings for us */
-        char **l = CONF_PATHS_STRV(""), **i;
+        char **l = CONF_PATHS_STRV("");
         bool has_default_component = false;
         int r;