Preston_PLB/freeswitch
1
0
Fork 0
forked from Mirrors/freeswitch
Code Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/include/switch_core.h
View File

@ -551,6 +551,15 @@ SWITCH_DECLARE(char *) switch_core_perform_strdup(_In_ switch_memory_pool_t *poo
*/ */
SWITCH_DECLARE(char *) switch_core_session_sprintf(_In_ switch_core_session_t *session, _In_z_ _Printf_format_string_ const char *fmt, ...); SWITCH_DECLARE(char *) switch_core_session_sprintf(_In_ switch_core_session_t *session, _In_z_ _Printf_format_string_ const char *fmt, ...);
/*!
\brief printf-style style printing routine. The data is output to a string allocated from the session
\param session a session to use for allocation
\param fmt The format of the string
\param ap The arguments to use while printing the data
\return The new string
*/
SWITCH_DECLARE(char *) switch_core_session_vsprintf(switch_core_session_t *session, const char *fmt, va_list ap);
/*! /*!
\brief printf-style style printing routine. The data is output to a string allocated from the pool \brief printf-style style printing routine. The data is output to a string allocated from the pool
\param pool a pool to use for allocation \param pool a pool to use for allocation
@ -560,6 +569,15 @@ SWITCH_DECLARE(char *) switch_core_session_sprintf(_In_ switch_core_session_t *s
*/ */
SWITCH_DECLARE(char *) switch_core_sprintf(_In_ switch_memory_pool_t *pool, _In_z_ _Printf_format_string_ const char *fmt, ...); SWITCH_DECLARE(char *) switch_core_sprintf(_In_ switch_memory_pool_t *pool, _In_z_ _Printf_format_string_ const char *fmt, ...);
/*!
\brief printf-style style printing routine. The data is output to a string allocated from the pool
\param pool a pool to use for allocation
\param fmt The format of the string
\param ap The arguments to use while printing the data
\return The new string
*/
SWITCH_DECLARE(char *) switch_core_vsprintf(switch_memory_pool_t *pool, _In_z_ _Printf_format_string_ const char *fmt, va_list ap);
/*! /*!
\brief Retrieve the memory pool from a session \brief Retrieve the memory pool from a session
\param session the session to retrieve the pool from \param session the session to retrieve the pool from

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; va_list ap;
char *result = NULL; 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 LOCK_MORE
#ifdef USE_MEM_LOCK #ifdef USE_MEM_LOCK
switch_mutex_lock(memory_manager.mem_lock); switch_mutex_lock(memory_manager.mem_lock);
#endif #endif
#endif #endif
switch_assert(session != NULL); result = apr_pvsprintf(pool, fmt, ap);
switch_assert(session->pool != NULL);
va_start(ap, fmt);
result = apr_pvsprintf(session->pool, fmt, ap);
switch_assert(result != NULL); switch_assert(result != NULL);
va_end(ap);
#ifdef LOCK_MORE #ifdef LOCK_MORE
#ifdef USE_MEM_LOCK #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, ...) SWITCH_DECLARE(char *) switch_core_sprintf(switch_memory_pool_t *pool, const char *fmt, ...)
{ {
va_list ap; va_list ap;
char *result = NULL; char *result;
switch_assert(pool != NULL);
#ifdef LOCK_MORE
#ifdef USE_MEM_LOCK
switch_mutex_lock(memory_manager.mem_lock);
#endif
#endif
va_start(ap, fmt); va_start(ap, fmt);
result = switch_core_vsprintf(pool, fmt, ap);
result = apr_pvsprintf(pool, fmt, ap); va_end(ap);
switch_assert(result != NULL);
va_end(ap);
#ifdef LOCK_MORE
#ifdef USE_MEM_LOCK
switch_mutex_unlock(memory_manager.mem_lock);
#endif
#endif
return result; return result;
} }