From: James Carter <jwcart2@gmail.com>
To: "Christian Göttsche" <cgzones@googlemail.com>
Cc: SElinux list <selinux@vger.kernel.org>
Subject: Re: [PATCH 08/23] libsepol/cil: follow declaration-after-statement
Date: Mon, 21 Jun 2021 16:56:46 -0400 [thread overview]
Message-ID: <CAP+JOzRpK_CXtqvGSdu0WmGH56pjBaVK2hibcRmvnzkHx0xu8A@mail.gmail.com> (raw)
In-Reply-To: <20210608155912.32047-9-cgzones@googlemail.com>
On Tue, Jun 8, 2021 at 12:01 PM Christian Göttsche
<cgzones@googlemail.com> wrote:
>
> Follow the project style of no declaration after statement.
>
> Found by the gcc warning -Wdeclaration-after-statement
>
> Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
Acked-by: James Carter <jwcart2@gmail.com>
> ---
> libsepol/cil/src/cil_binary.c | 5 +++--
> libsepol/cil/src/cil_build_ast.c | 5 +++--
> libsepol/cil/src/cil_fqn.c | 3 ++-
> libsepol/cil/src/cil_list.c | 7 ++++---
> libsepol/cil/src/cil_post.c | 2 +-
> libsepol/cil/src/cil_resolve_ast.c | 6 +++---
> libsepol/cil/src/cil_strpool.c | 3 ++-
> 7 files changed, 18 insertions(+), 13 deletions(-)
>
> diff --git a/libsepol/cil/src/cil_binary.c b/libsepol/cil/src/cil_binary.c
> index 18532aad..85094b01 100644
> --- a/libsepol/cil/src/cil_binary.c
> +++ b/libsepol/cil/src/cil_binary.c
> @@ -593,11 +593,11 @@ exit:
> int __cil_typeattr_bitmap_init(policydb_t *pdb)
> {
> int rc = SEPOL_ERR;
> + uint32_t i;
>
> pdb->type_attr_map = cil_malloc(pdb->p_types.nprim * sizeof(ebitmap_t));
> pdb->attr_type_map = cil_malloc(pdb->p_types.nprim * sizeof(ebitmap_t));
>
> - uint32_t i = 0;
> for (i = 0; i < pdb->p_types.nprim; i++) {
> ebitmap_init(&pdb->type_attr_map[i]);
> ebitmap_init(&pdb->attr_type_map[i]);
> @@ -2657,6 +2657,7 @@ int __cil_constrain_expr_to_sepol_expr_helper(policydb_t *pdb, const struct cil_
> int rc = SEPOL_ERR;
> struct cil_list_item *item;
> enum cil_flavor flavor;
> + enum cil_flavor cil_op;
> constraint_expr_t *op, *h1, *h2, *t1, *t2;
> int is_leaf = CIL_FALSE;
>
> @@ -2673,7 +2674,7 @@ int __cil_constrain_expr_to_sepol_expr_helper(policydb_t *pdb, const struct cil_
> goto exit;
> }
>
> - enum cil_flavor cil_op = (enum cil_flavor)(uintptr_t)item->data;
> + cil_op = (enum cil_flavor)(uintptr_t)item->data;
> switch (cil_op) {
> case CIL_NOT:
> op->expr_type = CEXPR_NOT;
> diff --git a/libsepol/cil/src/cil_build_ast.c b/libsepol/cil/src/cil_build_ast.c
> index 42d10c87..9a9bc598 100644
> --- a/libsepol/cil/src/cil_build_ast.c
> +++ b/libsepol/cil/src/cil_build_ast.c
> @@ -5173,6 +5173,7 @@ int cil_gen_macro(struct cil_db *db, struct cil_tree_node *parse_current, struct
> char *key = NULL;
> struct cil_macro *macro = NULL;
> struct cil_tree_node *macro_content = NULL;
> + struct cil_tree_node *current_item;
> enum cil_syntax syntax[] = {
> CIL_SYN_STRING,
> CIL_SYN_STRING,
> @@ -5195,7 +5196,7 @@ int cil_gen_macro(struct cil_db *db, struct cil_tree_node *parse_current, struct
>
> key = parse_current->next->data;
>
> - struct cil_tree_node *current_item = parse_current->next->next->cl_head;
> + current_item = parse_current->next->next->cl_head;
> while (current_item != NULL) {
> enum cil_syntax param_syntax[] = {
> CIL_SYN_STRING,
> @@ -5205,6 +5206,7 @@ int cil_gen_macro(struct cil_db *db, struct cil_tree_node *parse_current, struct
> int param_syntax_len = sizeof(param_syntax)/sizeof(*param_syntax);
> char *kind = NULL;
> struct cil_param *param = NULL;
> + struct cil_list_item *curr_param;
>
> rc =__cil_verify_syntax(current_item->cl_head, param_syntax, param_syntax_len);
> if (rc != SEPOL_OK) {
> @@ -5263,7 +5265,6 @@ int cil_gen_macro(struct cil_db *db, struct cil_tree_node *parse_current, struct
> }
>
> //walk current list and check for duplicate parameters
> - struct cil_list_item *curr_param;
> cil_list_for_each(curr_param, macro->params) {
> if (param->str == ((struct cil_param*)curr_param->data)->str) {
> cil_log(CIL_ERR, "Duplicate parameter\n");
> diff --git a/libsepol/cil/src/cil_fqn.c b/libsepol/cil/src/cil_fqn.c
> index 097222a8..46db069b 100644
> --- a/libsepol/cil/src/cil_fqn.c
> +++ b/libsepol/cil/src/cil_fqn.c
> @@ -78,12 +78,13 @@ static int __cil_fqn_qualify_blocks(__attribute__((unused)) hashtab_key_t k, has
> struct cil_tree_node *node = NODE(datum);
> int i;
> int rc = SEPOL_OK;
> + int newlen;
>
> if (node->flavor != CIL_BLOCK) {
> goto exit;
> }
>
> - int newlen = fqn_args->len + strlen(datum->name) + 1;
> + newlen = fqn_args->len + strlen(datum->name) + 1;
> if (newlen >= CIL_MAX_NAME_LENGTH) {
> cil_log(CIL_INFO, "Fully qualified name for block %s is too long\n", datum->name);
> rc = SEPOL_ERR;
> diff --git a/libsepol/cil/src/cil_list.c b/libsepol/cil/src/cil_list.c
> index 4e7843cb..8a426f1f 100644
> --- a/libsepol/cil/src/cil_list.c
> +++ b/libsepol/cil/src/cil_list.c
> @@ -55,15 +55,16 @@ void cil_list_init(struct cil_list **list, enum cil_flavor flavor)
>
> void cil_list_destroy(struct cil_list **list, unsigned destroy_data)
> {
> + struct cil_list_item *item;
> +
> if (*list == NULL) {
> return;
> }
>
> - struct cil_list_item *item = (*list)->head;
> - struct cil_list_item *next = NULL;
> + item = (*list)->head;
> while (item != NULL)
> {
> - next = item->next;
> + struct cil_list_item *next = item->next;
> if (item->flavor == CIL_LIST) {
> cil_list_destroy((struct cil_list**)&(item->data), destroy_data);
> free(item);
> diff --git a/libsepol/cil/src/cil_post.c b/libsepol/cil/src/cil_post.c
> index 05842b64..7bca0834 100644
> --- a/libsepol/cil/src/cil_post.c
> +++ b/libsepol/cil/src/cil_post.c
> @@ -213,8 +213,8 @@ int cil_post_filecon_compare(const void *a, const void *b)
> struct fc_data *a_data = cil_malloc(sizeof(*a_data));
> struct fc_data *b_data = cil_malloc(sizeof(*b_data));
> char *a_path = cil_malloc(strlen(a_filecon->path_str) + 1);
> - a_path[0] = '\0';
> char *b_path = cil_malloc(strlen(b_filecon->path_str) + 1);
> + a_path[0] = '\0';
> b_path[0] = '\0';
> strcat(a_path, a_filecon->path_str);
> strcat(b_path, b_filecon->path_str);
> diff --git a/libsepol/cil/src/cil_resolve_ast.c b/libsepol/cil/src/cil_resolve_ast.c
> index d8481002..a322b1b7 100644
> --- a/libsepol/cil/src/cil_resolve_ast.c
> +++ b/libsepol/cil/src/cil_resolve_ast.c
> @@ -3949,10 +3949,10 @@ int __cil_resolve_ast_node_helper(struct cil_tree_node *node, uint32_t *finished
> enum cil_log_level lvl = CIL_ERR;
>
> if (optional != NULL) {
> - lvl = CIL_INFO;
> -
> struct cil_optional *opt = (struct cil_optional *)optional->data;
> - struct cil_tree_node *opt_node = NODE(opt);;
> + struct cil_tree_node *opt_node = NODE(opt);
> +
> + lvl = CIL_INFO;
> /* disable an optional if something failed to resolve */
> opt->enabled = CIL_FALSE;
> cil_tree_log(node, lvl, "Failed to resolve %s statement", cil_node_to_string(node));
> diff --git a/libsepol/cil/src/cil_strpool.c b/libsepol/cil/src/cil_strpool.c
> index 2598bbf3..70bca363 100644
> --- a/libsepol/cil/src/cil_strpool.c
> +++ b/libsepol/cil/src/cil_strpool.c
> @@ -75,9 +75,10 @@ char *cil_strpool_add(const char *str)
>
> strpool_ref = hashtab_search(cil_strpool_tab, (hashtab_key_t)str);
> if (strpool_ref == NULL) {
> + int rc;
> strpool_ref = cil_malloc(sizeof(*strpool_ref));
> strpool_ref->str = cil_strdup(str);
> - int rc = hashtab_insert(cil_strpool_tab, (hashtab_key_t)strpool_ref->str, strpool_ref);
> + rc = hashtab_insert(cil_strpool_tab, (hashtab_key_t)strpool_ref->str, strpool_ref);
> if (rc != SEPOL_OK) {
> pthread_mutex_unlock(&cil_strpool_mutex);
> cil_log(CIL_ERR, "Failed to allocate memory\n");
> --
> 2.32.0
>
next prev parent reply other threads:[~2021-06-21 20:56 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-08 15:58 [PATCH 00/23] libsepol: miscellaneous cleanup Christian Göttsche
2021-06-08 15:58 ` [PATCH 01/23] libsepol: fix typos Christian Göttsche
2021-06-21 20:54 ` James Carter
2021-06-08 15:58 ` [PATCH 02/23] libsepol: resolve missing prototypes Christian Göttsche
2021-06-21 20:55 ` James Carter
2021-06-08 15:58 ` [PATCH 03/23] libsepol: remove unused functions Christian Göttsche
2021-06-21 20:54 ` James Carter
2021-06-08 15:58 ` [PATCH 04/23] libsepol: ignore UBSAN false-positives Christian Göttsche
2021-06-09 13:44 ` Ondrej Mosnacek
2021-06-09 14:05 ` James Carter
2021-07-01 18:06 ` [PATCH v2 1/3] " Christian Göttsche
2021-07-12 7:34 ` Nicolas Iooss
2021-07-13 19:59 ` Nicolas Iooss
2021-06-08 15:58 ` [PATCH 05/23] libsepol: avoid implicit conversions Christian Göttsche
2021-06-09 13:47 ` Ondrej Mosnacek
2021-07-01 18:06 ` [PATCH v2 2/3] " Christian Göttsche
2021-07-12 7:36 ` Nicolas Iooss
2021-07-13 20:01 ` Nicolas Iooss
2021-06-08 15:58 ` [PATCH 06/23] libsepol: avoid unsigned integer overflow Christian Göttsche
2021-06-21 20:58 ` James Carter
2021-06-08 15:58 ` [PATCH 07/23] libsepol: follow declaration-after-statement Christian Göttsche
2021-06-21 20:57 ` James Carter
2021-06-08 15:58 ` [PATCH 08/23] libsepol/cil: " Christian Göttsche
2021-06-21 20:56 ` James Carter [this message]
2021-06-08 15:58 ` [PATCH 09/23] libsepol: remove dead stores Christian Göttsche
2021-06-08 15:58 ` [PATCH 10/23] libsepol: mark read-only parameters of ebitmap interfaces const Christian Göttsche
2021-06-21 20:55 ` James Carter
2021-06-08 15:59 ` [PATCH 11/23] libsepol: mark read-only parameters of type_set_ " Christian Göttsche
2021-06-21 20:58 ` James Carter
2021-06-08 15:59 ` [PATCH 12/23] libsepol: do not allocate memory of size 0 Christian Göttsche
2021-06-21 20:59 ` James Carter
2021-06-08 15:59 ` [PATCH 13/23] libsepol: assure string NUL-termination Christian Göttsche
2021-06-09 14:38 ` James Carter
2021-07-01 18:07 ` [PATCH v2 3/3] libsepol: assure string NUL-termination of ibdev_name Christian Göttsche
2021-07-12 7:35 ` Nicolas Iooss
2021-07-13 19:59 ` Nicolas Iooss
2021-06-08 15:59 ` [PATCH 14/23] libsepol: remove dead stores Christian Göttsche
2021-06-08 15:59 ` [PATCH 15/23] libsepol/cil: silence cast warning Christian Göttsche
2021-06-21 20:58 ` James Carter
2021-06-08 15:59 ` [PATCH 16/23] libsepol/cil: drop extra semicolon Christian Göttsche
2021-06-21 20:57 ` James Carter
2021-06-08 15:59 ` [PATCH 17/23] libsepol/cil: drop dead store Christian Göttsche
2021-06-21 20:56 ` James Carter
2021-06-08 15:59 ` [PATCH 18/23] libsepol/cil: drop unnecessary casts Christian Göttsche
2021-06-21 20:55 ` James Carter
2021-06-08 15:59 ` [PATCH 19/23] libsepol/cil: avoid using maybe uninitialized variables Christian Göttsche
2021-06-21 21:00 ` James Carter
2021-06-08 15:59 ` [PATCH 20/23] libsepol: drop repeated semicolons Christian Göttsche
2021-06-21 20:54 ` James Carter
2021-06-08 15:59 ` [PATCH 21/23] libsepol: drop unnecessary casts Christian Göttsche
2021-06-21 20:57 ` James Carter
2021-06-08 15:59 ` [PATCH 22/23] libsepol: declare file local variable static Christian Göttsche
2021-06-21 21:00 ` James Carter
2021-06-08 15:59 ` [PATCH 23/23] libsepol: declare read-only arrays const Christian Göttsche
2021-06-21 20:59 ` James Carter
2021-06-24 14:29 ` [PATCH 00/23] libsepol: miscellaneous cleanup 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=CAP+JOzRpK_CXtqvGSdu0WmGH56pjBaVK2hibcRmvnzkHx0xu8A@mail.gmail.com \
--to=jwcart2@gmail.com \
--cc=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.