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/res_pjsip_notify.c | |
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/res_pjsip_notify.c')
-rw-r--r-- | res/res_pjsip_notify.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/res/res_pjsip_notify.c b/res/res_pjsip_notify.c index 8de88c7e8..59b7c6ea4 100644 --- a/res/res_pjsip_notify.c +++ b/res/res_pjsip_notify.c @@ -82,7 +82,7 @@ order; any other header is treated as part of the SIP request.</para> </description> - <configOption name="^.*$"> + <configOption name=""> <synopsis>A key/value pair to add to a NOTIFY request.</synopsis> <description> <para>If the key is <literal>Content</literal>, @@ -234,8 +234,8 @@ static void *notify_cfg_alloc(void) static struct aco_type notify_option = { .type = ACO_ITEM, .name = "notify", - .category_match = ACO_BLACKLIST, - .category = "^general$", + .category_match = ACO_BLACKLIST_EXACT, + .category = "general", .item_offset = offsetof(struct notify_cfg, notify_options), .item_alloc = notify_option_alloc, .item_find = notify_option_find @@ -993,7 +993,7 @@ static int load_module(void) return AST_MODULE_LOAD_DECLINE; } - aco_option_register_custom(¬ify_cfg, "^.*$", ACO_REGEX, notify_options, + aco_option_register_custom(¬ify_cfg, "", ACO_PREFIX, notify_options, "", notify_option_handler, 0); if (aco_process_config(¬ify_cfg, 0)) { |