提交 0eaeeffe authored 作者: Ken Rice's avatar Ken Rice

FS-6611 --resolve Update mod_odbc_query for changes in core hash api. Patch…

FS-6611 --resolve Update mod_odbc_query for changes in core hash api. Patch supplied by Trevor Hemsley
上级 22577d85
...@@ -117,10 +117,10 @@ static switch_status_t do_config(switch_bool_t reload) ...@@ -117,10 +117,10 @@ static switch_status_t do_config(switch_bool_t reload)
} }
/* empty the globals.queries hash */ /* empty the globals.queries hash */
for (hi = switch_hash_first(NULL, globals.queries); hi;) { for (hi = switch_core_hash_first(globals.queries); hi;) {
switch_hash_this(hi, &key, NULL, &val); switch_core_hash_this(hi, &key, NULL, &val);
query = (char *) val; query = (char *) val;
hi = switch_hash_next(hi); hi = switch_core_hash_next(&hi);
switch_safe_free(query); switch_safe_free(query);
switch_core_hash_delete(globals.queries, (char *) key); switch_core_hash_delete(globals.queries, (char *) key);
} }
...@@ -466,7 +466,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_odbc_query_load) ...@@ -466,7 +466,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_odbc_query_load)
switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, globals.pool); switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, globals.pool);
/* allocate the queries hash */ /* allocate the queries hash */
if (switch_core_hash_init(&globals.queries, globals.pool) != SWITCH_STATUS_SUCCESS) { if (switch_core_hash_init(&globals.queries) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error initializing the queries hash\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error initializing the queries hash\n");
return SWITCH_STATUS_GENERR; return SWITCH_STATUS_GENERR;
} }
...@@ -512,10 +512,10 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_odbc_query_shutdown) ...@@ -512,10 +512,10 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_odbc_query_shutdown)
switch_event_unbind_callback(reload_event_handler); switch_event_unbind_callback(reload_event_handler);
switch_mutex_lock(globals.mutex); switch_mutex_lock(globals.mutex);
for (hi = switch_hash_first(NULL, globals.queries); hi;) { for (hi = switch_core_hash_first(globals.queries); hi;) {
switch_hash_this(hi, &key, NULL, &val); switch_core_hash_this(hi, &key, NULL, &val);
query = (char *) val; query = (char *) val;
hi = switch_hash_next(hi); hi = switch_core_hash_next(&hi);
switch_safe_free(query); switch_safe_free(query);
switch_core_hash_delete(globals.queries, (char *) key); switch_core_hash_delete(globals.queries, (char *) key);
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论