basic/cap-list: reduce scope of variables

diff --git a/src/basic/cap-list.c b/src/basic/cap-list.c
index 2b7834ad98ca705c58b3e87b20b93c1a1d743509..b483833947518e968b1b1b23ca5f34396a34fc1c 100644 (file)
--- 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 33dd2461c37c554d9a405144dcb864b9e15958e6..81d5c456d749b122a699f30c41c51517eeb968fa 100644 (file)
--- 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;