topjohnwu/selinux
1
0
Fork 0
mirror of https://github.com/topjohnwu/selinux.git synced 2024-12-11 13:26:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libsepol/cil: Remove path field from cil_tree_node struct

Browse Source 
Remove path field from cil_tree_node struct and all references
to it in CIL. This will reduce memory usage by 5%.

Signed-off-by: James Carter <jwcart2@tycho.nsa.gov>
This commit is contained in:
James Carter 2016-05-05 16:32:07 -04:00
parent 46b3a55598
commit 67560cc7ac
6 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libsepol/cil/src/cil_binary.c
View File

@ -4232,6 +4232,9 @@ exit:
static avrule_t *__cil_init_sepol_avrule(uint32_t kind, struct cil_tree_node *node)
{
avrule_t *avrule;
struct cil_tree_node *source_node;
char *source_path;
int is_cil;
avrule = cil_malloc(sizeof(avrule_t));
avrule->specified = kind;
@ -4240,8 +4243,17 @@ static avrule_t *__cil_init_sepol_avrule(uint32_t kind, struct cil_tree_node *no
__cil_init_sepol_type_set(&avrule->ttypes);
avrule->perms = NULL;
avrule->line = node->line;
avrule->source_filename = node->path;
avrule->source_filename = NULL;
avrule->source_line = node->line;
source_node = cil_tree_get_next_path(node, &source_path, &is_cil);
if (source_node) {
avrule->source_filename = source_path;
if (!is_cil) {
avrule->source_line = node->hll_line;
}
}
avrule->next = NULL;
return avrule;
}

2
libsepol/cil/src/cil_build_ast.c
View File

@ -521,7 +521,6 @@ int cil_gen_perm_nodes(struct cil_db *db, struct cil_tree_node *current_perm, st
new_ast->parent = ast_node;
new_ast->line = current_perm->line;
new_ast->hll_line = current_perm->hll_line;
new_ast->path = current_perm->path;
rc = cil_gen_perm(db, current_perm, new_ast, flavor, num_perms);
if (rc != SEPOL_OK) {
@ -5919,7 +5918,6 @@ int __cil_build_ast_node_helper(struct cil_tree_node *parse_current, uint32_t *f
ast_node->parent = ast_current;
ast_node->line = parse_current->line;
ast_node->hll_line = parse_current->hll_line;
ast_node->path = parse_current->path;
if (parse_current->data == CIL_KEY_BLOCK) {
rc = cil_gen_block(db, parse_current, ast_node, 0);

1
libsepol/cil/src/cil_copy_ast.c
View File

@ -1983,7 +1983,6 @@ int __cil_copy_node_helper(struct cil_tree_node *orig, __attribute__((unused)) u
new->parent = parent;
new->line = orig->line;
new->hll_line = orig->hll_line;
new->path = orig->path;
new->flavor = orig->flavor;
new->data = data;

23
libsepol/cil/src/cil_parser.c
View File

@ -78,14 +78,13 @@ static void pop_hll_info(struct cil_stack *stack, int *hll_lineno, int *hll_expa
}
}
static void create_node(struct cil_tree_node **node, struct cil_tree_node *current, int line, int hll_line, char *path, void *value)
static void create_node(struct cil_tree_node **node, struct cil_tree_node *current, int line, int hll_line, void *value)
{
cil_tree_node_init(node);
(*node)->parent = current;
(*node)->flavor = CIL_NODE;
(*node)->line = line;
(*node)->hll_line = hll_line;
(*node)->path = path;
(*node)->data = value;
}
@ -117,14 +116,14 @@ static int add_hll_linemark(struct cil_tree_node **current, int *hll_lineno, int
pop_hll_info(stack, hll_lineno, hll_expand);
*current = (*current)->parent;
} else {
create_node(&node, *current, tok.line, *hll_lineno, path, NULL);
create_node(&node, *current, tok.line, *hll_lineno, NULL);
insert_node(node, *current);
*current = node;
create_node(&node, *current, tok.line, *hll_lineno, path, CIL_KEY_SRC_INFO);
create_node(&node, *current, tok.line, *hll_lineno, CIL_KEY_SRC_INFO);
insert_node(node, *current);
create_node(&node, *current, tok.line, *hll_lineno, path, CIL_KEY_SRC_HLL);
create_node(&node, *current, tok.line, *hll_lineno, CIL_KEY_SRC_HLL);
insert_node(node, *current);
if (hll_type == CIL_KEY_HLL_LMS) {
@ -162,7 +161,7 @@ static int add_hll_linemark(struct cil_tree_node **current, int *hll_lineno, int
hll_file = cil_strpool_add(tok.value);
create_node(&node, *current, tok.line, *hll_lineno, path, hll_file);
create_node(&node, *current, tok.line, *hll_lineno, hll_file);
insert_node(node, *current);
}
@ -183,17 +182,17 @@ static void add_cil_path(struct cil_tree_node **current, char *path)
{
struct cil_tree_node *node;
create_node(&node, *current, 0, 0, path, NULL);
create_node(&node, *current, 0, 0, NULL);
insert_node(node, *current);
*current = node;
create_node(&node, *current, 0, 0, path, CIL_KEY_SRC_INFO);
create_node(&node, *current, 0, 0, CIL_KEY_SRC_INFO);
insert_node(node, *current);
create_node(&node, *current, 0, 0, path, CIL_KEY_SRC_CIL);
create_node(&node, *current, 0, 0, CIL_KEY_SRC_CIL);
insert_node(node, *current);
create_node(&node, *current, 0, 0, path, path);
create_node(&node, *current, 0, 0, path);
insert_node(node, *current);
}
@ -237,7 +236,7 @@ int cil_parser(char *_path, char *buffer, uint32_t size, struct cil_tree **parse
case OPAREN:
paren_count++;
create_node(&node, current, tok.line, hll_lineno, path, NULL);
create_node(&node, current, tok.line, hll_lineno, NULL);
insert_node(node, current);
current = node;
break;
@ -258,7 +257,7 @@ int cil_parser(char *_path, char *buffer, uint32_t size, struct cil_tree **parse
goto exit;
}
create_node(&node, current, tok.line, hll_lineno, path, cil_strpool_add(tok.value));
create_node(&node, current, tok.line, hll_lineno, cil_strpool_add(tok.value));
insert_node(node, current);
break;
case NEWLINE :

1
libsepol/cil/src/cil_tree.c
View File

@ -216,7 +216,6 @@ void cil_tree_node_init(struct cil_tree_node **node)
new_node->flavor = CIL_ROOT;
new_node->line = 0;
new_node->hll_line = 0;
new_node->path = NULL;
*node = new_node;
}

1
libsepol/cil/src/cil_tree.h
View File

@ -47,7 +47,6 @@ struct cil_tree_node {
enum cil_flavor flavor;
uint32_t line;
uint32_t hll_line;
char *path;
void *data;
};