mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-02 07:15:18 +00:00
Code Issues Releases Wiki Activity

parser: add an integer based rule comparison that can be used by merge

Browse Source 
Instead of call operator< twice for merge have an integer based
comparison fn.

Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
John Johansen
2021-10-16 02:18:44 -07:00
parent b061155c9a
commit 8470760e85
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
parser/rule.h
View File

@@ -76,9 +76,12 @@ public:
// called by duplicate rule merge/elimination after final expand_vars // called by duplicate rule merge/elimination after final expand_vars
virtual bool is_mergeable(void) { return false; } virtual bool is_mergeable(void) { return false; }
virtual bool operator<(rule_t const &rhs) const { virtual int cmp(rule_t const &rhs) const {
return rule_type < rhs.rule_type; return rule_type < rhs.rule_type;
} }
virtual bool operator<(rule_t const &rhs) const {
return cmp(rhs) < 0;
}
virtual bool merge(rule_t &rhs __attribute__ ((unused))) { return false; }; virtual bool merge(rule_t &rhs __attribute__ ((unused))) { return false; };
// called late frontend to generate data for regex backend // called late frontend to generate data for regex backend