kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-05-30 18:33:46 +00:00
Code Issues Projects Releases Wiki Activity

Merging FS-3432 switch_core_hash.c patch in from Tamas

Browse Source
This commit is contained in:
dschreiber 2012-06-20 06:43:36 -07:00
parent 37e61ee6eb
commit c28ced7253
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/switch_core_hash.c
View File

@ -157,7 +157,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_hash_delete_multi(switch_hash_t *has
switch_event_create_subclass(&event, SWITCH_EVENT_CLONE, NULL); switch_event_create_subclass(&event, SWITCH_EVENT_CLONE, NULL);
switch_assert(event); switch_assert(event);
/* iterate through the hash, call callback, if callback returns true, put the key on the list (event) /* iterate through the hash, call callback, if callback returns NULL or true, put the key on the list (event)
When done, iterate through the list deleting hash entries When done, iterate through the list deleting hash entries
*/ */
@ -165,7 +165,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_hash_delete_multi(switch_hash_t *has
const void *key; const void *key;
void *val; void *val;
switch_hash_this(hi, &key, NULL, &val); switch_hash_this(hi, &key, NULL, &val);
if (callback(key, val, pData)) { if (!callback || callback(key, val, pData)) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "delete", (const char *) key); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "delete", (const char *) key);
} }
} }