Commit 3e1abbd7 authored by hartman's avatar hartman

messages: we have a vasprintf replacement now, remove the old workarounds.

parent 1d0cbdf2
...@@ -338,10 +338,6 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module, ...@@ -338,10 +338,6 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module,
vlc_gc_init (p_item, msg_Free); vlc_gc_init (p_item, msg_Free);
p_item->psz_module = p_item->psz_msg = p_item->psz_header = NULL; p_item->psz_module = p_item->psz_msg = p_item->psz_header = NULL;
#if !defined(HAVE_VASPRINTF) || defined(__APPLE__) || defined(SYS_BEOS)
int i_size = strlen(psz_format) + INTF_MAX_MSG_SIZE;
#endif
if( p_this->i_flags & OBJECT_FLAGS_QUIET || if( p_this->i_flags & OBJECT_FLAGS_QUIET ||
(p_this->i_flags & OBJECT_FLAGS_NODBG && i_type == VLC_MSG_DBG) ) (p_this->i_flags & OBJECT_FLAGS_NODBG && i_type == VLC_MSG_DBG) )
goto out; goto out;
...@@ -403,14 +399,10 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module, ...@@ -403,14 +399,10 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module,
#endif #endif
/* Convert message to string */ /* Convert message to string */
#if defined(HAVE_VASPRINTF) && !defined(__APPLE__) && !defined( SYS_BEOS )
vlc_va_copy( args, _args ); vlc_va_copy( args, _args );
if( vasprintf( &psz_str, psz_format, args ) == -1 ) if( vasprintf( &psz_str, psz_format, args ) == -1 )
psz_str = NULL; psz_str = NULL;
va_end( args ); va_end( args );
#else
psz_str = (char*) malloc( i_size );
#endif
if( psz_str == NULL ) if( psz_str == NULL )
{ {
...@@ -464,13 +456,6 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module, ...@@ -464,13 +456,6 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module,
p_obj = p_obj->p_parent; p_obj = p_obj->p_parent;
} }
#if !defined(HAVE_VASPRINTF) || defined(__APPLE__) || defined(SYS_BEOS)
vlc_va_copy( args, _args );
vsnprintf( psz_str, i_size, psz_format, args );
va_end( args );
psz_str[ i_size - 1 ] = 0; /* Just in case */
#endif
msg_bank_t *p_queue = &QUEUE; msg_bank_t *p_queue = &QUEUE;
vlc_mutex_lock( &p_queue->lock ); vlc_mutex_lock( &p_queue->lock );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment