From patchwork Thu Apr 20 15:35:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_G=C3=B6ttsche?= X-Patchwork-Id: 13218916 X-Patchwork-Delegate: plautrba@redhat.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D079C77B72 for ; Thu, 20 Apr 2023 15:36:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231986AbjDTPgH (ORCPT ); Thu, 20 Apr 2023 11:36:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231583AbjDTPgG (ORCPT ); Thu, 20 Apr 2023 11:36:06 -0400 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5E511988 for ; Thu, 20 Apr 2023 08:36:04 -0700 (PDT) Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-505035e3368so1083465a12.0 for ; Thu, 20 Apr 2023 08:36:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20221208; t=1682004963; x=1684596963; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=vVTqoA8tLllLhNDCsQ7R311q9QlsNbY9IhKa6WAZtDE=; b=PmO7Zd+SblHo4vbENb1mVjrBsOQxKACacsoZM97cFpywVHE3ClXlWh1dMtzOk49YgQ Rv5LGDym5hQYAONwOo2Eq8j+gFPOrNP7MGDkWPHzmkDcNWeRzy5qDThMSmTGYWkqE0ts NZjeWxIk3nDOSXSreN6Lu6QNCnQUJP8OaohFHycyaGuZoo1hCLCnY9t4N+WzRRphW0xq /cGgscNnNQ5J27y6j/QBMKAQDcVpfrr+uq2BmLckxbUWQyUs1J/oT+7xJZVPBW0sKDLz Vwj2ljAEYaPbXaxFsbSVGCeHOEP04vVIJfowv7TOYuZVpiy3krD5Ja/cRDhwc3asCdym GHHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682004963; x=1684596963; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=vVTqoA8tLllLhNDCsQ7R311q9QlsNbY9IhKa6WAZtDE=; b=hoYggvaaD9hv6iwP2Wvw4lftwEAbVUH0UaAO0FnPs3mDY3CviPViEIXvycaLFqGm1e IXZMEjnGUDipaLnQCkm2l81L+DNoEfCUkvxUjihpWh3jK+Y53fJJLhZ9IW6+ekxJ6wQF mWJ+BzR5BrHa8gz25mSl7MxSqAugkgcJRZG9MysDQQqbgEs4Itmrc+FZZ6wZ7fIqHT3/ 90fYNXfetKdDyP+nyOkRc3ko0KMy/2209VpNfxURPHJs/ZsKgKd4wTnGiVcnOOAhtgE1 /hOez89SgtC4/enOAVmMIGHlZsh3SvyOFxA5qp3CXvmvHNnp6Ul3iSIjHzaijbFZh+Qc //Bg== X-Gm-Message-State: AAQBX9c0jeJ1Fe+A9RsDmfyaQ65xHZAKthpc/EoP3xeVlFKW3kFPI6Tq dK52l7F5JnCVf1dvwW0pCsEfpWTPyVg= X-Google-Smtp-Source: AKy350ZVXtfvRNrMCNL+cG2Dd/RFp8ij2MTcTnjid44WYupy4RinHPAZQSIcXyiGFru39nFEVIFv6A== X-Received: by 2002:aa7:dc1a:0:b0:504:8173:6240 with SMTP id b26-20020aa7dc1a000000b0050481736240mr2097276edu.37.1682004962985; Thu, 20 Apr 2023 08:36:02 -0700 (PDT) Received: from debianHome.localdomain (dynamic-095-119-201-251.95.119.pool.telefonica.de. [95.119.201.251]) by smtp.gmail.com with ESMTPSA id r22-20020aa7cb96000000b0050696c2d2f6sm853013edt.88.2023.04.20.08.36.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 08:36:02 -0700 (PDT) From: =?utf-8?q?Christian_G=C3=B6ttsche?= To: selinux@vger.kernel.org Subject: [PATCH v2 1/6] libsepol: rename struct member Date: Thu, 20 Apr 2023 17:35:51 +0200 Message-Id: <20230420153556.32115-1-cgzones@googlemail.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org Avoid using the identifier `bool` to improve support with future C standards. C23 is about to make `bool` a predefined macro (see N2654). Since the type `cond_expr_t` is part of the public API it will break client applications. A quick search of the code in Debian shows only usages in checkpolicy and setools. Define a new macro signaling the renaming to simplify support of client applications for new and older versions of libsepol. Signed-off-by: Christian Göttsche Acked-by: James Carter --- v2: update version identifier in header to 3.6 --- libsepol/cil/src/cil_binary.c | 6 +++--- libsepol/include/sepol/policydb/conditional.h | 4 +++- libsepol/src/conditional.c | 14 +++++++------- libsepol/src/expand.c | 6 +++--- libsepol/src/kernel_to_cil.c | 2 +- libsepol/src/kernel_to_conf.c | 2 +- libsepol/src/link.c | 6 +++--- libsepol/src/module_to_cil.c | 2 +- libsepol/src/policydb_validate.c | 2 +- libsepol/src/write.c | 2 +- libsepol/tests/debug.c | 2 +- libsepol/tests/test-linker-cond-map.c | 2 +- 12 files changed, 26 insertions(+), 24 deletions(-) diff --git a/libsepol/cil/src/cil_binary.c b/libsepol/cil/src/cil_binary.c index 40615db2..ef7f4d70 100644 --- a/libsepol/cil/src/cil_binary.c +++ b/libsepol/cil/src/cil_binary.c @@ -2123,7 +2123,7 @@ static int __cil_cond_item_to_sepol_expr(policydb_t *pdb, struct cil_list_item * *head = cil_malloc(sizeof(cond_expr_t)); (*head)->next = NULL; (*head)->expr_type = COND_BOOL; - (*head)->bool = sepol_bool->s.value; + (*head)->boolean = sepol_bool->s.value; *tail = *head; } else if (item->flavor == CIL_LIST) { struct cil_list *l = item->data; @@ -2159,7 +2159,7 @@ static int __cil_cond_expr_to_sepol_expr_helper(policydb_t *pdb, struct cil_list enum cil_flavor cil_op = (enum cil_flavor)(uintptr_t)item->data; op = cil_malloc(sizeof(*op)); - op->bool = 0; + op->boolean = 0; op->next = NULL; switch (cil_op) { @@ -2226,7 +2226,7 @@ static int __cil_cond_expr_to_sepol_expr_helper(policydb_t *pdb, struct cil_list goto exit; } op = cil_malloc(sizeof(*op)); - op->bool = 0; + op->boolean = 0; op->next = NULL; op->expr_type = COND_OR; t1->next = h2; diff --git a/libsepol/include/sepol/policydb/conditional.h b/libsepol/include/sepol/policydb/conditional.h index 49c0d766..5318ea19 100644 --- a/libsepol/include/sepol/policydb/conditional.h +++ b/libsepol/include/sepol/policydb/conditional.h @@ -54,7 +54,9 @@ typedef struct cond_expr { #define COND_NEQ 7 /* bool != bool */ #define COND_LAST COND_NEQ uint32_t expr_type; - uint32_t bool; + /* The member `boolean` was renamed from `bool` in version 3.6 */ +#define COND_EXPR_T_RENAME_BOOL_BOOLEAN + uint32_t boolean; struct cond_expr *next; } cond_expr_t; diff --git a/libsepol/src/conditional.c b/libsepol/src/conditional.c index a620451d..24380ea0 100644 --- a/libsepol/src/conditional.c +++ b/libsepol/src/conditional.c @@ -125,7 +125,7 @@ int cond_expr_equal(cond_node_t * a, cond_node_t * b) if (cur_a->expr_type != cur_b->expr_type) return 0; if (cur_a->expr_type == COND_BOOL) { - if (cur_a->bool != cur_b->bool) + if (cur_a->boolean != cur_b->boolean) return 0; } cur_a = cur_a->next; @@ -223,7 +223,7 @@ int cond_evaluate_expr(policydb_t * p, cond_expr_t * expr) if (sp == (COND_EXPR_MAXDEPTH - 1)) return -1; sp++; - s[sp] = p->bool_val_to_struct[cur->bool - 1]->state; + s[sp] = p->bool_val_to_struct[cur->boolean - 1]->state; break; case COND_NOT: if (sp < 0) @@ -279,7 +279,7 @@ cond_expr_t *cond_copy_expr(cond_expr_t * expr) memset(new_expr, 0, sizeof(cond_expr_t)); new_expr->expr_type = cur->expr_type; - new_expr->bool = cur->bool; + new_expr->boolean = cur->boolean; if (!head) head = new_expr; @@ -388,10 +388,10 @@ int cond_normalize_expr(policydb_t * p, cond_node_t * cn) switch (e->expr_type) { case COND_BOOL: /* see if we've already seen this bool */ - if (!bool_present(e->bool, cn->bool_ids, cn->nbools)) { + if (!bool_present(e->boolean, cn->bool_ids, cn->nbools)) { /* count em all but only record up to COND_MAX_BOOLS */ if (cn->nbools < COND_MAX_BOOLS) - cn->bool_ids[cn->nbools++] = e->bool; + cn->bool_ids[cn->nbools++] = e->boolean; else cn->nbools++; } @@ -737,7 +737,7 @@ static int expr_isvalid(policydb_t * p, cond_expr_t * expr) return 0; } - if (expr->bool > p->p_bools.nprim) { + if (expr->boolean > p->p_bools.nprim) { WARN(NULL, "security: conditional expressions uses unknown bool."); return 0; } @@ -775,7 +775,7 @@ static int cond_read_node(policydb_t * p, cond_node_t * node, void *fp) memset(expr, 0, sizeof(cond_expr_t)); expr->expr_type = le32_to_cpu(buf[0]); - expr->bool = le32_to_cpu(buf[1]); + expr->boolean = le32_to_cpu(buf[1]); if (!expr_isvalid(p, expr)) { free(expr); diff --git a/libsepol/src/expand.c b/libsepol/src/expand.c index 8d19850e..1337c32f 100644 --- a/libsepol/src/expand.c +++ b/libsepol/src/expand.c @@ -2025,8 +2025,8 @@ static int cond_node_map_bools(expand_state_t * state, cond_node_t * cn) cur = cn->expr; while (cur) { - if (cur->bool) - cur->bool = state->boolmap[cur->bool - 1]; + if (cur->boolean) + cur->boolean = state->boolmap[cur->boolean - 1]; cur = cur->next; } @@ -2899,7 +2899,7 @@ static void discard_tunables(sepol_handle_t *sh, policydb_t *pol) cur_expr = cur_expr->next) { if (cur_expr->expr_type != COND_BOOL) continue; - booldatum = pol->bool_val_to_struct[cur_expr->bool - 1]; + booldatum = pol->bool_val_to_struct[cur_expr->boolean - 1]; if (booldatum->flags & COND_BOOL_FLAGS_TUNABLE) tmp[tunables++] = booldatum; else diff --git a/libsepol/src/kernel_to_cil.c b/libsepol/src/kernel_to_cil.c index ad4121d5..e9cd89c2 100644 --- a/libsepol/src/kernel_to_cil.c +++ b/libsepol/src/kernel_to_cil.c @@ -43,7 +43,7 @@ static char *cond_expr_to_str(struct policydb *pdb, struct cond_expr *expr) for (curr = expr; curr != NULL; curr = curr->next) { if (curr->expr_type == COND_BOOL) { - char *val1 = pdb->p_bool_val_to_name[curr->bool - 1]; + char *val1 = pdb->p_bool_val_to_name[curr->boolean - 1]; new_val = create_str("%s", 1, val1); } else { const char *op; diff --git a/libsepol/src/kernel_to_conf.c b/libsepol/src/kernel_to_conf.c index 73b72b5d..c48a7114 100644 --- a/libsepol/src/kernel_to_conf.c +++ b/libsepol/src/kernel_to_conf.c @@ -42,7 +42,7 @@ static char *cond_expr_to_str(struct policydb *pdb, struct cond_expr *expr) for (curr = expr; curr != NULL; curr = curr->next) { if (curr->expr_type == COND_BOOL) { - char *val1 = pdb->p_bool_val_to_name[curr->bool - 1]; + char *val1 = pdb->p_bool_val_to_name[curr->boolean - 1]; new_val = create_str("%s", 1, val1); } else { const char *op; diff --git a/libsepol/src/link.c b/libsepol/src/link.c index cbe4cea4..3b7742bc 100644 --- a/libsepol/src/link.c +++ b/libsepol/src/link.c @@ -1524,9 +1524,9 @@ static int copy_cond_list(cond_node_t * list, cond_node_t ** dst, /* expression nodes don't have a bool value of 0 - don't map them */ if (cur_expr->expr_type != COND_BOOL) continue; - assert(module->map[SYM_BOOLS][cur_expr->bool - 1] != 0); - cur_expr->bool = - module->map[SYM_BOOLS][cur_expr->bool - 1]; + assert(module->map[SYM_BOOLS][cur_expr->boolean - 1] != 0); + cur_expr->boolean = + module->map[SYM_BOOLS][cur_expr->boolean - 1]; } new_node->nbools = cur->nbools; /* FIXME should COND_MAX_BOOLS be used here? */ diff --git a/libsepol/src/module_to_cil.c b/libsepol/src/module_to_cil.c index 2b24d33e..e7bc6ee6 100644 --- a/libsepol/src/module_to_cil.c +++ b/libsepol/src/module_to_cil.c @@ -1272,7 +1272,7 @@ static int cond_expr_to_cil(int indent, struct policydb *pdb, struct cond_expr * for (curr = cond_expr; curr != NULL; curr = curr->next) { if (curr->expr_type == COND_BOOL) { - val1 = pdb->p_bool_val_to_name[curr->bool - 1]; + val1 = pdb->p_bool_val_to_name[curr->boolean - 1]; // length of boolean + 2 parens + null terminator len = strlen(val1) + 2 + 1; new_val = malloc(len); diff --git a/libsepol/src/policydb_validate.c b/libsepol/src/policydb_validate.c index 9a9ec40b..301aa200 100644 --- a/libsepol/src/policydb_validate.c +++ b/libsepol/src/policydb_validate.c @@ -974,7 +974,7 @@ static int validate_cond_expr(sepol_handle_t *handle, const struct cond_expr *ex for (; expr; expr = expr->next) { switch(expr->expr_type) { case COND_BOOL: - if (validate_value(expr->bool, boolean)) + if (validate_value(expr->boolean, boolean)) goto bad; if (depth == (COND_EXPR_MAXDEPTH - 1)) goto bad; diff --git a/libsepol/src/write.c b/libsepol/src/write.c index a9fdf93a..024fe628 100644 --- a/libsepol/src/write.c +++ b/libsepol/src/write.c @@ -834,7 +834,7 @@ static int cond_write_node(policydb_t * p, for (cur_expr = node->expr; cur_expr != NULL; cur_expr = cur_expr->next) { items = 0; buf[items++] = cpu_to_le32(cur_expr->expr_type); - buf[items++] = cpu_to_le32(cur_expr->bool); + buf[items++] = cpu_to_le32(cur_expr->boolean); items2 = put_entry(buf, sizeof(uint32_t), items, fp); if (items2 != items) return POLICYDB_ERROR; diff --git a/libsepol/tests/debug.c b/libsepol/tests/debug.c index 90aa6e0a..8494dd25 100644 --- a/libsepol/tests/debug.c +++ b/libsepol/tests/debug.c @@ -41,7 +41,7 @@ void display_expr(policydb_t * p, cond_expr_t * exp, FILE * fp) for (cur = exp; cur != NULL; cur = cur->next) { switch (cur->expr_type) { case COND_BOOL: - fprintf(fp, "%s ", p->p_bool_val_to_name[cur->bool - 1]); + fprintf(fp, "%s ", p->p_bool_val_to_name[cur->boolean - 1]); break; case COND_NOT: fprintf(fp, "! "); diff --git a/libsepol/tests/test-linker-cond-map.c b/libsepol/tests/test-linker-cond-map.c index 694a7346..6ea0e4c2 100644 --- a/libsepol/tests/test-linker-cond-map.c +++ b/libsepol/tests/test-linker-cond-map.c @@ -70,7 +70,7 @@ static void test_cond_expr_mapping(policydb_t * p, avrule_decl_t * d, test_cond_ CU_ASSERT(expr->expr_type == bools[i].expr_type); if (bools[i].bool) { - CU_ASSERT(strcmp(p->sym_val_to_name[SYM_BOOLS][expr->bool - 1], bools[i].bool) == 0); + CU_ASSERT(strcmp(p->sym_val_to_name[SYM_BOOLS][expr->boolean - 1], bools[i].bool) == 0); } expr = expr->next; } From patchwork Thu Apr 20 15:35:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_G=C3=B6ttsche?= X-Patchwork-Id: 13218917 X-Patchwork-Delegate: plautrba@redhat.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EBC6DC77B73 for ; Thu, 20 Apr 2023 15:36:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232043AbjDTPgI (ORCPT ); Thu, 20 Apr 2023 11:36:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231656AbjDTPgH (ORCPT ); Thu, 20 Apr 2023 11:36:07 -0400 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B02E30DE for ; Thu, 20 Apr 2023 08:36:05 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-5058181d58dso1080465a12.1 for ; Thu, 20 Apr 2023 08:36:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20221208; t=1682004963; x=1684596963; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=WLgg58iZrqaUL10CAl0vSIZZU8GGdUV6c6k4QWCTsns=; b=ob56HfdJR9ElXYXNba7ti8Nxtlfnb/BVaS2n2AgTPXtPA1sK6XT3HO+YD+dR74uGix QV8g81LrPJY4fcrFxYi4rL9pvIkm8dvXJn8PQOxCMVUO1BUPDuYRKc8FMzgy6Fa8SDiB CNjnVQrlxTS0qtOP3LULZuYim2MtXpDuJXLv5IVLgxb8z9IC+HHxb2ffWod2sX194q5K lhUNZxQU7tCiiNf1jGHmVtJ0RIkpi7Twm1qHdZYfEaQAznBapT+x+2RnbsUXNK0QCOl1 JuU4PXh9G3zdheWuvWnfpGznYZsK4a2Vd7dijIcINKJ7BZ0K2YF13Ay3zqsjSIYMLg2p cKRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682004963; x=1684596963; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WLgg58iZrqaUL10CAl0vSIZZU8GGdUV6c6k4QWCTsns=; b=RAjGR3nAlxMpqZ/Xs7MONHxYPdqEB4Dit3GkeV1623fDjDuUvlv+PLFiwKlg4cYdA3 xavdcO9J2jNEv0+9XY/ZP4lxGEJQIkcuD6Wd6RuUIurO/L7Ok6s+ptNXLPpxFG7qaROC 3kwdpwfAE7fy0KghwFmntVDAqYiHhIkuBs07oSJGupRnIYLgyo5bwRyqxtVS2yc1UUbu eeRQC/bQRWmqvHvdvOFOuDeQm3B98xqfHsNy8+2zgjkmP4PDR4Wy26WD1sCaMUWwSKc9 IM1IDuHbVT/MqkJRjbEOHsrOjS9vx3VDDSK5PHRw7ZUwgQOhAeS9YRlplv7WLs4vGW75 XEww== X-Gm-Message-State: AAQBX9cC9D7nU1pBpOTK18smDNH2QJtWGiva5ZReALRDVEV9bsPZyUXC c5S1Bza1sBYJTL0eEBDKXcmB+qnlzD8= X-Google-Smtp-Source: AKy350ZT4oncWLXsKwm+LR5Jo+MvhOGntxIt2rwVx4na9OIabxNAslXNNCLbkVwx4N13jbn3Z2zVvQ== X-Received: by 2002:aa7:c502:0:b0:504:adc2:80da with SMTP id o2-20020aa7c502000000b00504adc280damr1732672edq.18.1682004963463; Thu, 20 Apr 2023 08:36:03 -0700 (PDT) Received: from debianHome.localdomain (dynamic-095-119-201-251.95.119.pool.telefonica.de. [95.119.201.251]) by smtp.gmail.com with ESMTPSA id r22-20020aa7cb96000000b0050696c2d2f6sm853013edt.88.2023.04.20.08.36.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 08:36:03 -0700 (PDT) From: =?utf-8?q?Christian_G=C3=B6ttsche?= To: selinux@vger.kernel.org Subject: [PATCH v2 2/6] checkpolicy: update cond_expr_t struct member name Date: Thu, 20 Apr 2023 17:35:52 +0200 Message-Id: <20230420153556.32115-2-cgzones@googlemail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230420153556.32115-1-cgzones@googlemail.com> References: <20230420153556.32115-1-cgzones@googlemail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org The previous commit changed the member `bool` to `boolean` of the libsepol type `cond_expr_t` for C23 compatibility. Signed-off-by: Christian Göttsche --- v2: update commit description --- checkpolicy/checkpolicy.c | 2 +- checkpolicy/policy_define.c | 2 +- checkpolicy/test/dismod.c | 2 +- checkpolicy/test/dispol.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/checkpolicy/checkpolicy.c b/checkpolicy/checkpolicy.c index 48c31261..b0c36807 100644 --- a/checkpolicy/checkpolicy.c +++ b/checkpolicy/checkpolicy.c @@ -313,7 +313,7 @@ static void display_expr(const cond_expr_t * exp) switch (cur->expr_type) { case COND_BOOL: printf("%s ", - policydbp->p_bool_val_to_name[cur->bool - 1]); + policydbp->p_bool_val_to_name[cur->boolean - 1]); break; case COND_NOT: printf("! "); diff --git a/checkpolicy/policy_define.c b/checkpolicy/policy_define.c index f277e600..d4e376ad 100644 --- a/checkpolicy/policy_define.c +++ b/checkpolicy/policy_define.c @@ -4159,7 +4159,7 @@ cond_expr_t *define_cond_expr(uint32_t expr_type, void *arg1, void *arg2) free(id); return NULL; } - expr->bool = bool_var->s.value; + expr->boolean = bool_var->s.value; free(id); return expr; default: diff --git a/checkpolicy/test/dismod.c b/checkpolicy/test/dismod.c index a2d74d42..bda8d4e9 100644 --- a/checkpolicy/test/dismod.c +++ b/checkpolicy/test/dismod.c @@ -404,7 +404,7 @@ static void display_expr(policydb_t * p, cond_expr_t * exp, FILE * fp) switch (cur->expr_type) { case COND_BOOL: fprintf(fp, "%s ", - p->p_bool_val_to_name[cur->bool - 1]); + p->p_bool_val_to_name[cur->boolean - 1]); break; case COND_NOT: fprintf(fp, "! "); diff --git a/checkpolicy/test/dispol.c b/checkpolicy/test/dispol.c index 36a3362c..6561366d 100644 --- a/checkpolicy/test/dispol.c +++ b/checkpolicy/test/dispol.c @@ -197,7 +197,7 @@ static void display_expr(policydb_t * p, cond_expr_t * exp, FILE * fp) switch (cur->expr_type) { case COND_BOOL: fprintf(fp, "%s ", - p->p_bool_val_to_name[cur->bool - 1]); + p->p_bool_val_to_name[cur->boolean - 1]); break; case COND_NOT: fprintf(fp, "! "); From patchwork Thu Apr 20 15:35:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_G=C3=B6ttsche?= X-Patchwork-Id: 13218919 X-Patchwork-Delegate: plautrba@redhat.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53F62C77B7E for ; Thu, 20 Apr 2023 15:36:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232029AbjDTPgJ (ORCPT ); Thu, 20 Apr 2023 11:36:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231583AbjDTPgI (ORCPT ); Thu, 20 Apr 2023 11:36:08 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8864940E5 for ; Thu, 20 Apr 2023 08:36:05 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-953343581a4so73728766b.3 for ; Thu, 20 Apr 2023 08:36:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20221208; t=1682004964; x=1684596964; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=C96sKIRAaChBMo8h8tmv3cooYyFNHwEKdRuv7vFYqy0=; b=XjP5OSpU2SkXPK99DOr74gRXw7CB9owgyZ/1f55Z6IgN2iHq7lDgplXNO15QIQs5qK EOjU1tZ6Y/Lapw9vxvWQDxqoIs+UlPWgIQDfbS52JH6Id5L/FT8TolWRN4N0cZyuSwSd DmOK1EqUqUk3IJ7VTo5dYh2ZLvYGUS+65i5P6lXmIhX7c6U72SCOtBU9+8KN1NKN6++Q Oq3jO3EB9pyRIbk+y7C15JjNSfE0rO6cO7zsZRRg8CVfLSdbwqHT57+LvH96VTpLzhnh 8KD03R2HzctV3oOjsjWn/K1U4hQawVjrtE1n/+LDgFrN9q7V9CAyHA77c1yJ9pj7rZCO sdaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682004964; x=1684596964; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=C96sKIRAaChBMo8h8tmv3cooYyFNHwEKdRuv7vFYqy0=; b=dYKtdfX4nNstItp/UBfAav8uYWjvv7Rlfs5sIHNEjfoAQI5/U9felW270D5PLJd/rN wwqgbTlMRYP/bdoZxKGOmfYUV92o/CwcT6WRDet40eNgDskvLOX9llTmlxrcPE7X8A7T 1MD6+S4U7ZO78eEOjULg/uwd44PIBlamtzBaRxW6nDcajaLhsJVgK+PmC3BjVpp9IwWR H1xL0CqzpjHujU6hHFLHj734rB/hT8F3lBM6mhBB1ek+5yhVJpqQ25MuepDR/M6kiUeP fFWcbpIP5zi4rIvtDioznLQaMLScFwUSmDucPO05/Levbt1pM0gZMtN6OQwUFIRD8G7V N1zg== X-Gm-Message-State: AAQBX9fbXzdCS9NAmO7Nn9SI4WlghqkNiMrITor0ey0sL3IL3/vVzrpV NBrEHuC9xHMlOCzeIXkEXqSJpM8hVSI= X-Google-Smtp-Source: AKy350buQHHA33TawPkTjyUEpMXKpO4l7c34nEFyQSsaWc0ydKNc9m963f9+VS85IUxebStCQmg6qA== X-Received: by 2002:aa7:d80c:0:b0:506:2c70:3066 with SMTP id v12-20020aa7d80c000000b005062c703066mr2273002edq.21.1682004963995; Thu, 20 Apr 2023 08:36:03 -0700 (PDT) Received: from debianHome.localdomain (dynamic-095-119-201-251.95.119.pool.telefonica.de. [95.119.201.251]) by smtp.gmail.com with ESMTPSA id r22-20020aa7cb96000000b0050696c2d2f6sm853013edt.88.2023.04.20.08.36.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 08:36:03 -0700 (PDT) From: =?utf-8?q?Christian_G=C3=B6ttsche?= To: selinux@vger.kernel.org Subject: [PATCH v2 3/6] libsepol/tests: rename bool indentifiers Date: Thu, 20 Apr 2023 17:35:53 +0200 Message-Id: <20230420153556.32115-3-cgzones@googlemail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230420153556.32115-1-cgzones@googlemail.com> References: <20230420153556.32115-1-cgzones@googlemail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org Avoid using the identifier `bool` to improve support with future C standards. C23 is about to make `bool` a predefined macro (see N2654). Signed-off-by: Christian Göttsche --- libsepol/tests/test-linker-cond-map.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libsepol/tests/test-linker-cond-map.c b/libsepol/tests/test-linker-cond-map.c index 6ea0e4c2..14206666 100644 --- a/libsepol/tests/test-linker-cond-map.c +++ b/libsepol/tests/test-linker-cond-map.c @@ -51,7 +51,7 @@ */ typedef struct test_cond_expr { - const char *bool; + const char *boolean; uint32_t expr_type; } test_cond_expr_t; @@ -69,18 +69,18 @@ static void test_cond_expr_mapping(policydb_t * p, avrule_decl_t * d, test_cond_ CU_ASSERT_FATAL(expr != NULL); CU_ASSERT(expr->expr_type == bools[i].expr_type); - if (bools[i].bool) { - CU_ASSERT(strcmp(p->sym_val_to_name[SYM_BOOLS][expr->boolean - 1], bools[i].bool) == 0); + if (bools[i].boolean) { + CU_ASSERT(strcmp(p->sym_val_to_name[SYM_BOOLS][expr->boolean - 1], bools[i].boolean) == 0); } expr = expr->next; } } -static void test_bool_state(policydb_t * p, const char *bool, int state) +static void test_bool_state(policydb_t * p, const char *boolean, int state) { cond_bool_datum_t *b; - b = hashtab_search(p->p_bools.table, bool); + b = hashtab_search(p->p_bools.table, boolean); CU_ASSERT_FATAL(b != NULL); CU_ASSERT(b->state == state); } @@ -100,7 +100,7 @@ void base_cond_tests(policydb_t * base) test_sym_presence(base, "g_b_bool_1", SYM_BOOLS, SCOPE_DECL, decls, 1); test_bool_state(base, "g_b_bool_1", 0); /* conditional expression mapped correctly */ - bools[0].bool = "g_b_bool_1"; + bools[0].boolean = "g_b_bool_1"; bools[0].expr_type = COND_BOOL; test_cond_expr_mapping(base, d, bools, 1); @@ -110,7 +110,7 @@ void base_cond_tests(policydb_t * base) test_sym_presence(base, "o1_b_bool_1", SYM_BOOLS, SCOPE_DECL, decls, 1); test_bool_state(base, "o1_b_bool_1", 1); /* conditional expression mapped correctly */ - bools[0].bool = "o1_b_bool_1"; + bools[0].boolean = "o1_b_bool_1"; bools[0].expr_type = COND_BOOL; test_cond_expr_mapping(base, d, bools, 1); @@ -128,7 +128,7 @@ void module_cond_tests(policydb_t * base) test_sym_presence(base, "g_m1_bool_1", SYM_BOOLS, SCOPE_DECL, decls, 1); test_bool_state(base, "g_m1_bool_1", 1); /* conditional expression mapped correctly */ - bools[0].bool = "g_m1_bool_1"; + bools[0].boolean = "g_m1_bool_1"; bools[0].expr_type = COND_BOOL; test_cond_expr_mapping(base, d, bools, 1); @@ -138,7 +138,7 @@ void module_cond_tests(policydb_t * base) test_sym_presence(base, "o1_m1_bool_1", SYM_BOOLS, SCOPE_DECL, decls, 1); test_bool_state(base, "o1_m1_bool_1", 0); /* conditional expression mapped correctly */ - bools[0].bool = "o1_m1_bool_1"; + bools[0].boolean = "o1_m1_bool_1"; bools[0].expr_type = COND_BOOL; test_cond_expr_mapping(base, d, bools, 1); @@ -150,11 +150,11 @@ void module_cond_tests(policydb_t * base) test_bool_state(base, "g_m2_bool_1", 1); test_bool_state(base, "g_m2_bool_2", 0); /* conditional expression mapped correctly */ - bools[0].bool = "g_m2_bool_1"; + bools[0].boolean = "g_m2_bool_1"; bools[0].expr_type = COND_BOOL; - bools[1].bool = "g_m2_bool_2"; + bools[1].boolean = "g_m2_bool_2"; bools[1].expr_type = COND_BOOL; - bools[2].bool = NULL; + bools[2].boolean = NULL; bools[2].expr_type = COND_AND; test_cond_expr_mapping(base, d, bools, 3); } From patchwork Thu Apr 20 15:35:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_G=C3=B6ttsche?= X-Patchwork-Id: 13218918 X-Patchwork-Delegate: plautrba@redhat.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D284C77B7C for ; Thu, 20 Apr 2023 15:36:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231954AbjDTPgI (ORCPT ); Thu, 20 Apr 2023 11:36:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232029AbjDTPgH (ORCPT ); Thu, 20 Apr 2023 11:36:07 -0400 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E5114215 for ; Thu, 20 Apr 2023 08:36:06 -0700 (PDT) Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-506b2a08877so1084944a12.2 for ; Thu, 20 Apr 2023 08:36:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20221208; t=1682004964; x=1684596964; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=OVbQbb6YjTClV1kKmKgH6XmStC2ewwGeLiT4GUd5xns=; b=V9bUiRNdaeo+7KKZmo1hI/IA9PrUaL5tov1r8lWEsIUPlkV05nEtB89RM70xJt5Fhz DNCw5+TOgpmqWfZM6aubXwHHc+gkpKId2ZZbjjiBGBOUcwN0OZJCYuugvzTyO8J5l8jV 0X5wG1MHyLegdfZKYlwbfxKob+kLyKNbF1OhADcUFeQ/4Nzw2DlOPnw8+YZwJedU2uPg jtkBj/PJADuh3Kq/jhAyJVq1GV13UkIZZ59w1+cdR35Z007XmbmPf0U/oJbM1AEpfxme iMQnhpdquAq5kZs3D/AOaGLInHVHyLGXisZGcvJUCKR5W2ctuZJ5d2eUDP5F3Pql1e++ z/QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682004964; x=1684596964; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OVbQbb6YjTClV1kKmKgH6XmStC2ewwGeLiT4GUd5xns=; b=U8//49RdVWFD35ZoFSd53OFRtMZjq3bXEtGECDQix6f4X7uAZI1JXqjXgjtydmdoV1 uavOr6KeQK9ASyBnFmzfwSdOwaDkReUP4bHBwYKTLIKjrlgOgyRkmn9fWi2D1mgAw2N/ leDYwf/moyOrMMqQn9sXloVCF+9GILcynKl41sbAbXh7dq4jwxaWf8ZT6b9iv2+kZb1R WwHebmo1mje926kUNpSkQ3PIX4dcEysGy4NOmfQm3GEySv3gt9+f4kFxZjfW3adu9xn/ XET8XimjrcUHOc3mGOVxkXY9OJ5WK8qjloYtY0yDSvMgpNUlJg9ISoySkZE3sFUh5buK DS7g== X-Gm-Message-State: AAQBX9eHHm/iztbmU4eSJFxZvP7MMXf+WT+W5ohR+sMD+NZu2mhFzhdM 928rIBN4NUohCB75AobdtezmCNbNVI0= X-Google-Smtp-Source: AKy350ZAqmd2mOpBZKfWZRpCi8yKLX5CO+Vz1y8LosIfyht30q0wq71Bb9Gzmci+UuDR5naPivnsIg== X-Received: by 2002:aa7:c952:0:b0:4fb:d620:bd27 with SMTP id h18-20020aa7c952000000b004fbd620bd27mr2193635edt.23.1682004964500; Thu, 20 Apr 2023 08:36:04 -0700 (PDT) Received: from debianHome.localdomain (dynamic-095-119-201-251.95.119.pool.telefonica.de. [95.119.201.251]) by smtp.gmail.com with ESMTPSA id r22-20020aa7cb96000000b0050696c2d2f6sm853013edt.88.2023.04.20.08.36.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 08:36:04 -0700 (PDT) From: =?utf-8?q?Christian_G=C3=B6ttsche?= To: selinux@vger.kernel.org Subject: [PATCH v2 4/6] checkpolicy: rename bool identifiers Date: Thu, 20 Apr 2023 17:35:54 +0200 Message-Id: <20230420153556.32115-4-cgzones@googlemail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230420153556.32115-1-cgzones@googlemail.com> References: <20230420153556.32115-1-cgzones@googlemail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org Avoid using the identifier `bool` to improve support with future C standards. C23 is about to make `bool` a predefined macro (see N2654). Signed-off-by: Christian Göttsche --- checkpolicy/checkpolicy.c | 8 ++++---- checkpolicy/test/dismod.c | 8 ++++---- checkpolicy/test/dispol.c | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/checkpolicy/checkpolicy.c b/checkpolicy/checkpolicy.c index b0c36807..2485142d 100644 --- a/checkpolicy/checkpolicy.c +++ b/checkpolicy/checkpolicy.c @@ -354,14 +354,14 @@ static int display_cond_expressions(void) static int change_bool(const char *name, int state) { - cond_bool_datum_t *bool; + cond_bool_datum_t *boolean; - bool = hashtab_search(policydbp->p_bools.table, name); - if (bool == NULL) { + boolean = hashtab_search(policydbp->p_bools.table, name); + if (boolean == NULL) { printf("Could not find bool %s\n", name); return -1; } - bool->state = state; + boolean->state = state; evaluate_conds(policydbp); return 0; } diff --git a/checkpolicy/test/dismod.c b/checkpolicy/test/dismod.c index bda8d4e9..929ee308 100644 --- a/checkpolicy/test/dismod.c +++ b/checkpolicy/test/dismod.c @@ -602,14 +602,14 @@ int display_cond_expressions(policydb_t * p, FILE * fp) int change_bool(char *name, int state, policydb_t * p, FILE * fp) { - cond_bool_datum_t *bool; + cond_bool_datum_t *boolean; - bool = hashtab_search(p->p_bools.table, name); - if (bool == NULL) { + boolean = hashtab_search(p->p_bools.table, name); + if (boolean == NULL) { fprintf(fp, "Could not find bool %s\n", name); return -1; } - bool->state = state; + boolean->state = state; evaluate_conds(p); return 0; } diff --git a/checkpolicy/test/dispol.c b/checkpolicy/test/dispol.c index 6561366d..9ab6533f 100644 --- a/checkpolicy/test/dispol.c +++ b/checkpolicy/test/dispol.c @@ -262,14 +262,14 @@ static int display_handle_unknown(policydb_t * p, FILE * out_fp) static int change_bool(char *name, int state, policydb_t * p, FILE * fp) { - cond_bool_datum_t *bool; + cond_bool_datum_t *boolean; - bool = hashtab_search(p->p_bools.table, name); - if (bool == NULL) { + boolean = hashtab_search(p->p_bools.table, name); + if (boolean == NULL) { fprintf(fp, "Could not find bool %s\n", name); return -1; } - bool->state = state; + boolean->state = state; evaluate_conds(p); return 0; } From patchwork Thu Apr 20 15:35:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_G=C3=B6ttsche?= X-Patchwork-Id: 13218920 X-Patchwork-Delegate: plautrba@redhat.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C738FC7EE20 for ; Thu, 20 Apr 2023 15:36:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232071AbjDTPgJ (ORCPT ); Thu, 20 Apr 2023 11:36:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232060AbjDTPgI (ORCPT ); Thu, 20 Apr 2023 11:36:08 -0400 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74FC44C21 for ; Thu, 20 Apr 2023 08:36:06 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id c9so7437824ejz.1 for ; Thu, 20 Apr 2023 08:36:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20221208; t=1682004965; x=1684596965; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=hqmvBgNhmwPBoRhwUR3lqRV/49ryZPJXVYGqdgsKsj4=; b=saEXApb2kI4lHKbelWHypCAq6jPxD9y6BECCCZ5qoXtvXmvkyASOrJfNkXt0woh0RE uSGU8tVQV+DIh52C39/lOr7gwqDNQasXRV4hNDHSE+4wgWkwvljA7ORlYYJcJDZ9ZrS6 KpFwmGFPp1jGhgIyf80bcYoUbx8SwVde+ycXr3P5m5GM/6mRDMSP0oK+b4Hjs5sFQtl6 pW/gVzVv412l3f54pf+CF4WbNJKG4UAf5ot3ZblRO77zu5imtTwxlXLqgIbcesVq4d+e td4xC+6ndUn+sClifUhipm8TRkf7fOFRujGUqzUtzyItjJOpAfAvTHsRxgEo7v1gJ6Fq 5coA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682004965; x=1684596965; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hqmvBgNhmwPBoRhwUR3lqRV/49ryZPJXVYGqdgsKsj4=; b=SebwoB2go9qrJQsA/MgQ1UpK8eQJyUWIggYPgWSR21qPwJXppQSpPazssIFRiDlg+y LLBgsMI1JRLxiRI6vEhMQOTGzvi10DUTU2yiEdZfBMXbF4j9pMYRlmEdalQlwaebBKf0 +Y2QwS4rNyqI82bOWmaEqn8D8QItQfj9urGW5LZ8FiLLygymnAv2Vm0FmRnF1NdM2eUo VqIrGYGy5D+XXIPk3ifTIXrErH4BbU/XJBrKBGHfFNX6suNfIIpqFhbOeFk1ljs2USqD kjKTvHR5GaHvzUzfmJa2muH10+CI5kLSYKIPbEmQ2pZwrc4yvOwUNjMoiy4iyEB9it8b Z8oA== X-Gm-Message-State: AAQBX9dF9U7d75h08x8LRGIkC9XVJ1Wm6HB84L+L2w0N4p0uhTvs0+Fx ax+c70MAk9qNY/6l53vot7rN+WPgZd8= X-Google-Smtp-Source: AKy350aJTyCExYYpd6z4yy6+lbuL1/MI9fOAKiRGiZS6PyNXnUF1vUbvcvlxTSac+bQjhHLTpOzLWQ== X-Received: by 2002:a17:906:8245:b0:94f:6d10:ad9f with SMTP id f5-20020a170906824500b0094f6d10ad9fmr1829979ejx.42.1682004965024; Thu, 20 Apr 2023 08:36:05 -0700 (PDT) Received: from debianHome.localdomain (dynamic-095-119-201-251.95.119.pool.telefonica.de. [95.119.201.251]) by smtp.gmail.com with ESMTPSA id r22-20020aa7cb96000000b0050696c2d2f6sm853013edt.88.2023.04.20.08.36.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 08:36:04 -0700 (PDT) From: =?utf-8?q?Christian_G=C3=B6ttsche?= To: selinux@vger.kernel.org Subject: [PATCH v2 5/6] libsepol: rename bool identifiers Date: Thu, 20 Apr 2023 17:35:55 +0200 Message-Id: <20230420153556.32115-5-cgzones@googlemail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230420153556.32115-1-cgzones@googlemail.com> References: <20230420153556.32115-1-cgzones@googlemail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org Avoid using the identifier `bool` to improve support with future C standards. C23 is about to make `bool` a predefined macro (see N2654). Signed-off-by: Christian Göttsche --- libsepol/cil/src/cil_binary.c | 8 ++++---- libsepol/cil/src/cil_policy.c | 12 ++++++------ libsepol/src/expand.c | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/libsepol/cil/src/cil_binary.c b/libsepol/cil/src/cil_binary.c index ef7f4d70..c4ee2380 100644 --- a/libsepol/cil/src/cil_binary.c +++ b/libsepol/cil/src/cil_binary.c @@ -4170,13 +4170,13 @@ static int __cil_user_val_array_insert(hashtab_key_t key, hashtab_datum_t datum, static int __cil_bool_val_array_insert(hashtab_key_t key, hashtab_datum_t datum, void *data) { policydb_t *pdb = data; - cond_bool_datum_t *bool = (cond_bool_datum_t *)datum; + cond_bool_datum_t *boolean = (cond_bool_datum_t *)datum; - if (bool->s.value < 1 || bool->s.value > pdb->p_bools.nprim) { + if (boolean->s.value < 1 || boolean->s.value > pdb->p_bools.nprim) { return -EINVAL; } - pdb->p_bool_val_to_name[bool->s.value - 1] = (char *)key; - pdb->bool_val_to_struct[bool->s.value - 1] = bool; + pdb->p_bool_val_to_name[boolean->s.value - 1] = (char *)key; + pdb->bool_val_to_struct[boolean->s.value - 1] = boolean; return 0; } diff --git a/libsepol/cil/src/cil_policy.c b/libsepol/cil/src/cil_policy.c index 7c543c47..feb97868 100644 --- a/libsepol/cil/src/cil_policy.c +++ b/libsepol/cil/src/cil_policy.c @@ -1008,13 +1008,13 @@ static void cil_validatetrans_to_policy(FILE *out, struct cil_db *db, struct cil static void cil_bools_to_policy(FILE *out, struct cil_list *bools) { struct cil_list_item *i1; - struct cil_bool *bool; + struct cil_bool *boolean; const char *value; cil_list_for_each(i1, bools) { - bool = i1->data; - value = bool->value ? "true" : "false"; - fprintf(out, "bool %s %s;\n", bool->datum.fqn, value); + boolean = i1->data; + value = boolean->value ? "true" : "false"; + fprintf(out, "bool %s %s;\n", boolean->datum.fqn, value); } } @@ -1437,12 +1437,12 @@ static int __cil_te_rules_to_policy_helper(struct cil_tree_node *node, uint32_t *finished = CIL_TREE_SKIP_HEAD; break; case CIL_BOOLEANIF: { - struct cil_booleanif *bool = node->data; + struct cil_booleanif *boolean = node->data; struct cil_tree_node *n; struct cil_condblock *cb; fprintf(args->out, "if "); - cil_cond_expr_to_policy(args->out, bool->datum_expr, CIL_TRUE); + cil_cond_expr_to_policy(args->out, boolean->datum_expr, CIL_TRUE); fprintf(args->out," {\n"); n = node->cl_head; cb = n != NULL ? n->data : NULL; diff --git a/libsepol/src/expand.c b/libsepol/src/expand.c index 1337c32f..c08d3a35 100644 --- a/libsepol/src/expand.c +++ b/libsepol/src/expand.c @@ -1106,11 +1106,11 @@ static int bool_copy_callback(hashtab_key_t key, hashtab_datum_t datum, { int ret; expand_state_t *state; - cond_bool_datum_t *bool, *new_bool; + cond_bool_datum_t *boolean, *new_bool; char *id, *new_id; id = key; - bool = (cond_bool_datum_t *) datum; + boolean = (cond_bool_datum_t *) datum; state = (expand_state_t *) data; if (!is_id_enabled(id, state->base, SYM_BOOLS)) { @@ -1118,7 +1118,7 @@ static int bool_copy_callback(hashtab_key_t key, hashtab_datum_t datum, return 0; } - if (bool->flags & COND_BOOL_FLAGS_TUNABLE) { + if (boolean->flags & COND_BOOL_FLAGS_TUNABLE) { /* Skip tunables */ return 0; } @@ -1152,10 +1152,10 @@ static int bool_copy_callback(hashtab_key_t key, hashtab_datum_t datum, return -1; } - state->boolmap[bool->s.value - 1] = new_bool->s.value; + state->boolmap[boolean->s.value - 1] = new_bool->s.value; - new_bool->state = bool->state; - new_bool->flags = bool->flags; + new_bool->state = boolean->state; + new_bool->flags = boolean->flags; return 0; } From patchwork Thu Apr 20 15:35:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_G=C3=B6ttsche?= X-Patchwork-Id: 13218921 X-Patchwork-Delegate: plautrba@redhat.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0D94C77B73 for ; Thu, 20 Apr 2023 15:36:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232060AbjDTPgL (ORCPT ); Thu, 20 Apr 2023 11:36:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231656AbjDTPgI (ORCPT ); Thu, 20 Apr 2023 11:36:08 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49AA01988 for ; Thu, 20 Apr 2023 08:36:07 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-5069097bac7so1086098a12.0 for ; Thu, 20 Apr 2023 08:36:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20221208; t=1682004965; x=1684596965; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Ja/YyX4eH/J/H69z/28GvNm5nE7Ma9kH8qL3caDpr/0=; b=nuIGnDbROKRxh3Yp8qccevZ0U/8ojoS/ovu5wklD0BaxioBbogu+lqk2kcAas4z6UY HT7wmw/YcFLRVXcWSLRXo+4uKPK8Dt5wD8i61uzJ9/FftSGCZ0UJ73MDgEFqIGaCOZwe AT7bA2480/jtT9FkvVUBzj7merQAEyzG7oXcnETxSwjYvjOSqC7MmXmJytLM1Tg5eNy0 vwxB7l8e2s+mLQGAd6YpaOHQmMGebQhPPYf9U+kVup0/rLHnkWMZUbMEFUrrh2lu3zZR m5XrreJIxR38z3g5+qkQ0OKelrhE8WlsoD+wh2lArZVh9dbkY2RG4dFI95vP1mL9BZfX 3etg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682004965; x=1684596965; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ja/YyX4eH/J/H69z/28GvNm5nE7Ma9kH8qL3caDpr/0=; b=T7UBTrxQHFx+yxDSgJQd5kHJ2fpNkJol+JAbvPHieJja0QFDya9Id5FuJqKRmblinb SPVaZ/GQLnm+VI8WX0RJtDahZ4Y34Am4Os8zNOXshxEcUgkEYNslqB/vlu8CYbM6td9z LWxbHgi9vIKlngO9a4c+7t92JQ/jpw3H5DwFOg6bRGK3xnu8anCFM1IM4RY8O25K3Z8p BaGkhpeQJuc+d3ICilvI8OU+Syy+ytx0+DRo5N9lcWn4N3t39IUSCq9+ehegYAJkOtoU ygK90sFScboQf+5JdWnRbh7wekECfuRdIcSwOXh5j3KVGoe1qt14UlNbRXwDWXDKLUVB awjA== X-Gm-Message-State: AAQBX9eUdqYaVwCtsOXAAMvfGlZ2+Xgn/20E6+L9bPtqR2ggAOtex0LK Kx04hRkaZpqPPhm2Dey0BlEXqkQAYjM= X-Google-Smtp-Source: AKy350ZHd5O4VODJ2HtfjdtiFvUYwOILVXbkisyAhGR3Mv4RGR602WnqRK2el9zO55ag47Fz6bn+gg== X-Received: by 2002:a05:6402:6c7:b0:506:83fc:2dab with SMTP id n7-20020a05640206c700b0050683fc2dabmr2787692edy.22.1682004965490; Thu, 20 Apr 2023 08:36:05 -0700 (PDT) Received: from debianHome.localdomain (dynamic-095-119-201-251.95.119.pool.telefonica.de. [95.119.201.251]) by smtp.gmail.com with ESMTPSA id r22-20020aa7cb96000000b0050696c2d2f6sm853013edt.88.2023.04.20.08.36.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 08:36:05 -0700 (PDT) From: =?utf-8?q?Christian_G=C3=B6ttsche?= To: selinux@vger.kernel.org Subject: [PATCH v2 6/6] libsemanage/tests: rename bool identifiers Date: Thu, 20 Apr 2023 17:35:56 +0200 Message-Id: <20230420153556.32115-6-cgzones@googlemail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230420153556.32115-1-cgzones@googlemail.com> References: <20230420153556.32115-1-cgzones@googlemail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org Avoid using the identifier `bool` to improve support with future C standards. C23 is about to make `bool` a predefined macro (see N2654). Signed-off-by: Christian Göttsche --- libsemanage/tests/libsemanage-tests.c | 2 +- libsemanage/tests/test_bool.c | 6 +++--- libsemanage/tests/test_bool.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libsemanage/tests/libsemanage-tests.c b/libsemanage/tests/libsemanage-tests.c index ee176703..1d41a03b 100644 --- a/libsemanage/tests/libsemanage-tests.c +++ b/libsemanage/tests/libsemanage-tests.c @@ -73,7 +73,7 @@ static bool do_tests(int interactive, int verbose) DECLARE_SUITE(semanage_store); DECLARE_SUITE(semanage_utilities); DECLARE_SUITE(handle); - DECLARE_SUITE(bool); + DECLARE_SUITE(boolean); DECLARE_SUITE(fcontext); DECLARE_SUITE(iface); DECLARE_SUITE(ibendport); diff --git a/libsemanage/tests/test_bool.c b/libsemanage/tests/test_bool.c index 672544bb..9356a1ae 100644 --- a/libsemanage/tests/test_bool.c +++ b/libsemanage/tests/test_bool.c @@ -57,7 +57,7 @@ static void test_bool_list_local(void); extern semanage_handle_t *sh; -int bool_test_init(void) +int boolean_test_init(void) { if (create_test_store() < 0) { fprintf(stderr, "Could not create test store\n"); @@ -72,7 +72,7 @@ int bool_test_init(void) return 0; } -int bool_test_cleanup(void) +int boolean_test_cleanup(void) { if (destroy_test_store() < 0) { fprintf(stderr, "Could not destroy test store\n"); @@ -82,7 +82,7 @@ int bool_test_cleanup(void) return 0; } -int bool_add_tests(CU_pSuite suite) +int boolean_add_tests(CU_pSuite suite) { CU_add_test(suite, "bool_key_create", test_bool_key_create); CU_add_test(suite, "bool_key_extract", test_bool_key_extract); diff --git a/libsemanage/tests/test_bool.h b/libsemanage/tests/test_bool.h index b5b5a603..985c1f06 100644 --- a/libsemanage/tests/test_bool.h +++ b/libsemanage/tests/test_bool.h @@ -24,8 +24,8 @@ #include #include "semanage/semanage.h" -int bool_test_init(void); -int bool_test_cleanup(void); -int bool_add_tests(CU_pSuite suite); +int boolean_test_init(void); +int boolean_test_cleanup(void); +int boolean_add_tests(CU_pSuite suite); #endif