mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make signal.cc:signal_map an unordered_map

Browse source 
Signed-off-by: Ryan Lee <ryan.lee@canonical.com>
This commit is contained in:
Ryan Lee 2024-11-18 15:25:56 -08:00
parent 5bcf05dd3d
commit f21a243ce4
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
parser/signal.cc
View file

@ -23,7 +23,7 @@
#include <iomanip> #include <iomanip>
#include <string> #include <string>
#include <sstream> #include <sstream>
#include <map> #include <unordered_map>
#include "parser.h" #include "parser.h"
#include "profile.h" #include "profile.h"
@ -35,7 +35,7 @@
#define MAXRT_SIG 32 /* Max RT above MINRT_SIG */ #define MAXRT_SIG 32 /* Max RT above MINRT_SIG */
/* Signal names mapped to and internal ordering */ /* Signal names mapped to and internal ordering */
static struct signal_map { const char *name; int num; } signal_map[] = { static unordered_map<string, int> signal_map = {
{"hup", 1}, {"hup", 1},
{"int", 2}, {"int", 2},
{"quit", 3}, {"quit", 3},
@ -71,9 +71,6 @@ static struct signal_map { const char *name; int num; } signal_map[] = {
{"sys", 31}, {"sys", 31},
{"emt", 32}, {"emt", 32},
{"exists", 35}, {"exists", 35},
/* terminate */
{NULL, 0}
}; };
/* this table is ordered post sig_map[sig] mapping */ /* this table is ordered post sig_map[sig] mapping */
@ -132,12 +129,14 @@ int find_signal_mapping(const char *sig)
return -1; return -1;
return MINRT_SIG + n; return MINRT_SIG + n;
} else { } else {
for (int i = 0; signal_map[i].name; i++) { // Can't use string_view because that requires C++17
if (strcmp(sig, signal_map[i].name) == 0) auto sigmap = signal_map.find(string(sig));
return signal_map[i].num; if (sigmap != signal_map.end()) {
return sigmap->second;
} else {
return -1;
} }
} }
return -1;
} }
void signal_rule::extract_sigs(struct value_list **list) void signal_rule::extract_sigs(struct value_list **list)