ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-07-24 21:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

FS-6402 --resolve

Browse Source
This commit is contained in:
Anthony Minessale
2014-04-02 01:20:19 +05:00
parent 2c7c041f50
commit 5c0cff70b3
50 changed files with 161 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/switch_hashtable.c
+19 -6
View File
@@ -261,9 +261,11 @@ switch_hashtable_destroy(switch_hashtable_t **h)
*h = NULL;
}
SWITCH_DECLARE(switch_hashtable_iterator_t *) switch_hashtable_next(switch_hashtable_iterator_t *i)
SWITCH_DECLARE(switch_hashtable_iterator_t *) switch_hashtable_next(switch_hashtable_iterator_t **iP)
{
switch_hashtable_iterator_t *i = *iP;
if (i->e) {
if ((i->e = i->e->next) != 0) {
return i;
@@ -277,22 +279,33 @@ SWITCH_DECLARE(switch_hashtable_iterator_t *) switch_hashtable_next(switch_hasht
}
if (i->pos >= i->h->tablelength) {
return NULL;
goto end;
}
if ((i->e = i->h->table[i->pos]) != 0) {
return i;
}
end:
free(i);
*iP = NULL;
return NULL;
}
SWITCH_DECLARE(switch_hashtable_iterator_t *) switch_hashtable_first(switch_hashtable_t *h)
{
h->iterator.pos = 0;
h->iterator.e = NULL;
h->iterator.h = h;
return switch_hashtable_next(&h->iterator);
switch_hashtable_iterator_t *iterator;
switch_zmalloc(iterator, sizeof(*iterator));
switch_assert(iterator);
iterator->pos = 0;
iterator->e = NULL;
iterator->h = h;
return switch_hashtable_next(&iterator);
}