diff options
| author | Joshua Colp <jcolp@digium.com> | 2015-10-02 16:28:15 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-10-02 16:28:15 -0500 |
| commit | fd0186dc851ae3304f0983b001cbf600eec69fcb (patch) | |
| tree | fc3b693f015a5ced59b841014aa58a7bf16931e1 | |
| parent | 64701bdb01bcb22782babbafdd331bdb31c62723 (diff) | |
| parent | 9af3b613f6423e73a28546df5808155a9fc3cfa3 (diff) | |
Merge "res_sorcery_memory_cache.c: Made use OBJ_SEARCH_MASK." into 13
| -rw-r--r-- | res/res_sorcery_memory_cache.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/res/res_sorcery_memory_cache.c b/res/res_sorcery_memory_cache.c index 33e78d12e..bbf08d4e9 100644 --- a/res/res_sorcery_memory_cache.c +++ b/res/res_sorcery_memory_cache.c @@ -241,7 +241,7 @@ static int sorcery_memory_cache_hash(const void *obj, int flags) const char *name = obj; int hash; - switch (flags & (OBJ_SEARCH_OBJECT | OBJ_SEARCH_KEY | OBJ_SEARCH_PARTIAL_KEY)) { + switch (flags & OBJ_SEARCH_MASK) { default: case OBJ_SEARCH_OBJECT: name = cache->name; @@ -276,7 +276,7 @@ static int sorcery_memory_cache_cmp(void *obj, void *arg, int flags) const char *right_name = arg; int cmp; - switch (flags & (OBJ_SEARCH_OBJECT | OBJ_SEARCH_KEY | OBJ_SEARCH_PARTIAL_KEY)) { + switch (flags & OBJ_SEARCH_MASK) { default: case OBJ_SEARCH_OBJECT: right_name = right->name; @@ -306,7 +306,7 @@ static int sorcery_memory_cached_object_hash(const void *obj, int flags) const char *name = obj; int hash; - switch (flags & (OBJ_SEARCH_OBJECT | OBJ_SEARCH_KEY | OBJ_SEARCH_PARTIAL_KEY)) { + switch (flags & OBJ_SEARCH_MASK) { default: case OBJ_SEARCH_OBJECT: name = ast_sorcery_object_get_id(cached->object); @@ -341,7 +341,7 @@ static int sorcery_memory_cached_object_cmp(void *obj, void *arg, int flags) const char *right_name = arg; int cmp; - switch (flags & (OBJ_SEARCH_OBJECT | OBJ_SEARCH_KEY | OBJ_SEARCH_PARTIAL_KEY)) { + switch (flags & OBJ_SEARCH_MASK) { default: case OBJ_SEARCH_OBJECT: right_name = ast_sorcery_object_get_id(right->object); |