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:18:52 -0500 |
| commit | 957709e1e824e221254599e4ad8445e3839ce535 (patch) | |
| tree | 87f5e5481c78e21219025ac36033ee3106428fc3 /tests | |
| parent | 5d49e2e3297c3af800eb68b74972d2b38c0eb8de (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 'tests')
| -rw-r--r-- | tests/test_config.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/tests/test_config.c b/tests/test_config.c index d74726a1a..de85f23b0 100644 --- a/tests/test_config.c +++ b/tests/test_config.c @@ -1456,13 +1456,19 @@ static struct aco_type global = { static struct aco_type global_defaults = { .type = ACO_GLOBAL, .item_offset = offsetof(struct test_config, global_defaults), - .category_match = ACO_WHITELIST, - .category = "^global_defaults$", + .category_match = ACO_WHITELIST_EXACT, + .category = "global_defaults", +}; +static const char *item_blacklist[] = { + "global", + "global_defaults", + NULL, }; + static struct aco_type item = { .type = ACO_ITEM, - .category_match = ACO_BLACKLIST, - .category = "^(global|global_defaults)$", + .category_match = ACO_BLACKLIST_ARRAY, + .category = (const char *)item_blacklist, .item_alloc = test_item_alloc, .item_find = test_item_find, .item_offset = offsetof(struct test_config, items), |