res_sorcery_memory_cache.c: Made use OBJ_SEARCH_MASK.

Change-Id: Ibca6574dc3c213b29cc93486e01ccd51f5caa46c

diff --git a/res/res_sorcery_memory_cache.c b/res/res_sorcery_memory_cache.c
index 33e78d12e32e9f7f1b879f951fd3710bf9325a01..bbf08d4e91af8f00e7ca6fcbbf0bebdf4de6b79c 100644 (file)
--- 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);