From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 9 Jul 2020 21:23:07 +0000 (+0200)
Subject: basic/cap-list: reduce scope of variables
X-Git-Tag: v246-rc2~91^2
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fsystemd.git;a=commitdiff_plain;h=5700780389ddea40df6abd4f54d32214aaf4a640

basic/cap-list: reduce scope of variables
---

diff --git a/src/basic/cap-list.c b/src/basic/cap-list.c
index 2b7834ad98c..b4838339475 100644
--- a/src/basic/cap-list.c
+++ b/src/basic/cap-list.c
@@ -18,7 +18,6 @@ static const struct capability_name* lookup_capability(register const char *str,
 #include "cap-to-name.h"
 
 const char *capability_to_name(int id) {
-
         if (id < 0)
                 return NULL;
 
@@ -94,11 +93,10 @@ int capability_set_to_string_alloc(uint64_t set, char **s) {
 
 int capability_set_from_string(const char *s, uint64_t *set) {
         uint64_t val = 0;
-        const char *p;
 
         assert(set);
 
-        for (p = s;;) {
+        for (const char *p = s;;) {
                 _cleanup_free_ char *word = NULL;
                 int r;
 
diff --git a/src/test/test-cap-list.c b/src/test/test-cap-list.c
index 33dd2461c37..81d5c456d74 100644
--- a/src/test/test-cap-list.c
+++ b/src/test/test-cap-list.c
@@ -12,12 +12,10 @@
 
 /* verify the capability parser */
 static void test_cap_list(void) {
-        int i;
-
         assert_se(!capability_to_name(-1));
         assert_se(!capability_to_name(capability_list_length()));
 
-        for (i = 0; i < capability_list_length(); i++) {
+        for (int i = 0; i < capability_list_length(); i++) {
                 const char *n;
 
                 assert_se(n = capability_to_name(i));
@@ -35,7 +33,7 @@ static void test_cap_list(void) {
         assert_se(capability_from_name("64") == -EINVAL);
         assert_se(capability_from_name("-1") == -EINVAL);
 
-        for (i = 0; i < capability_list_length(); i++) {
+        for (int i = 0; i < capability_list_length(); i++) {
                 _cleanup_cap_free_charp_ char *a = NULL;
                 const char *b;
                 unsigned u;