selinux.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Christian Göttsche" <cgzones@googlemail.com>
To: selinux@vger.kernel.org
Subject: [PATCH v2 4/5] libsepol: rename parameter name
Date: Thu, 21 Jul 2022 17:24:43 +0200	[thread overview]
Message-ID: <20220721152444.31690-4-cgzones@googlemail.com> (raw)
In-Reply-To: <20220721152444.31690-1-cgzones@googlemail.com>

Do not use `bool` as a parameter name, for future C version support.

Signed-off-by: Christian Göttsche <cgzones@googlemail.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 a567c411..0f399771 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.36.1


  parent reply	other threads:[~2022-07-21 15:24 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-21 15:24 [PATCH v2 1/5] libsepol: rename validate_policydb to policydb_validate Christian Göttsche
2022-07-21 15:24 ` [PATCH v2 2/5] libsepol: support const avtab_t pointer in avtab_map() Christian Göttsche
2022-07-21 15:24 ` [PATCH v2 3/5] libsepol: operate on const pointers during validation Christian Göttsche
2022-07-21 15:24 ` Christian Göttsche [this message]
2022-07-21 15:24 ` [PATCH v2 5/5] libsepol: more strict validation Christian Göttsche
2022-08-01 18:48 ` [PATCH v2 1/5] libsepol: rename validate_policydb to policydb_validate James Carter
2022-08-09 15:20   ` James Carter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220721152444.31690-4-cgzones@googlemail.com \
    --to=cgzones@googlemail.com \
    --cc=selinux@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).