mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-28 12:58:07 +00:00
Code Issues Releases Wiki Activity

rename hashedNodeVec to NodeVec

Browse Source 
Shorten the name length by dropping the leading "hashed".

Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
John Johansen 2021-01-30 02:23:54 -08:00
parent 3f6ebfd218
commit 53d00b4d2b
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
parser/libapparmor_re/expr-tree.h
View File

@ -992,7 +992,7 @@ public:
}; };
class hashedNodeVec { class NodeVec {
public: public:
typedef ImportantNode ** iterator; typedef ImportantNode ** iterator;
iterator begin() { return nodes; } iterator begin() { return nodes; }
@ -1002,7 +1002,7 @@ public:
unsigned long len; unsigned long len;
ImportantNode **nodes; ImportantNode **nodes;
hashedNodeVec(NodeSet *n) NodeVec(NodeSet *n)
{ {
hash = hash_NodeSet(n); hash = hash_NodeSet(n);
len = n->size(); len = n->size();
@ -1014,7 +1014,7 @@ public:
} }
} }
hashedNodeVec(NodeSet *n, unsigned long h): hash(h) NodeVec(NodeSet *n, unsigned long h): hash(h)
{ {
len = n->size(); len = n->size();
nodes = new ImportantNode *[n->size()]; nodes = new ImportantNode *[n->size()];
@ -1024,14 +1024,14 @@ public:
} }
} }
~hashedNodeVec() ~NodeVec()
{ {
delete [] nodes; delete [] nodes;
} }
unsigned long size()const { return len; } unsigned long size()const { return len; }
bool operator<(hashedNodeVec const &rhs)const bool operator<(NodeVec const &rhs)const
{ {
if (hash == rhs.hash) { if (hash == rhs.hash) {
if (len == rhs.size()) { if (len == rhs.size()) {
@ -1095,7 +1095,7 @@ public:
}; };
struct deref_less_than { struct deref_less_than {
bool operator()(hashedNodeVec * const &lhs, hashedNodeVec * const &rhs)const bool operator()(NodeVec * const &lhs, NodeVec * const &rhs)const
{ {
return *lhs < *rhs; return *lhs < *rhs;
} }
@ -1103,7 +1103,7 @@ struct deref_less_than {
class NodeVecCache: public CacheStats { class NodeVecCache: public CacheStats {
public: public:
set<hashedNodeVec *, deref_less_than> cache; set<NodeVec *, deref_less_than> cache;
NodeVecCache(void): cache() { }; NodeVecCache(void): cache() { };
~NodeVecCache() { clear(); }; ~NodeVecCache() { clear(); };
@ -1112,7 +1112,7 @@ public:
void clear() void clear()
{ {
for (set<hashedNodeVec *>::iterator i = cache.begin(); for (set<NodeVec *>::iterator i = cache.begin();
i != cache.end(); i++) { i != cache.end(); i++) {
delete *i; delete *i;
} }
@ -1120,12 +1120,12 @@ public:
CacheStats::clear(); CacheStats::clear();
} }
hashedNodeVec *insert(NodeSet *nodes) NodeVec *insert(NodeSet *nodes)
{ {
if (!nodes) if (!nodes)
return NULL; return NULL;
pair<set<hashedNodeVec *>::iterator,bool> uniq; pair<set<NodeVec *>::iterator,bool> uniq;
hashedNodeVec *nv = new hashedNodeVec(nodes); NodeVec *nv = new NodeVec(nodes);
uniq = cache.insert(nv); uniq = cache.insert(nv);
if (uniq.second == false) { if (uniq.second == false) {
delete nv; delete nv;

4
parser/libapparmor_re/hfa.cc
View File

@ -303,7 +303,7 @@ static void split_node_types(NodeSet *nodes, NodeSet **anodes, NodeSet **nnodes
State *DFA::add_new_state(NodeSet *anodes, NodeSet *nnodes, State *other) State *DFA::add_new_state(NodeSet *anodes, NodeSet *nnodes, State *other)
{ {
hashedNodeVec *nnodev; NodeVec *nnodev;
nnodev = nnodes_cache.insert(nnodes); nnodev = nnodes_cache.insert(nnodes);
anodes = anodes_cache.insert(anodes); anodes = anodes_cache.insert(anodes);
@ -347,7 +347,7 @@ void DFA::update_state_transitions(State *state)
* need to compute follow for the accept nodes in a protostate * need to compute follow for the accept nodes in a protostate
*/ */
Cases cases; Cases cases;
for (hashedNodeVec::iterator i = state->proto.nnodes->begin(); i != state->proto.nnodes->end(); i++) for (NodeVec::iterator i = state->proto.nnodes->begin(); i != state->proto.nnodes->end(); i++)
(*i)->follow(cases); (*i)->follow(cases);
/* Now for each set of nodes in the computed transitions, make /* Now for each set of nodes in the computed transitions, make

4
parser/libapparmor_re/hfa.h
View File

@ -140,13 +140,13 @@ int accept_perms(NodeSet *state, perms_t &perms, bool filedfa);
*/ */
class ProtoState { class ProtoState {
public: public:
hashedNodeVec *nnodes; NodeVec *nnodes;
NodeSet *anodes; NodeSet *anodes;
/* init is used instead of a constructor because ProtoState is used /* init is used instead of a constructor because ProtoState is used
* in a union * in a union
*/ */
void init(hashedNodeVec *n, NodeSet *a = NULL) void init(NodeVec *n, NodeSet *a = NULL)
{ {
nnodes = n; nnodes = n;
anodes = a; anodes = a;