@@ -3661,21 +3615,17 @@ static int cil_check_for_bad_inheritance(struct cil_tree_node *node)
return rc;
}
-static int __cil_resolve_ast_node(struct cil_tree_node *node, void *extra_args)
+static int __cil_resolve_ast_node(struct cil_tree_node *node, struct cil_args_resolve *args)
{
int rc = SEPOL_OK;
- struct cil_args_resolve *args = extra_args;
+ struct cil_db *db = args->db;
enum cil_pass pass = 0;
- if (node == NULL || args == NULL) {
- goto exit;
- }
-
Is deleting the "node == NULL" part of this check intended here? It
seems unrelated to the rest of the commit, and it's not locally obvious
that it's safe.