diff options
author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2018-01-03 07:49:58 -0600 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-01-03 07:49:58 -0600 |
commit | 9e47e113e14a6e017b80417698812af16361e092 (patch) | |
tree | cc2a1ae65b6ec6879eb2e077c4c7a36c64e9e2ea /main/named_acl.c | |
parent | 6baf53e4be4cfa6d8796e4a94344dfedb533d643 (diff) | |
parent | 5b395a7b97775f62083675f13537179150befd3f (diff) |
Merge "core: Use macros to generate ao2_container callbacks where possible." into 13
Diffstat (limited to 'main/named_acl.c')
-rw-r--r-- | main/named_acl.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/main/named_acl.c b/main/named_acl.c index 458d4d397..9ea89903e 100644 --- a/main/named_acl.c +++ b/main/named_acl.c @@ -107,19 +107,8 @@ struct named_acl { char name[ACL_NAME_LENGTH]; /* Same max length as a configuration category */ }; -static int named_acl_hash_fn(const void *obj, const int flags) -{ - const struct named_acl *entry = obj; - return ast_str_hash(entry->name); -} - -static int named_acl_cmp_fn(void *obj, void *arg, const int flags) -{ - struct named_acl *entry1 = obj; - struct named_acl *entry2 = arg; - - return (!strcmp(entry1->name, entry2->name)) ? (CMP_MATCH | CMP_STOP) : 0; -} +AO2_STRING_FIELD_HASH_FN(named_acl, name) +AO2_STRING_FIELD_CMP_FN(named_acl, name) /*! \brief destructor for named_acl_config */ static void named_acl_config_destructor(void *obj) |