retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

change to switch_mprintf 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3107 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2006-10-19 16:42:41 +00:00
parent 12243c194e
commit c1f346b99e
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mod/endpoints/mod_dingaling/mod_dingaling.c
View File

@ -264,7 +264,7 @@ static void pres_event_handler(switch_event_t *event)
*p = '\0'; *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)) { for (hi = switch_hash_first(apr_hash_pool_get(globals.profile_hash), globals.profile_hash); hi; hi = switch_hash_next(hi)) {
char *errmsg; char *errmsg;
switch_hash_this(hi, NULL, NULL, &val); switch_hash_this(hi, NULL, NULL, &val);
@ -346,7 +346,7 @@ static void roster_event_handler(switch_event_t *event)
event_type="presence"; 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)) { for (hi = switch_hash_first(apr_hash_pool_get(globals.profile_hash), globals.profile_hash); hi; hi = switch_hash_next(hi)) {
char *errmsg; char *errmsg;
@ -1805,7 +1805,7 @@ static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsessi
case LDL_SIGNAL_UNSUBSCRIBE: case LDL_SIGNAL_UNSUBSCRIBE:
if ((profile->user_flags & LDL_FLAG_COMPONENT)) { 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); execute_sql(profile->dbname, sql, profile->mutex);
switch_core_db_free(sql); 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: case LDL_SIGNAL_SUBSCRIBE:
if ((profile->user_flags & LDL_FLAG_COMPONENT)) { 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); execute_sql(profile->dbname, sql, profile->mutex);
switch_core_db_free(sql); switch_core_db_free(sql);
} }

14
src/mod/endpoints/mod_sofia/mod_sofia.c
View File

@ -893,8 +893,8 @@ char *encode_name(char *s)
static void do_invite(switch_core_session_t *session) static void do_invite(switch_core_session_t *session)
{ {
char rpid[1024] = { 0 }; char rpid[1024] = { 0 };
char alert_info[1024] = { 0 }; char alert_info[1024] = { 0 };
char *alertbuf; char *alertbuf;
private_object_t *tech_pvt; private_object_t *tech_pvt;
switch_channel_t *channel = NULL; switch_channel_t *channel = NULL;
switch_caller_profile_t *caller_profile; 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); char *rep = switch_channel_get_variable(channel, SOFIA_REPLACES_HEADER);
if ((alertbuf = switch_channel_get_variable(channel, "alert_info"))) { if ((alertbuf = switch_channel_get_variable(channel, "alert_info"))) {
snprintf(alert_info, sizeof(alert_info) - 1, "Alert-Info: %s", alertbuf); snprintf(alert_info, sizeof(alert_info) - 1, "Alert-Info: %s", alertbuf);
} }
tech_choose_port(tech_pvt); tech_choose_port(tech_pvt);
set_local_sdp(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, nua_invite(tech_pvt->nh,
TAG_IF(rpid, SIPTAG_HEADER_STR(rpid)), 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_USER_SDP_STR(tech_pvt->local_sdp_str),
SOATAG_RTP_SORT(SOA_RTP_SORT_REMOTE), SOATAG_RTP_SORT(SOA_RTP_SORT_REMOTE),
SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL), SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL),

20
src/switch_core.c
View File

@ -3402,10 +3402,10 @@ static void core_event_handler(switch_event_t *event)
switch (event->event_id) { switch (event->event_id) {
case SWITCH_EVENT_CHANNEL_DESTROY: 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; break;
case SWITCH_EVENT_CHANNEL_CREATE: 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, "unique-id"),
switch_event_get_header(event, "event-date-local"), switch_event_get_header(event, "event-date-local"),
switch_event_get_header(event, "channel-name"), switch_event_get_header(event, "channel-name"),
@ -3413,7 +3413,7 @@ static void core_event_handler(switch_event_t *event)
); );
break; break;
case SWITCH_EVENT_CODEC: 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-name"),
switch_event_get_header(event, "channel-read-codec-rate"), switch_event_get_header(event, "channel-read-codec-rate"),
switch_event_get_header(event, "channel-write-codec-name"), 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")); switch_event_get_header(event, "unique-id"));
break; break;
case SWITCH_EVENT_CHANNEL_EXECUTE: 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"),
switch_event_get_header(event, "application-data"), switch_event_get_header(event, "application-data"),
switch_event_get_header(event, "unique-id") switch_event_get_header(event, "unique-id")
@ -3437,7 +3437,7 @@ static void core_event_handler(switch_event_t *event)
case CS_DONE: case CS_DONE:
break; break;
case CS_RING: 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'", "where uuid='%s'",
switch_event_get_header(event, "channel-state"), switch_event_get_header(event, "channel-state"),
switch_event_get_header(event, "caller-caller-id-name"), switch_event_get_header(event, "caller-caller-id-name"),
@ -3448,7 +3448,7 @@ static void core_event_handler(switch_event_t *event)
); );
break; break;
default: 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, "channel-state"),
switch_event_get_header(event, "unique-id") switch_event_get_header(event, "unique-id")
); );
@ -3458,7 +3458,7 @@ static void core_event_handler(switch_event_t *event)
} }
break; break;
case SWITCH_EVENT_CHANNEL_BRIDGE: 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, "event-calling-function"),
switch_event_get_header(event, "caller-caller-id-name"), switch_event_get_header(event, "caller-caller-id-name"),
switch_event_get_header(event, "caller-caller-id-number"), switch_event_get_header(event, "caller-caller-id-number"),
@ -3473,15 +3473,15 @@ static void core_event_handler(switch_event_t *event)
); );
break; break;
case SWITCH_EVENT_CHANNEL_UNBRIDGE: 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; break;
case SWITCH_EVENT_SHUTDOWN: 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; break;
case SWITCH_EVENT_LOG: case SWITCH_EVENT_LOG:
return; return;
case SWITCH_EVENT_MODULE_LOAD: 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, "type"),
switch_event_get_header(event, "name"), switch_event_get_header(event, "name"),
switch_event_get_header(event, "description"), switch_event_get_header(event, "description"),