diff options
| author | Joshua Colp <jcolp@digium.com> | 2015-10-02 16:27:46 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-10-02 16:27:46 -0500 |
| commit | 9aac6d35952a7f875883adc8ff0ec5db9fc701a0 (patch) | |
| tree | cb5bfa90a04da0831bd07cc57da821dae0430445 | |
| parent | 4967a968ee526289e85948df41641da15f9867ab (diff) | |
| parent | 7942d1c2ffb967df4e1c957d9fce0a676723c4db (diff) | |
Merge "res_sorcery_memory_cache.c: Made use OBJ_SEARCH_MASK."
| -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 e486a6400..a51e8dffb 100644 --- a/res/res_sorcery_memory_cache.c +++ b/res/res_sorcery_memory_cache.c @@ -243,7 +243,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; @@ -278,7 +278,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; @@ -308,7 +308,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); @@ -343,7 +343,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); |