diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-12-18 14:41:55 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-12-18 14:41:55 -0600 |
| commit | bac31e55bb85ace72cf27155e84e569f6d7f6ada (patch) | |
| tree | 08ce0b22b12fd558f535c1dd4ab604ba7b5563b7 /res/ari | |
| parent | a853b3bcffb3eaa771cf6f52e6e2e8893a2c657e (diff) | |
| parent | 957709e1e824e221254599e4ad8445e3839ce535 (diff) | |
Merge changes from topic 'faster-aco' into 15
* changes:
aco: Minimize use of regex.
aco: Create ways to minimize use of regex.
Diffstat (limited to 'res/ari')
| -rw-r--r-- | res/ari/config.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/res/ari/config.c b/res/ari/config.c index a080bb713..46d23c61d 100644 --- a/res/ari/config.c +++ b/res/ari/config.c @@ -39,8 +39,8 @@ static struct aco_type general_option = { .type = ACO_GLOBAL, .name = "general", .item_offset = offsetof(struct ast_ari_conf, general), - .category = "^general$", - .category_match = ACO_WHITELIST, + .category = "general", + .category_match = ACO_WHITELIST_EXACT, }; static struct aco_type *general_options[] = ACO_TYPES(&general_option); @@ -156,8 +156,8 @@ static void *user_find(struct ao2_container *tmp_container, const char *cat) static struct aco_type user_option = { .type = ACO_ITEM, .name = "user", - .category_match = ACO_BLACKLIST, - .category = "^general$", + .category_match = ACO_BLACKLIST_EXACT, + .category = "general", .matchfield = "type", .matchvalue = "user", .item_alloc = user_alloc, |