60 lines
1.9 KiB
Diff
60 lines
1.9 KiB
Diff
|
From 858f66083170216873c75d8e325b5da217da7605 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
||
|
|
Date: Thu, 21 Jul 2022 17:24:43 +0200
|
||
|
|
Subject: [PATCH] libsepol: rename parameter name
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
Content-type: text/plain
|
||
|
|
|
||
|
|
Do not use `bool` as a parameter name, for future C version support.
|
||
|
|
|
||
|
|
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
|
||
|
|
Acked-by: James Carter <jwcart2@gmail.com>
|
||
|
|
---
|
||
|
|
libsepol/src/policydb_validate.c | 8 ++++----
|
||
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/libsepol/src/policydb_validate.c b/libsepol/src/policydb_validate.c
|
||
|
|
index a567c4119e10..0f39977177bd 100644
|
||
|
|
--- a/libsepol/src/policydb_validate.c
|
||
|
|
+++ b/libsepol/src/policydb_validate.c
|
||
|
|
@@ -862,7 +862,7 @@ bad:
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
|
||
|
|
-static int validate_bool_id_array(sepol_handle_t *handle, const uint32_t bool_ids[], unsigned int nbools, const validate_t *bool)
|
||
|
|
+static int validate_bool_id_array(sepol_handle_t *handle, const uint32_t bool_ids[], unsigned int nbools, const validate_t *boolean)
|
||
|
|
{
|
||
|
|
unsigned int i;
|
||
|
|
|
||
|
|
@@ -870,7 +870,7 @@ static int validate_bool_id_array(sepol_handle_t *handle, const uint32_t bool_id
|
||
|
|
goto bad;
|
||
|
|
|
||
|
|
for (i=0; i < nbools; i++) {
|
||
|
|
- if (validate_value(bool_ids[i], bool))
|
||
|
|
+ if (validate_value(bool_ids[i], boolean))
|
||
|
|
goto bad;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -881,14 +881,14 @@ bad:
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
|
||
|
|
-static int validate_cond_expr(sepol_handle_t *handle, const struct cond_expr *expr, const validate_t *bool)
|
||
|
|
+static int validate_cond_expr(sepol_handle_t *handle, const struct cond_expr *expr, const validate_t *boolean)
|
||
|
|
{
|
||
|
|
int depth = -1;
|
||
|
|
|
||
|
|
for (; expr; expr = expr->next) {
|
||
|
|
switch(expr->expr_type) {
|
||
|
|
case COND_BOOL:
|
||
|
|
- if (validate_value(expr->bool, bool))
|
||
|
|
+ if (validate_value(expr->bool, boolean))
|
||
|
|
goto bad;
|
||
|
|
if (depth == (COND_EXPR_MAXDEPTH - 1))
|
||
|
|
goto bad;
|
||
|
|
--
|
||
|
|
2.38.1
|
||
|
|
|