strv: make iterator in STRV_FOREACH() declaread in the loop
This also avoids multiple evaluations in STRV_FOREACH_BACKWARDS()
This commit is contained in:
@@ -312,7 +312,6 @@ static int putgrent_with_members(const struct group *gr, FILE *group) {
|
||||
if (a) {
|
||||
_cleanup_strv_free_ char **l = NULL;
|
||||
bool added = false;
|
||||
char **i;
|
||||
|
||||
l = strv_copy(gr->gr_mem);
|
||||
if (!l)
|
||||
@@ -357,7 +356,6 @@ static int putsgent_with_members(const struct sgrp *sg, FILE *gshadow) {
|
||||
if (a) {
|
||||
_cleanup_strv_free_ char **l = NULL;
|
||||
bool added = false;
|
||||
char **i;
|
||||
|
||||
l = strv_copy(sg->sg_mem);
|
||||
if (!l)
|
||||
@@ -1406,8 +1404,6 @@ static int add_implicit(void) {
|
||||
|
||||
/* Implicitly create additional users and groups, if they were listed in "m" lines */
|
||||
ORDERED_HASHMAP_FOREACH_KEY(l, g, members) {
|
||||
char **m;
|
||||
|
||||
STRV_FOREACH(m, l)
|
||||
if (!ordered_hashmap_get(users, *m)) {
|
||||
_cleanup_(item_freep) Item *j = NULL;
|
||||
@@ -1977,7 +1973,6 @@ static int parse_argv(int argc, char *argv[]) {
|
||||
}
|
||||
|
||||
static int parse_arguments(char **args) {
|
||||
char **arg;
|
||||
unsigned pos = 1;
|
||||
int r;
|
||||
|
||||
@@ -1999,7 +1994,6 @@ static int parse_arguments(char **args) {
|
||||
static int read_config_files(char **args) {
|
||||
_cleanup_strv_free_ char **files = NULL;
|
||||
_cleanup_free_ char *p = NULL;
|
||||
char **f;
|
||||
int r;
|
||||
|
||||
r = conf_files_list_with_replacement(arg_root, CONF_PATHS_STRV("sysusers.d"), arg_replace, &files, &p);
|
||||
|
||||
Reference in New Issue
Block a user