From 16d41e463c93a20c950fffc2571070521b29dcef Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Thu, 25 Oct 2012 15:09:09 -0500 Subject: [PATCH] get rid of little caesars --- src/include/switch_core.h | 14 +++++++------- src/mod/endpoints/mod_sofia/sofia.c | 6 +++--- src/mod/endpoints/mod_sofia/sofia_glue.c | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/include/switch_core.h b/src/include/switch_core.h index f647066c38..5531d697f6 100644 --- a/src/include/switch_core.h +++ b/src/include/switch_core.h @@ -2425,10 +2425,10 @@ SWITCH_DECLARE(void) switch_core_recovery_untrack(switch_core_session_t *session SWITCH_DECLARE(void) switch_core_recovery_track(switch_core_session_t *session); SWITCH_DECLARE(void) switch_core_recovery_flush(const char *technology, const char *profile_name); -SWITCH_DECLARE(switch_status_t) switch_switch_sql_queue_manager_push_confirm(switch_sql_queue_manager_t *qm, const char *sql, uint32_t pos, switch_bool_t dup); -SWITCH_DECLARE(switch_status_t) switch_switch_sql_queue_manager_push(switch_sql_queue_manager_t *qm, const char *sql, uint32_t pos, switch_bool_t dup); -SWITCH_DECLARE(switch_status_t) switch_switch_sql_queue_manager_destroy(switch_sql_queue_manager_t **qmp); -SWITCH_DECLARE(switch_status_t) switch_switch_sql_queue_manager_init_name(const char *name, +SWITCH_DECLARE(switch_status_t) switch_sql_queue_manager_push_confirm(switch_sql_queue_manager_t *qm, const char *sql, uint32_t pos, switch_bool_t dup); +SWITCH_DECLARE(switch_status_t) switch_sql_queue_manager_push(switch_sql_queue_manager_t *qm, const char *sql, uint32_t pos, switch_bool_t dup); +SWITCH_DECLARE(switch_status_t) switch_sql_queue_manager_destroy(switch_sql_queue_manager_t **qmp); +SWITCH_DECLARE(switch_status_t) switch_sql_queue_manager_init_name(const char *name, switch_sql_queue_manager_t **qmp, uint32_t numq, const char *dsn, const char *pre_trans_execute, @@ -2436,10 +2436,10 @@ SWITCH_DECLARE(switch_status_t) switch_switch_sql_queue_manager_init_name(const const char *inner_pre_trans_execute, const char *inner_post_trans_execute); -#define switch_switch_sql_queue_manager_init(_q, _d, _p1, _p2, _ip1, _ip2) switch_switch_sql_queue_manager_init_name(__FILE__, _q, _d, _p1, _p2, _ip1, _ip2) +#define switch_sql_queue_manager_init(_q, _d, _p1, _p2, _ip1, _ip2) switch_sql_queue_manager_init_name(__FILE__, _q, _d, _p1, _p2, _ip1, _ip2) -SWITCH_DECLARE(switch_status_t) switch_switch_sql_queue_manager_start(switch_sql_queue_manager_t *qm); -SWITCH_DECLARE(switch_status_t) switch_switch_sql_queue_manager_stop(switch_sql_queue_manager_t *qm); +SWITCH_DECLARE(switch_status_t) switch_sql_queue_manager_start(switch_sql_queue_manager_t *qm); +SWITCH_DECLARE(switch_status_t) switch_sql_queue_manager_stop(switch_sql_queue_manager_t *qm); SWITCH_DECLARE(switch_status_t) switch_cache_db_execute_sql_event_callback(switch_cache_db_handle_t *dbh, const char *sql, switch_db_event_callback_func_t callback, void *pdata, char **err); diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c index b8a093bf25..9f467059fb 100644 --- a/src/mod/endpoints/mod_sofia/sofia.c +++ b/src/mod/endpoints/mod_sofia/sofia.c @@ -2531,7 +2531,7 @@ void *SWITCH_THREAD_FUNC sofia_profile_thread_run(switch_thread_t *thread, void switch_mutex_init(&profile->gateway_mutex, SWITCH_MUTEX_NESTED, profile->pool); switch_snprintf(qname, sizeof(qname), "sofia:%s", profile->name); - switch_switch_sql_queue_manager_init_name(qname, + switch_sql_queue_manager_init_name(qname, &profile->qm, 1, profile->odbc_dsn ? profile->odbc_dsn : profile->dbname, @@ -2539,7 +2539,7 @@ void *SWITCH_THREAD_FUNC sofia_profile_thread_run(switch_thread_t *thread, void profile->post_trans_execute, profile->inner_pre_trans_execute, profile->inner_post_trans_execute); - switch_switch_sql_queue_manager_start(profile->qm); + switch_sql_queue_manager_start(profile->qm); if (switch_event_create(&s_event, SWITCH_EVENT_PUBLISH) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "service", "_sip._udp,_sip._tcp,_sip._sctp%s", @@ -2627,7 +2627,7 @@ void *SWITCH_THREAD_FUNC sofia_profile_thread_run(switch_thread_t *thread, void switch_mutex_lock(profile->flag_mutex); switch_mutex_unlock(profile->flag_mutex); - switch_switch_sql_queue_manager_stop(profile->qm); + switch_sql_queue_manager_stop(profile->qm); if (switch_event_create(&s_event, SWITCH_EVENT_UNPUBLISH) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "service", "_sip._udp,_sip._tcp,_sip._sctp%s", diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c index 0117612f6a..f2cc910aac 100644 --- a/src/mod/endpoints/mod_sofia/sofia_glue.c +++ b/src/mod/endpoints/mod_sofia/sofia_glue.c @@ -6354,7 +6354,7 @@ void sofia_glue_execute_sql(sofia_profile_t *profile, char **sqlp, switch_bool_t switch_assert(sqlp && *sqlp); sql = *sqlp; - switch_switch_sql_queue_manager_push(profile->qm, sql, 0, !sql_already_dynamic); + switch_sql_queue_manager_push(profile->qm, sql, 0, !sql_already_dynamic); if (sql_already_dynamic) { *sqlp = NULL; @@ -6369,7 +6369,7 @@ void sofia_glue_execute_sql_now(sofia_profile_t *profile, char **sqlp, switch_bo switch_assert(sqlp && *sqlp); sql = *sqlp; - switch_switch_sql_queue_manager_push_confirm(profile->qm, sql, 0, !sql_already_dynamic); + switch_sql_queue_manager_push_confirm(profile->qm, sql, 0, !sql_already_dynamic); if (sql_already_dynamic) { *sqlp = NULL;