Merge "res_sorcery_memory_cache.c: Made use OBJ_SEARCH_MASK." into 13

changes/71/1371/1
Joshua Colp 10 years ago committed by Gerrit Code Review
commit fd0186dc85

@ -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);

Loading…
Cancel
Save