diff options
| author | Corey Farrell <git@cfware.com> | 2017-12-12 13:55:12 -0500 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2017-12-15 10:14:31 -0500 |
| commit | bf2d35931d65c73bbb3efec5ce9d284a730cae5e (patch) | |
| tree | aadbe18dfd53e2158c101407bb20401a43529612 /res/ari | |
| parent | a455e183206fb506d0f4d24d991c122549e0d464 (diff) | |
aco: Minimize use of regex.
Remove nearly all use of regex from ACO users. Still remaining:
* app_confbridge has a legitamate use of option name regex.
* ast_sorcery_object_fields_register is implemented with regex, all
callers use simple prefix based regex. I haven't decided the best
way to fix this in both 13/15 and master.
Change-Id: Ib5ed478218d8a661ace4d2eaaea98b59a897974b
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, |