nulstr-util: Declare NULSTR_FOREACH() iterator inline

4 files changed, 0 insertions, 13 deletions

diff --git a/src/analyze/analyze-cat-config.c b/src/analyze/analyze-cat-config.c
index a30662b49f..08184cedfe 100644
--- a/src/analyze/analyze-cat-config.c
+++ b/src/analyze/analyze-cat-config.c
@@ -23,8 +23,6 @@ int verb_cat_config(int argc, char *argv[], void *userdata) {
                         print_separator();
 
                 if (path_is_absolute(*arg)) {
-                        const char *dir;
-
                         NULSTR_FOREACH(dir, CONF_PATHS_NULSTR("")) {
                                 t = path_startswith(*arg, dir);
                                 if (t)
diff --git a/src/analyze/analyze-filesystems.c b/src/analyze/analyze-filesystems.c
index e30b3a6ac6..582e04eac9 100644
--- a/src/analyze/analyze-filesystems.c
+++ b/src/analyze/analyze-filesystems.c
@@ -50,8 +50,6 @@ static int load_available_kernel_filesystems(Set **ret) {
 }
 
 static void filesystem_set_remove(Set *s, const FilesystemSet *set) {
-        const char *filesystem;
-
         NULSTR_FOREACH(filesystem, set->value) {
                 if (filesystem[0] == '@')
                         continue;
@@ -61,7 +59,6 @@ static void filesystem_set_remove(Set *s, const FilesystemSet *set) {
 }
 
 static void dump_filesystem_set(const FilesystemSet *set) {
-        const char *filesystem;
         int r;
 
         if (!set)
@@ -119,7 +116,6 @@ int verb_filesystems(int argc, char *argv[], void *userdata) {
 
         if (strv_isempty(strv_skip(argv, 1))) {
                 _cleanup_set_free_ Set *kernel = NULL, *known = NULL;
-                const char *fs;
                 int k;
 
                 NULSTR_FOREACH(fs, filesystem_sets[FILESYSTEM_SET_KNOWN].value)
diff --git a/src/analyze/analyze-security.c b/src/analyze/analyze-security.c
index 69eab91bdb..585dd01f68 100644
--- a/src/analyze/analyze-security.c
+++ b/src/analyze/analyze-security.c
@@ -567,8 +567,6 @@ static int assess_system_call_architectures(
 }
 
 static bool syscall_names_in_filter(Set *s, bool allow_list, const SyscallFilterSet *f, const char **ret_offending_syscall) {
-        const char *syscall;
-
         NULSTR_FOREACH(syscall, f->value) {
                 if (syscall[0] == '@') {
                         const SyscallFilterSet *g;
diff --git a/src/analyze/analyze-syscall-filter.c b/src/analyze/analyze-syscall-filter.c
index 308b1724e5..50662da062 100644
--- a/src/analyze/analyze-syscall-filter.c
+++ b/src/analyze/analyze-syscall-filter.c
@@ -59,8 +59,6 @@ static int load_kernel_syscalls(Set **ret) {
 }
 
 static void syscall_set_remove(Set *s, const SyscallFilterSet *set) {
-        const char *syscall;
-
         if (!set)
                 return;
 
@@ -73,8 +71,6 @@ static void syscall_set_remove(Set *s, const SyscallFilterSet *set) {
 }
 
 static void dump_syscall_filter(const SyscallFilterSet *set) {
-        const char *syscall;
-
         printf("%s%s%s\n"
                "    # %s\n",
                ansi_highlight(),
@@ -93,7 +89,6 @@ int verb_syscall_filters(int argc, char *argv[], void *userdata) {
 
         if (strv_isempty(strv_skip(argv, 1))) {
                 _cleanup_set_free_ Set *kernel = NULL, *known = NULL;
-                const char *sys;
                 int k = 0;  /* explicit initialization to appease gcc */
 
                 NULSTR_FOREACH(sys, syscall_filter_sets[SYSCALL_FILTER_SET_KNOWN].value)