kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-14 01:49:05 +00:00
Code Issues Projects Releases Wiki Activity

add switch_core_vsprintf

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15737 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Mathieu Rene
2009-12-01 15:09:47 +00:00
parent 578466fd4a
commit dbdc0c032a
2 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/switch_core_memory.c
View File

@@ -171,19 +171,32 @@ SWITCH_DECLARE(char *) switch_core_session_sprintf(switch_core_session_t *sessio
va_list ap;
char *result = NULL;
va_start(ap, fmt);
result = switch_core_vsprintf(session->pool, fmt, ap);
va_end(ap);
return result;
}
SWITCH_DECLARE(char *) switch_core_session_vsprintf(switch_core_session_t *session, const char *fmt, va_list ap)
{
return switch_core_vsprintf(session->pool, fmt, ap);
}
SWITCH_DECLARE(char *) switch_core_vsprintf(switch_memory_pool_t *pool, const char *fmt, va_list ap)
{
char *result = NULL;
switch_assert(pool != NULL);
#ifdef LOCK_MORE
#ifdef USE_MEM_LOCK
switch_mutex_lock(memory_manager.mem_lock);
#endif
#endif
switch_assert(session != NULL);
switch_assert(session->pool != NULL);
va_start(ap, fmt);
result = apr_pvsprintf(session->pool, fmt, ap);
result = apr_pvsprintf(pool, fmt, ap);
switch_assert(result != NULL);
va_end(ap);
#ifdef LOCK_MORE
#ifdef USE_MEM_LOCK
@@ -197,28 +210,11 @@ SWITCH_DECLARE(char *) switch_core_session_sprintf(switch_core_session_t *sessio
SWITCH_DECLARE(char *) switch_core_sprintf(switch_memory_pool_t *pool, const char *fmt, ...)
{
va_list ap;
char *result = NULL;
switch_assert(pool != NULL);
#ifdef LOCK_MORE
#ifdef USE_MEM_LOCK
switch_mutex_lock(memory_manager.mem_lock);
#endif
#endif
char *result;
va_start(ap, fmt);
result = apr_pvsprintf(pool, fmt, ap);
switch_assert(result != NULL);
va_end(ap);
#ifdef LOCK_MORE
#ifdef USE_MEM_LOCK
switch_mutex_unlock(memory_manager.mem_lock);
#endif
#endif
result = switch_core_vsprintf(pool, fmt, ap);
va_end(ap);
return result;
}