summaryrefslogtreecommitdiff
path: root/res/res_sorcery_memory_cache.c
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2015-09-30 17:27:23 -0500
committerRichard Mudgett <rmudgett@digium.com>2015-10-01 17:25:37 -0500
commit9af3b613f6423e73a28546df5808155a9fc3cfa3 (patch)
tree2e436f75bea02479a4ca533c69af22139d784f6e /res/res_sorcery_memory_cache.c
parent56ed7b9dd560e468be31684e56a8070b88ae0205 (diff)
res_sorcery_memory_cache.c: Made use OBJ_SEARCH_MASK.
Change-Id: Ibca6574dc3c213b29cc93486e01ccd51f5caa46c
Diffstat (limited to 'res/res_sorcery_memory_cache.c')
-rw-r--r--res/res_sorcery_memory_cache.c8
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);