TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-10-15 18:10:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename Array to Vector

Browse Source 
Finally get rid of the C style vector, rename the template class to its proper name
This commit is contained in:
topjohnwu
2018-11-08 05:03:59 -05:00
parent b6965105b7
commit 8745c7884e
15 changed files with 52 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
native/jni/magiskpolicy/magiskpolicy.cpp
View File

@@ -92,7 +92,7 @@ static const char *type_msg_5 =
exit(1);
}
static int parse_bracket(char *tok, char *&stmt, Array<const char *> *vec) {
static int parse_bracket(char *tok, char *&stmt, Vector<const char *> *vec) {
if (tok == nullptr || tok[0] != '{') {
// Not in a bracket
vec->push_back(tok);
@@ -134,10 +134,10 @@ static int parse_pattern_1(int action, const char *action_str, char *stmt) {
int state = 0;
char *cur, *cls;
Array<const char*> source, target, permission;
Vector<const char*> source, target, permission;
while ((cur = strtok_r(nullptr, " ", &stmt)) != nullptr) {
if (cur[0] == '*') cur = ALL;
Array<const char *> *vec;
Vector<const char *> *vec;
switch (state) {
case 0:
vec = &source;
@@ -191,10 +191,10 @@ static int parse_pattern_2(int action, const char *action_str, char *stmt) {
int state = 0;
char *cur, *range;
Array<const char *> source, target, classes;
Vector<const char *> source, target, classes;
while ((cur = strtok_r(nullptr, " ", &stmt)) != nullptr) {
if (cur[0] == '*') cur = ALL;
Array<const char *> *vec;
Vector<const char *> *vec;
switch (state) {
case 0:
vec = &source;
@@ -251,7 +251,7 @@ static int parse_pattern_3(int action, const char *action_str, char* stmt) {
}
char *cur;
Array<const char *> domains;
Vector<const char *> domains;
while ((cur = strtok_r(nullptr, " {}", &stmt)) != nullptr) {
if (cur[0] == '*') cur = ALL;
domains.push_back(cur);
@@ -280,10 +280,10 @@ static int parse_pattern_4(int action, const char *action_str, char *stmt) {
int state = 0;
char *cur;
Array<const char *> classes, attribute;
Vector<const char *> classes, attribute;
while ((cur = strtok_r(nullptr, " ", &stmt)) != nullptr) {
if (cur[0] == '*') cur = ALL;
Array<const char *> *vec;
Vector<const char *> *vec;
switch (state) {
case 0:
vec = &classes;