summaryrefslogtreecommitdiff
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:28:23 -0500
commit7942d1c2ffb967df4e1c957d9fce0a676723c4db (patch)
tree274336f91843c65af43edddefeeb6eb4bec4bb74
parent9f229d6a49ffbc0ab246e6907cf511e7a05e861f (diff)
res_sorcery_memory_cache.c: Made use OBJ_SEARCH_MASK.
Change-Id: Ibca6574dc3c213b29cc93486e01ccd51f5caa46c
-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 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);