From c1f346b99eaedcea9b07059b5d7c055011d38136 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Thu, 19 Oct 2006 16:42:41 +0000 Subject: [PATCH] change to switch_mprintf git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3107 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- .../endpoints/mod_dingaling/mod_dingaling.c | 8 ++++---- src/mod/endpoints/mod_sofia/mod_sofia.c | 14 ++++++------- src/switch_core.c | 20 +++++++++---------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/mod/endpoints/mod_dingaling/mod_dingaling.c b/src/mod/endpoints/mod_dingaling/mod_dingaling.c index c53aa0679d..8411fd5ba5 100644 --- a/src/mod/endpoints/mod_dingaling/mod_dingaling.c +++ b/src/mod/endpoints/mod_dingaling/mod_dingaling.c @@ -264,7 +264,7 @@ static void pres_event_handler(switch_event_t *event) *p = '\0'; } - sql = switch_core_db_mprintf("select *,'%q','%q' from subscriptions where sub_to='%q'", type ? type : "", status ? status : "unavailable", from); + sql = switch_mprintf("select *,'%q','%q' from subscriptions where sub_to='%q'", type ? type : "", status ? status : "unavailable", from); for (hi = switch_hash_first(apr_hash_pool_get(globals.profile_hash), globals.profile_hash); hi; hi = switch_hash_next(hi)) { char *errmsg; switch_hash_this(hi, NULL, NULL, &val); @@ -346,7 +346,7 @@ static void roster_event_handler(switch_event_t *event) event_type="presence"; } - sql = switch_core_db_mprintf("select *,'%q' from subscriptions", show ? show : "unavilable"); + sql = switch_mprintf("select *,'%q' from subscriptions", show ? show : "unavilable"); for (hi = switch_hash_first(apr_hash_pool_get(globals.profile_hash), globals.profile_hash); hi; hi = switch_hash_next(hi)) { char *errmsg; @@ -1805,7 +1805,7 @@ static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsessi case LDL_SIGNAL_UNSUBSCRIBE: if ((profile->user_flags & LDL_FLAG_COMPONENT)) { - if ((sql = switch_core_db_mprintf("delete from subscriptions where sub_from='%q' and sub_to='%q';", from, to))) { + if ((sql = switch_mprintf("delete from subscriptions where sub_from='%q' and sub_to='%q';", from, to))) { execute_sql(profile->dbname, sql, profile->mutex); switch_core_db_free(sql); } @@ -1815,7 +1815,7 @@ static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsessi case LDL_SIGNAL_SUBSCRIBE: if ((profile->user_flags & LDL_FLAG_COMPONENT)) { - if ((sql = switch_core_db_mprintf("insert into subscriptions values('%q','%q')", from, to))) { + if ((sql = switch_mprintf("insert into subscriptions values('%q','%q')", from, to))) { execute_sql(profile->dbname, sql, profile->mutex); switch_core_db_free(sql); } diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c index 8bd301797d..c46f69da19 100644 --- a/src/mod/endpoints/mod_sofia/mod_sofia.c +++ b/src/mod/endpoints/mod_sofia/mod_sofia.c @@ -893,8 +893,8 @@ char *encode_name(char *s) static void do_invite(switch_core_session_t *session) { char rpid[1024] = { 0 }; - char alert_info[1024] = { 0 }; - char *alertbuf; + char alert_info[1024] = { 0 }; + char *alertbuf; private_object_t *tech_pvt; switch_channel_t *channel = NULL; switch_caller_profile_t *caller_profile; @@ -923,10 +923,10 @@ static void do_invite(switch_core_session_t *session) ))) { char *rep = switch_channel_get_variable(channel, SOFIA_REPLACES_HEADER); - - if ((alertbuf = switch_channel_get_variable(channel, "alert_info"))) { - snprintf(alert_info, sizeof(alert_info) - 1, "Alert-Info: %s", alertbuf); - } + + if ((alertbuf = switch_channel_get_variable(channel, "alert_info"))) { + snprintf(alert_info, sizeof(alert_info) - 1, "Alert-Info: %s", alertbuf); + } tech_choose_port(tech_pvt); set_local_sdp(tech_pvt); @@ -981,7 +981,7 @@ static void do_invite(switch_core_session_t *session) nua_invite(tech_pvt->nh, TAG_IF(rpid, SIPTAG_HEADER_STR(rpid)), - TAG_IF(alert_info, SIPTAG_HEADER_STR(alert_info)), + TAG_IF(alert_info, SIPTAG_HEADER_STR(alert_info)), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_RTP_SORT(SOA_RTP_SORT_REMOTE), SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL), diff --git a/src/switch_core.c b/src/switch_core.c index f6b40ddf45..13b074107b 100644 --- a/src/switch_core.c +++ b/src/switch_core.c @@ -3402,10 +3402,10 @@ static void core_event_handler(switch_event_t *event) switch (event->event_id) { case SWITCH_EVENT_CHANNEL_DESTROY: - sql = switch_core_db_mprintf("delete from channels where uuid='%s'", switch_event_get_header(event, "unique-id")); + sql = switch_mprintf("delete from channels where uuid='%s'", switch_event_get_header(event, "unique-id")); break; case SWITCH_EVENT_CHANNEL_CREATE: - sql = switch_core_db_mprintf("insert into channels (uuid,created,name,state) values('%q','%q','%q','%q')", + sql = switch_mprintf("insert into channels (uuid,created,name,state) values('%q','%q','%q','%q')", switch_event_get_header(event, "unique-id"), switch_event_get_header(event, "event-date-local"), switch_event_get_header(event, "channel-name"), @@ -3413,7 +3413,7 @@ static void core_event_handler(switch_event_t *event) ); break; case SWITCH_EVENT_CODEC: - sql = switch_core_db_mprintf("update channels set read_codec='%q',read_rate='%q',write_codec='%q',write_rate='%q' where uuid='%q'", + sql = switch_mprintf("update channels set read_codec='%q',read_rate='%q',write_codec='%q',write_rate='%q' where uuid='%q'", switch_event_get_header(event, "channel-read-codec-name"), switch_event_get_header(event, "channel-read-codec-rate"), switch_event_get_header(event, "channel-write-codec-name"), @@ -3421,7 +3421,7 @@ static void core_event_handler(switch_event_t *event) switch_event_get_header(event, "unique-id")); break; case SWITCH_EVENT_CHANNEL_EXECUTE: - sql = switch_core_db_mprintf("update channels set application='%q',application_data='%q' where uuid='%q'", + sql = switch_mprintf("update channels set application='%q',application_data='%q' where uuid='%q'", switch_event_get_header(event, "application"), switch_event_get_header(event, "application-data"), switch_event_get_header(event, "unique-id") @@ -3437,7 +3437,7 @@ static void core_event_handler(switch_event_t *event) case CS_DONE: break; case CS_RING: - sql = switch_core_db_mprintf("update channels set state='%s',cid_name='%q',cid_num='%q',ip_addr='%s',dest='%q'" + sql = switch_mprintf("update channels set state='%s',cid_name='%q',cid_num='%q',ip_addr='%s',dest='%q'" "where uuid='%s'", switch_event_get_header(event, "channel-state"), switch_event_get_header(event, "caller-caller-id-name"), @@ -3448,7 +3448,7 @@ static void core_event_handler(switch_event_t *event) ); break; default: - sql = switch_core_db_mprintf("update channels set state='%s' where uuid='%s'", + sql = switch_mprintf("update channels set state='%s' where uuid='%s'", switch_event_get_header(event, "channel-state"), switch_event_get_header(event, "unique-id") ); @@ -3458,7 +3458,7 @@ static void core_event_handler(switch_event_t *event) } break; case SWITCH_EVENT_CHANNEL_BRIDGE: - sql = switch_core_db_mprintf("insert into calls values ('%s','%q','%q','%q','%q','%s','%q','%q','%q','%q','%s')", + sql = switch_mprintf("insert into calls values ('%s','%q','%q','%q','%q','%s','%q','%q','%q','%q','%s')", switch_event_get_header(event, "event-calling-function"), switch_event_get_header(event, "caller-caller-id-name"), switch_event_get_header(event, "caller-caller-id-number"), @@ -3473,15 +3473,15 @@ static void core_event_handler(switch_event_t *event) ); break; case SWITCH_EVENT_CHANNEL_UNBRIDGE: - sql = switch_core_db_mprintf("delete from calls where caller_uuid='%s'", switch_event_get_header(event, "caller-unique-id")); + sql = switch_mprintf("delete from calls where caller_uuid='%s'", switch_event_get_header(event, "caller-unique-id")); break; case SWITCH_EVENT_SHUTDOWN: - sql = switch_core_db_mprintf("delete from channels;delete from interfaces;delete from calls"); + sql = switch_mprintf("delete from channels;delete from interfaces;delete from calls"); break; case SWITCH_EVENT_LOG: return; case SWITCH_EVENT_MODULE_LOAD: - sql = switch_core_db_mprintf("insert into interfaces (type,name,description,syntax) values('%q','%q','%q','%q')", + sql = switch_mprintf("insert into interfaces (type,name,description,syntax) values('%q','%q','%q','%q')", switch_event_get_header(event, "type"), switch_event_get_header(event, "name"), switch_event_get_header(event, "description"),