change from sqlite hash to newly added one

This commit is contained in:
Anthony Minessale committed 2014-03-09 00:37:17 +05:00
1 parent 32cce8027e
commit 804ef7709d
83 files changed
+1868 -835

No files matched your search

+1 -1
View File
@@ -269,7 +269,7 @@ static switch_status_t load_modules(void)
switch_core_new_memory_pool(&module_manager.pool);
switch_core_hash_init(&module_manager.load_hash, module_manager.pool);
switch_core_hash_init(&module_manager.load_hash);
if ((xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
switch_xml_t mods, ld;
@@ -77,7 +77,7 @@ void FSEventHandler::Init()
}
switch_mutex_init(&_mutex, SWITCH_MUTEX_NESTED, _pool);
switch_core_hash_init(&_event_hash, _pool);
switch_core_hash_init(&_event_hash);
switch_queue_create(&_event_queue, MAX_QUEUE_LEN, _pool);
_filters = NULL;
+3 -3
View File
@@ -77,7 +77,7 @@ void FSXML::InitRootObject()
{
/* Create hash and pool - for the root object only */
if (switch_core_new_memory_pool(&_pool) == SWITCH_STATUS_SUCCESS && _pool) {
if (switch_core_hash_init(&_obj_hash, _pool) != SWITCH_STATUS_SUCCESS) {
if (switch_core_hash_init(&_obj_hash) != SWITCH_STATUS_SUCCESS) {
switch_core_destroy_memory_pool(&_pool);
_obj_hash = NULL;
_pool = NULL;
@@ -198,12 +198,12 @@ void FSXML::DestroyHash()
}
/* First destroy all objects in the hash */
for (hi = switch_hash_first(NULL, tmp); hi; hi = switch_hash_next(hi)) {
for (hi = switch_core_hash_first( tmp); hi; hi = switch_core_hash_next(hi)) {
const void *var = NULL;
void *val = NULL;
FSXML *obj;
switch_hash_this(hi, &var, NULL, &val);
switch_core_hash_this(hi, &var, NULL, &val);
if (val) {
obj = static_cast<FSXML *>(val);