diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-03-29 13:16:17 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-03-29 13:16:17 -0500 |
| commit | 7b7e3909e492df29d5d51e885f9328a23e61cb6a (patch) | |
| tree | 5d7ed5625f8641282414b0b28cd77b54cfc334a0 /res/res_sorcery_memory.c | |
| parent | e0a916d6f588287a5bb04dbb34b3c779f0fe31b9 (diff) | |
| parent | 5aa5c49413a9b86f9e0d4456e580e3d536d33ef6 (diff) | |
Merge "sorcery/res_pjsip: Refactor for realtime performance" into 13
Diffstat (limited to 'res/res_sorcery_memory.c')
| -rw-r--r-- | res/res_sorcery_memory.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/res/res_sorcery_memory.c b/res/res_sorcery_memory.c index 45bde26f9..e8f603038 100644 --- a/res/res_sorcery_memory.c +++ b/res/res_sorcery_memory.c @@ -120,7 +120,6 @@ static int sorcery_memory_fields_cmp(void *obj, void *arg, int flags) { const struct sorcery_memory_fields_cmp_params *params = arg; RAII_VAR(struct ast_variable *, objset, NULL, ast_variables_destroy); - RAII_VAR(struct ast_variable *, diff, NULL, ast_variables_destroy); if (params->regex) { /* If a regular expression has been provided see if it matches, otherwise move on */ @@ -130,8 +129,7 @@ static int sorcery_memory_fields_cmp(void *obj, void *arg, int flags) return 0; } else if (params->fields && (!(objset = ast_sorcery_objectset_create(params->sorcery, obj)) || - (ast_sorcery_changeset_create(objset, params->fields, &diff)) || - diff)) { + (!ast_variable_lists_match(objset, params->fields, 0)))) { /* If we can't turn the object into an object set OR if differences exist between the fields * passed in and what are present on the object they are not a match. */ |