shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00
Code

Drop unused variables to fix build

Browse Source 
This is a merge conflict between #22740 and #20156.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2022-03-21 13:30:42 +01:00
parent 7ff9846956
commit e7949be790
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/sysupdate/sysupdate-pattern.c
View File

@ -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);

5
src/sysupdate/sysupdate.c
View File

@ -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;