|
 |
212ad1 |
From 34f3ecbcffaa0ede0252d015d381cef847432fa0 Mon Sep 17 00:00:00 2001
|
|
|
212ad1 |
From: James Carter <jwcart2@gmail.com>
|
|
|
212ad1 |
Date: Tue, 30 Mar 2021 13:39:13 -0400
|
|
|
212ad1 |
Subject: [PATCH] libsepol/cil: Cleanup build AST helper functions
|
|
|
212ad1 |
|
|
|
212ad1 |
Since parse_current, finished, and extra_args can never be NULL,
|
|
|
212ad1 |
remove the useless check and directly assign local variables from
|
|
|
212ad1 |
extra_args.
|
|
|
212ad1 |
|
|
|
212ad1 |
Signed-off-by: James Carter <jwcart2@gmail.com>
|
|
|
212ad1 |
---
|
|
|
212ad1 |
libsepol/cil/src/cil_build_ast.c | 44 ++++++++------------------------
|
|
|
212ad1 |
1 file changed, 10 insertions(+), 34 deletions(-)
|
|
|
212ad1 |
|
|
|
212ad1 |
diff --git a/libsepol/cil/src/cil_build_ast.c b/libsepol/cil/src/cil_build_ast.c
|
|
|
212ad1 |
index 6d5a57fa..b7245dbc 100644
|
|
|
212ad1 |
--- a/libsepol/cil/src/cil_build_ast.c
|
|
|
212ad1 |
+++ b/libsepol/cil/src/cil_build_ast.c
|
|
|
212ad1 |
@@ -6071,28 +6071,16 @@ void cil_destroy_src_info(struct cil_src_info *info)
|
|
|
212ad1 |
|
|
|
212ad1 |
int __cil_build_ast_node_helper(struct cil_tree_node *parse_current, uint32_t *finished, void *extra_args)
|
|
|
212ad1 |
{
|
|
|
212ad1 |
- struct cil_args_build *args = NULL;
|
|
|
212ad1 |
- struct cil_tree_node *ast_current = NULL;
|
|
|
212ad1 |
- struct cil_db *db = NULL;
|
|
|
212ad1 |
+ struct cil_args_build *args = extra_args;
|
|
|
212ad1 |
+ struct cil_db *db = args->db;
|
|
|
212ad1 |
+ struct cil_tree_node *ast_current = args->ast;
|
|
|
212ad1 |
+ struct cil_tree_node *tunif = args->tunif;
|
|
|
212ad1 |
+ struct cil_tree_node *in = args->in;
|
|
|
212ad1 |
+ struct cil_tree_node *macro = args->macro;
|
|
|
212ad1 |
+ struct cil_tree_node *boolif = args->boolif;
|
|
|
212ad1 |
struct cil_tree_node *ast_node = NULL;
|
|
|
212ad1 |
- struct cil_tree_node *tunif = NULL;
|
|
|
212ad1 |
- struct cil_tree_node *in = NULL;
|
|
|
212ad1 |
- struct cil_tree_node *macro = NULL;
|
|
|
212ad1 |
- struct cil_tree_node *boolif = NULL;
|
|
|
212ad1 |
int rc = SEPOL_ERR;
|
|
|
212ad1 |
|
|
|
212ad1 |
- if (parse_current == NULL || finished == NULL || extra_args == NULL) {
|
|
|
212ad1 |
- goto exit;
|
|
|
212ad1 |
- }
|
|
|
212ad1 |
-
|
|
|
212ad1 |
- args = extra_args;
|
|
|
212ad1 |
- ast_current = args->ast;
|
|
|
212ad1 |
- db = args->db;
|
|
|
212ad1 |
- tunif = args->tunif;
|
|
|
212ad1 |
- in = args->in;
|
|
|
212ad1 |
- macro = args->macro;
|
|
|
212ad1 |
- boolif = args->boolif;
|
|
|
212ad1 |
-
|
|
|
212ad1 |
if (parse_current->parent->cl_head != parse_current) {
|
|
|
212ad1 |
/* ignore anything that isn't following a parenthesis */
|
|
|
212ad1 |
rc = SEPOL_OK;
|
|
|
212ad1 |
@@ -6480,20 +6468,11 @@ exit:
|
|
|
212ad1 |
|
|
|
212ad1 |
int __cil_build_ast_last_child_helper(struct cil_tree_node *parse_current, void *extra_args)
|
|
|
212ad1 |
{
|
|
|
212ad1 |
- int rc = SEPOL_ERR;
|
|
|
212ad1 |
- struct cil_tree_node *ast = NULL;
|
|
|
212ad1 |
- struct cil_args_build *args = NULL;
|
|
|
212ad1 |
-
|
|
|
212ad1 |
- if (extra_args == NULL) {
|
|
|
212ad1 |
- goto exit;
|
|
|
212ad1 |
- }
|
|
|
212ad1 |
-
|
|
|
212ad1 |
- args = extra_args;
|
|
|
212ad1 |
- ast = args->ast;
|
|
|
212ad1 |
+ struct cil_args_build *args = extra_args;
|
|
|
212ad1 |
+ struct cil_tree_node *ast = args->ast;
|
|
|
212ad1 |
|
|
|
212ad1 |
if (ast->flavor == CIL_ROOT) {
|
|
|
212ad1 |
- rc = SEPOL_OK;
|
|
|
212ad1 |
- goto exit;
|
|
|
212ad1 |
+ return SEPOL_OK;
|
|
|
212ad1 |
}
|
|
|
212ad1 |
|
|
|
212ad1 |
args->ast = ast->parent;
|
|
|
212ad1 |
@@ -6522,9 +6501,6 @@ int __cil_build_ast_last_child_helper(struct cil_tree_node *parse_current, void
|
|
|
212ad1 |
cil_tree_children_destroy(parse_current->parent);
|
|
|
212ad1 |
|
|
|
212ad1 |
return SEPOL_OK;
|
|
|
212ad1 |
-
|
|
|
212ad1 |
-exit:
|
|
|
212ad1 |
- return rc;
|
|
|
212ad1 |
}
|
|
|
212ad1 |
|
|
|
212ad1 |
int cil_build_ast(struct cil_db *db, struct cil_tree_node *parse_tree, struct cil_tree_node *ast)
|
|
|
212ad1 |
--
|
|
|
212ad1 |
2.30.2
|
|
|
212ad1 |
|