Commit f343ca52 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Fix use of %p format string specifier

%p is only for pointers to void, not just any type of pointers. Due to
variable arguments, there is no implicit conversion here.
parent 84e2d1d7
......@@ -1935,7 +1935,8 @@ static void blurayHandleOverlays(demux_t *p_demux, int nread)
/* track vout changes */
vout_thread_t *p_vout = input_GetVout(p_demux->p_input);
if (p_vout != p_sys->p_vout) {
msg_Info(p_demux, "vout changed %p -> %p\n", p_sys->p_vout, p_vout);
msg_Info(p_demux, "vout changed %p -> %p\n",
(void *)p_sys->p_vout, (void *)p_vout);
blurayReleaseVout(p_demux);
p_sys->p_vout = p_vout;
} else {
......
......@@ -305,7 +305,7 @@ static block_t *Block( access_t *p_access )
vlc_mutex_lock( &p_sys->lock );
p_block = p_sys->p_frame;
//msg_Dbg( p_access, "sending frame %p",p_block );
//msg_Dbg( p_access, "sending frame %p", (void *)p_block );
p_sys->p_frame = NULL;
vlc_mutex_unlock( &p_sys->lock );
......
......@@ -275,7 +275,8 @@ static int OpenCommon(vlc_object_t *object, imem_sys_t **sys_ptr, const char *ps
sys->source.cookie = var_InheritString(object, "imem-cookie");
msg_Dbg(object, "Using get(%p), release(%p), data(%p), cookie(%s)",
sys->source.get, sys->source.release, sys->source.data,
(void *)sys->source.get, (void *)sys->source.release,
sys->source.data,
sys->source.cookie ? sys->source.cookie : "(null)");
/* */
......
......@@ -1173,7 +1173,7 @@ static int CdTextParse( vlc_meta_t ***ppp_tracks, int *pi_tracks,
char *psz_track = &psz_text[0];
while( i_track <= 127 && psz_track < &psz_text[12] )
{
//fprintf( stderr, "t=%d psz_track=%p end=%p", i_track, psz_track, &psz_text[12] );
//fprintf( stderr, "t=%d psz_track=%p end=%p", i_track, (void *)psz_track, (void *)&psz_text[12] );
if( *psz_track )
{
astrcat( &pppsz_info[i_track][i_pack_type-0x80], psz_track );
......
......@@ -74,7 +74,7 @@ static int OpenDecoderCommon( vlc_object_t *p_this, bool b_force_dump )
decoder_t *p_dec = (decoder_t*)p_this;
char psz_file[10 + 3 * sizeof (p_dec)];
snprintf( psz_file, sizeof( psz_file), "stream.%p", p_dec );
snprintf( psz_file, sizeof( psz_file), "stream.%p", (void *)p_dec );
if( !b_force_dump )
b_force_dump = var_InheritBool( p_dec, "dummy-save-es" );
......
......@@ -464,7 +464,8 @@ static OMX_ERRORTYPE AllocateBuffers(decoder_t *p_dec, OmxPort *p_port)
p_port->definition.nBufferSize,
p_port->p_hwbuf->pp_handles[i] );
OMX_DBG( "OMX_UseBuffer(%d) %p, %p", def->eDir,
p_port->pp_buffers[i], p_port->p_hwbuf->pp_handles[i] );
(void *)p_port->pp_buffers[i],
p_port->p_hwbuf->pp_handles[i] );
}
else if( p_port->b_direct )
{
......@@ -473,8 +474,8 @@ static OMX_ERRORTYPE AllocateBuffers(decoder_t *p_dec, OmxPort *p_port)
p_port->i_port_index, 0,
p_port->definition.nBufferSize, (void*)1);
OMX_DBG( "OMX_UseBuffer(%d) %p, %p", def->eDir,
p_port->pp_buffers[i], p_port->pp_buffers[i] ?
p_port->pp_buffers[i]->pBuffer : NULL );
(void *)p_port->pp_buffers[i], p_port->pp_buffers[i] ?
(void *)p_port->pp_buffers[i]->pBuffer : NULL );
}
else
{
......@@ -483,8 +484,8 @@ static OMX_ERRORTYPE AllocateBuffers(decoder_t *p_dec, OmxPort *p_port)
p_port->i_port_index, 0,
p_port->definition.nBufferSize);
OMX_DBG( "OMX_AllocateBuffer(%d) %p, %p", def->eDir,
p_port->pp_buffers[i], p_port->pp_buffers[i] ?
p_port->pp_buffers[i]->pBuffer : NULL );
(void *)p_port->pp_buffers[i], p_port->pp_buffers[i] ?
(void *)p_port->pp_buffers[i]->pBuffer : NULL );
}
if(omx_error != OMX_ErrorNone)
......@@ -551,7 +552,7 @@ static OMX_ERRORTYPE FreeBuffers(decoder_t *p_dec, OmxPort *p_port)
omx_error = OMX_FreeBuffer( p_port->omx_handle,
p_port->i_port_index, p_buffer );
OMX_DBG( "OMX_FreeBuffer(%d) %p, %p", def->eDir,
p_buffer, p_buffer->pBuffer );
(void *)p_buffer, (void *)p_buffer->pBuffer );
if(omx_error != OMX_ErrorNone) break;
}
......@@ -800,7 +801,8 @@ static OMX_ERRORTYPE DeinitialiseComponent(decoder_t *p_dec,
free(p_buffer);
continue;
}
msg_Warn( p_dec, "Stray buffer left in fifo, %p", p_buffer );
msg_Warn( p_dec, "Stray buffer left in fifo, %p",
(void *)p_buffer );
}
HwBuffer_Destroy( p_dec, p_port );
}
......@@ -1234,8 +1236,9 @@ static int OpenGeneric( vlc_object_t *p_this, bool b_encode )
p_header->nOffset = 0;
p_header->nFlags = OMX_BUFFERFLAG_CODECCONFIG | OMX_BUFFERFLAG_ENDOFFRAME;
msg_Dbg(p_dec, "sending codec config data %p, %p, %i", p_header,
p_header->pBuffer, (int)p_header->nFilledLen);
msg_Dbg(p_dec, "sending codec config data %p, %p, %u",
(void *)p_header, (void *)p_header->pBuffer,
(unsigned)p_header->nFilledLen);
OMX_EmptyThisBuffer(p_sys->omx_handle, p_header);
}
......@@ -1425,7 +1428,8 @@ static int DecodeVideoOutput( decoder_t *p_dec, OmxPort *p_port, picture_t **pp_
{
OMX_FIFO_GET(&p_port->fifo, p_header);
}
OMX_DBG( "FillThisBuffer %p, %p", p_header, p_header->pBuffer );
OMX_DBG( "FillThisBuffer %p, %p", (void *)p_header,
(void *)p_header->pBuffer );
OMX_FillThisBuffer(p_port->omx_handle, p_header);
}
......@@ -1496,8 +1500,9 @@ static int DecodeVideoInput( decoder_t *p_dec, OmxPort *p_port, block_t **pp_blo
* than H.264 */
convert_h264_to_annexb( p_header->pBuffer, p_header->nFilledLen,
p_sys->i_nal_size_length);
OMX_DBG( "EmptyThisBuffer %p, %p, %i, %"PRId64, p_header, p_header->pBuffer,
(int)p_header->nFilledLen, FromOmxTicks(p_header->nTimeStamp) );
OMX_DBG( "EmptyThisBuffer %p, %p, %u, %"PRId64, (void *)p_header,
(void *)p_header->pBuffer, (unsigned)p_header->nFilledLen,
FromOmxTicks(p_header->nTimeStamp) );
OMX_EmptyThisBuffer(p_port->omx_handle, p_header);
p_port->b_flushed = false;
if (decode_more)
......@@ -1705,7 +1710,8 @@ block_t *DecodeAudio ( decoder_t *p_dec, block_t **pp_block )
p_buffer->i_pts;
}
OMX_DBG( "FillThisBuffer %p, %p", p_header, p_header->pBuffer );
OMX_DBG( "FillThisBuffer %p, %p", (void *)p_header,
(void *)p_header->pBuffer );
OMX_FIFO_GET(&p_sys->out.fifo, p_header);
OMX_FillThisBuffer(p_sys->omx_handle, p_header);
}
......@@ -1738,16 +1744,17 @@ block_t *DecodeAudio ( decoder_t *p_dec, block_t **pp_block )
{
if(p_header->nFilledLen > p_header->nAllocLen)
{
msg_Dbg(p_dec, "buffer too small (%i,%i)",
(int)p_header->nFilledLen, (int)p_header->nAllocLen);
msg_Dbg(p_dec, "buffer too small (%u,%u)",
(unsigned)p_header->nFilledLen,
(unsigned)p_header->nAllocLen);
p_header->nFilledLen = p_header->nAllocLen;
}
memcpy(p_header->pBuffer, p_block->p_buffer, p_header->nFilledLen );
block_Release(p_block);
}
OMX_DBG( "EmptyThisBuffer %p, %p, %i", p_header, p_header->pBuffer,
(int)p_header->nFilledLen );
OMX_DBG( "EmptyThisBuffer %p, %p, %u", (void *)p_header,
(void *)p_header->pBuffer, (unsigned)p_header->nFilledLen );
OMX_EmptyThisBuffer(p_sys->omx_handle, p_header);
p_sys->in.b_flushed = false;
*pp_block = NULL; /* Avoid being fed the same packet again */
......@@ -1812,8 +1819,8 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pic )
p_header->nOffset = 0;
p_header->nFlags = OMX_BUFFERFLAG_ENDOFFRAME;
p_header->nTimeStamp = ToOmxTicks(p_pic->date);
OMX_DBG( "EmptyThisBuffer %p, %p, %i", p_header, p_header->pBuffer,
(int)p_header->nFilledLen );
OMX_DBG( "EmptyThisBuffer %p, %p, %u", (void *)p_header,
(void *)p_header->pBuffer, (unsigned)p_header->nFilledLen );
OMX_EmptyThisBuffer(p_sys->omx_handle, p_header);
p_sys->in.b_flushed = false;
}
......@@ -1856,7 +1863,8 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pic )
p_header->pAppPrivate = 0;
}
OMX_DBG( "FillThisBuffer %p, %p", p_header, p_header->pBuffer );
OMX_DBG( "FillThisBuffer %p, %p", (void *)p_header,
(void *)p_header->pBuffer );
OMX_FillThisBuffer(p_sys->omx_handle, p_header);
}
......@@ -1950,7 +1958,8 @@ static OMX_ERRORTYPE OmxEmptyBufferDone( OMX_HANDLETYPE omx_handle,
decoder_sys_t *p_sys = p_dec->p_sys;
(void)omx_handle;
OMX_DBG( "OmxEmptyBufferDone %p, %p", omx_header, omx_header->pBuffer );
OMX_DBG( "OmxEmptyBufferDone %p, %p", (void *)omx_header,
(void *)omx_header->pBuffer );
if(omx_header->pAppPrivate || omx_header->pOutputPortPrivate)
{
......@@ -1971,8 +1980,9 @@ static OMX_ERRORTYPE OmxFillBufferDone( OMX_HANDLETYPE omx_handle,
decoder_sys_t *p_sys = p_dec->p_sys;
(void)omx_handle;
OMX_DBG( "OmxFillBufferDone %p, %p, %i, %"PRId64, omx_header, omx_header->pBuffer,
(int)omx_header->nFilledLen, FromOmxTicks(omx_header->nTimeStamp) );
OMX_DBG( "OmxFillBufferDone %p, %p, %u, %"PRId64, (void *)omx_header,
(void *)omx_header->pBuffer, (unsigned)omx_header->nFilledLen,
FromOmxTicks(omx_header->nTimeStamp) );
if(omx_header->pInputPortPrivate)
{
......@@ -2333,7 +2343,8 @@ static int HwBuffer_Start( decoder_t *p_dec, OmxPort *p_port )
HWBUFFER_UNLOCK( p_port );
return -1;
}
OMX_DBG( "FillThisBuffer %p, %p", p_header, p_header->pBuffer );
OMX_DBG( "FillThisBuffer %p, %p", (void *)p_header,
(void *)p_header->pBuffer );
OMX_FillThisBuffer( p_port->omx_handle, p_header );
}
}
......@@ -2528,7 +2539,8 @@ static void *DequeueThread( void *data )
HwBuffer_ChangeState( p_dec, p_port, i_index, BUF_STATE_OWNED );
OMX_DBG( "FillThisBuffer %p, %p", p_header, p_header->pBuffer );
OMX_DBG( "FillThisBuffer %p, %p", (void *)p_header,
(void *)p_header->pBuffer );
OMX_FillThisBuffer( p_sys->omx_handle, p_header );
HWBUFFER_BROADCAST( p_port );
......
......@@ -108,7 +108,8 @@ static OMX_ERRORTYPE OmxEmptyBufferDone(OMX_HANDLETYPE omx_handle,
(void)omx_handle;
#ifndef NDEBUG
msg_Dbg(vd, "OmxEmptyBufferDone %p, %p", omx_header, omx_header->pBuffer);
msg_Dbg(vd, "OmxEmptyBufferDone %p, %p", (void *)omx_header,
(void *)omx_header->pBuffer);
#endif
OMX_FIFO_PUT(&p_sys->port.fifo, omx_header);
......
......@@ -736,10 +736,10 @@ static int OpenVideo( decoder_t *p_dec )
msg_Err( p_dec, "cannot find requested component" );
goto exit_error;
}
msg_Dbg( p_dec, "component id=0x%p", prev );
msg_Dbg( p_dec, "component id=0x%p", (void *)prev );
p_sys->ci = p_sys->OpenComponent( prev );
msg_Dbg( p_dec, "component instance p=0x%p", p_sys->ci );
msg_Dbg( p_dec, "component instance p=0x%p", (void *)p_sys->ci );
memset( &icap, 0, sizeof( ImageSubCodecDecompressCapabilities ) );
cres = p_sys->ImageCodecInitialize( p_sys->ci, &icap );
......
......@@ -1613,9 +1613,9 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
{
vlc_list_t *p_list;
i_int = (int)va_arg( args, int );
i_int = va_arg( args, int );
p_list = (vlc_list_t *)va_arg( args, vlc_list_t * );
msg_Dbg( p_demux, "DEMUX_SET_GROUP %d %p", i_int, p_list );
msg_Dbg( p_demux, "DEMUX_SET_GROUP %d %p", i_int, (void *)p_list );
if( i_int != 0 ) /* If not default program */
{
......
......@@ -714,7 +714,7 @@ static int SubDrawObject(intf_sys_t *sys, int l, vlc_object_t *p_obj, int i_leve
{
char *name = vlc_object_get_name(p_obj);
MainBoxWrite(sys, l++, "%*s%s%s \"%s\" (%p)", 2 * i_level++, "", prefix,
p_obj->psz_object_type, name ? name : "", p_obj);
p_obj->psz_object_type, name ? name : "", (void *)p_obj);
free(name);
vlc_list_t *list = vlc_list_children(p_obj);
......
......@@ -119,7 +119,7 @@ void CtrlVideo::setLayout( GenericLayout *pLayout,
VoutManager::instance( getIntf() )->registerCtrlVideo( this );
msg_Dbg( getIntf(),"New VideoControl detected(%p), useability=%s",
this, isUseable() ? "true" : "false" );
(void *)this, isUseable() ? "true" : "false" );
}
......@@ -169,23 +169,23 @@ void CtrlVideo::onUpdate( Subject<VarBool> &rVariable, void *arg )
if( &rVariable == m_pVisible )
{
msg_Dbg( getIntf(), "VideoCtrl(%p) : control visibility changed (%i)",
this, isVisible() );
(void *)this, isVisible() );
notifyLayout();
}
else if( &rVariable == &m_pLayout->getActiveVar() )
{
msg_Dbg( getIntf(), "VideoCtrl(%p) : Active Layout changed (%i)",
this, m_pLayout->getActiveVar().get() );
(void *)this, m_pLayout->getActiveVar().get() );
}
else if( &rVariable == &getWindow()->getVisibleVar() )
{
msg_Dbg( getIntf(), "VideoCtrl(%p) : Window visibility changed (%i)",
this, getWindow()->getVisibleVar().get() );
(void *)this, getWindow()->getVisibleVar().get() );
}
else if( &rVariable == &rFullscreen )
{
msg_Dbg( getIntf(), "VideoCtrl(%p) : fullscreen toggled (%i)",
this, rFullscreen.get() );
(void *)this, rFullscreen.get() );
}
if( isUseable() && !isUsed() )
......
......@@ -449,7 +449,7 @@ void VlcProc::on_intf_event_changed( vlc_object_t* p_obj, vlc_value_t newVal )
if( !getIntf()->p_sys->p_input )
{
msg_Dbg( getIntf(), "new input %p detected", pInput );
msg_Dbg( getIntf(), "new input %p detected", (void *)pInput );
getIntf()->p_sys->p_input = pInput;
vlc_object_hold( pInput );
......@@ -544,7 +544,8 @@ void VlcProc::on_intf_event_changed( vlc_object_t* p_obj, vlc_value_t newVal )
break;
case INPUT_EVENT_DEAD:
msg_Dbg( getIntf(), "end of input detected for %p", pInput );
msg_Dbg( getIntf(), "end of input detected for %p",
(void *)pInput );
var_DelCallback( pInput, "intf-event", onGenericCallback2, this );
var_DelCallback( pInput, "bit-rate", onGenericCallback, this );
......
......@@ -213,7 +213,7 @@ void VoutManager::acceptWnd( vout_window_t* pWnd, int width, int height )
m_SavedWndVec.push_back( SavedWnd( pWnd, pVoutWindow, pCtrlVideo ) );
msg_Dbg( pWnd, "New vout : Ctrl = %p, w x h = %ix%i",
pCtrlVideo, width, height );
(void *)pCtrlVideo, width, height );
}
......@@ -226,7 +226,7 @@ void VoutManager::releaseWnd( vout_window_t* pWnd )
if( it->pWnd == pWnd )
{
msg_Dbg( getIntf(), "vout released vout=%p, VideoCtrl=%p",
pWnd, it->pCtrlVideo );
(void *)pWnd, it->pCtrlVideo );
// if a video control was being used, detach from it
if( it->pCtrlVideo )
......
......@@ -437,7 +437,8 @@ static void flush(filter_t *filter)
while ((buffer = mmal_queue_get(sys->filtered_pictures))) {
picture_t *pic = (picture_t *)buffer->user_data;
msg_Dbg(filter, "flush: release already filtered pic %p", pic);
msg_Dbg(filter, "flush: release already filtered pic %p",
(void *)pic);
picture_Release(pic);
}
msg_Dbg(filter, "flush: done");
......
......@@ -432,7 +432,7 @@ static picture_t *Render(filter_t *filter, picture_t *src, bool import)
if (unlikely(src->context == NULL))
{
msg_Err(filter, "corrupt VDPAU video surface %p", src);
msg_Err(filter, "corrupt VDPAU video surface %p", (void *)src);
picture_Release(src);
return NULL;
}
......
......@@ -148,7 +148,7 @@ int ANativeWindowPriv_setUsage( native_window_priv *priv, bool is_hw, int hw_us
{
status_t err;
LOGD( "setUsage: %p, %d %X\n", priv->anw, is_hw, hw_usage );
LOGD( "setUsage: %p, %d %X\n", (void *)priv->anw, is_hw, hw_usage );
if( is_hw )
{
......@@ -170,7 +170,7 @@ int ANativeWindowPriv_setBuffersGeometry( native_window_priv *priv, int w, int h
{
status_t err;
LOGD( "setBuffersGeometry: %p, %d, %d", priv->anw, w, h );
LOGD( "setBuffersGeometry: %p, %d, %d", (void *)priv->anw, w, h );
#if ANDROID_ICS_OR_LATER
err = native_window_set_buffers_format( priv->anw, hal_format );
......@@ -205,7 +205,7 @@ int ANativeWindowPriv_getMinUndequeued( native_window_priv *priv, unsigned int *
if( *min_undequeued == 0 )
*min_undequeued = 1;
LOGD( "getMinUndequeued: %p %u", priv->anw, *min_undequeued );
LOGD( "getMinUndequeued: %p %u", (void *)priv->anw, *min_undequeued );
return 0;
}
......@@ -224,7 +224,7 @@ int ANativeWindowPriv_setBufferCount(native_window_priv *priv, unsigned int coun
{
status_t err;
LOGD( "setBufferCount: %p %u", priv->anw, count );
LOGD( "setBufferCount: %p %u", (void *)priv->anw, count );
err = native_window_set_buffer_count( priv->anw, count );
CHECK_ERR();
......
......@@ -221,7 +221,7 @@ static void Prepare(vout_display_t *vd, picture_t *picture, subpicture_t *subpic
#ifndef NDEBUG
/*msg_Dbg(vd, "Bitmap dbg: target = %p, pitch = %d, bitmap = %p",
sys->d2_render_target, pitch, sys->d2_bitmap);*/
(void *)sys->d2_render_target, pitch, (void *)sys->d2_bitmap);*/
#endif
}
VLC_UNUSED(subpicture);
......@@ -372,7 +372,7 @@ static int D2D_CreateRenderTarget(vout_display_t *vd)
#ifndef NDEBUG
msg_Dbg(vd, "Render trgt dbg: dpi = %f, render_target = %p, bitmap = %p",
dpi_x, sys->d2_render_target, sys->d2_bitmap);
dpi_x, (void *)sys->d2_render_target, (void *)sys->d2_bitmap);
#endif
return VLC_SUCCESS;
......
......@@ -952,7 +952,9 @@ static int Direct3D11Open(vout_display_t *vd, video_format_t *fmt)
&sys->d3ddevice, NULL, &sys->d3dcontext);
if (SUCCEEDED(hr)) {
#ifndef NDEBUG
msg_Dbg(vd, "Created the D3D11 device 0x%p ctx 0x%p type %d.", sys->d3ddevice, sys->d3dcontext, driverAttempts[driver]);
msg_Dbg(vd, "Created the D3D11 device 0x%p ctx 0x%p type %d.",
(void *)sys->d3ddevice, (void *)sys->d3dcontext,
driverAttempts[driver]);
#endif
break;
}
......
......@@ -1551,7 +1551,8 @@ static int Direct3D9ImportPicture(vout_display_t *vd,
hr = IDirect3DDevice9_StretchRect(sys->d3ddev, source, &cropSource, destination, NULL, D3DTEXF_LINEAR);
IDirect3DSurface9_Release(destination);
if (FAILED(hr)) {
msg_Dbg(vd, "Failed IDirect3DDevice9_StretchRect: source 0x%p 0x%0lx", source, hr);
msg_Dbg(vd, "Failed IDirect3DDevice9_StretchRect: source 0x%p 0x%0lx",
(LPVOID)source, hr);
return VLC_EGENERIC;
}
......
......@@ -477,9 +477,9 @@ event_thread_t *EventThreadCreate( vout_display_t *vd)
vout_display_PlacePicture(&p_event->place, &vd->source, vd->cfg, false);
_sntprintf( p_event->class_main, sizeof(p_event->class_main)/sizeof(*p_event->class_main),
_T("VLC video main %p"), p_event );
_T("VLC video main %p"), (void *)p_event );
_sntprintf( p_event->class_video, sizeof(p_event->class_video)/sizeof(*p_event->class_video),
_T("VLC video output %p"), p_event );
_T("VLC video output %p"), (void *)p_event );
return p_event;
}
......
......@@ -76,7 +76,7 @@ stream_t *stream_FilterAutoNew( stream_t *p_source )
if( p_filter == NULL )
break;
msg_Dbg( p_filter, "stream filter added to %p", p_source );
msg_Dbg( p_filter, "stream filter added to %p", (void *)p_source );
p_source = p_filter;
}
return p_source;
......
......@@ -45,7 +45,8 @@
#ifndef NDEBUG
static void BlockNoRelease( block_t *b )
{
fprintf( stderr, "block %p has no release callback! This is a bug!\n", b );
fprintf( stderr, "block %p has no release callback! This is a bug!\n",
(void *) b );
abort();
}
......
......@@ -239,7 +239,7 @@ filter_t *filter_chain_AppendFilter( filter_chain_t *chain, const char *name,
msg_Dbg( parent, "Filter '%s' (%p) appended to chain",
(name != NULL) ? name : module_get_name(filter->p_module, false),
filter );
(void *)filter );
return filter;
error:
......@@ -281,7 +281,7 @@ void filter_chain_DeleteFilter( filter_chain_t *chain, filter_t *filter )
module_unneed( filter, filter->p_module );
msg_Dbg( obj, "Filter %p removed from chain", filter );
msg_Dbg( obj, "Filter %p removed from chain", (void *)filter );
FilterDeletePictures( chained->pending );
free( chained->mouse );
......
......@@ -506,10 +506,10 @@ static void PrintObject( vlc_object_internals_t *priv,
/* FIXME: need structure lock!!! */
if( vlc_externals(priv)->p_parent )
snprintf( psz_parent, 19, ", parent %p",
vlc_externals(priv)->p_parent );
(void *)vlc_externals(priv)->p_parent );
printf( " %so %p %s%s%s%s\n", psz_prefix,
vlc_externals(priv), vlc_externals(priv)->psz_object_type,
(void *)vlc_externals(priv), vlc_externals(priv)->psz_object_type,
psz_name, psz_refcount, psz_parent );
vlc_restorecancel (canc);
}
......
......@@ -905,8 +905,8 @@ static int AddCallback( vlc_object_t *p_this, const char *psz_name,
if( p_var == NULL )
{
vlc_mutex_unlock( &p_priv->var_lock );
msg_Err( p_this, "cannot add callback %p to nonexistent "
"variable '%s'", entry.u.p_callback, psz_name );
msg_Err( p_this, "cannot add callback %p to nonexistent variable '%s'",
(void *)entry.u.p_callback, psz_name );
return VLC_ENOVAR;
}
......
......@@ -166,7 +166,8 @@ sout_packetizer_input_t *sout_InputNew( sout_instance_t *p_sout,
p_input->p_sout = p_sout;
p_input->p_fmt = p_fmt;
msg_Dbg( p_sout, "adding a new sout input (sout_input:%p)", p_input );
msg_Dbg( p_sout, "adding a new sout input (sout_input: %p)",
(void *)p_input );
if( p_fmt->i_codec == VLC_CODEC_NULL )
{
......@@ -195,7 +196,8 @@ int sout_InputDelete( sout_packetizer_input_t *p_input )
{
sout_instance_t *p_sout = p_input->p_sout;
msg_Dbg( p_sout, "removing a sout input (sout_input:%p)", p_input );
msg_Dbg( p_sout, "removing a sout input (sout_input: %p)",
(void *)p_input );
if( p_input->p_fmt->i_codec != VLC_CODEC_NULL )
{
......
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