Skip to content

Commit

Permalink
No need to add a '\n' at the end of messages passed to msg_*
Browse files Browse the repository at this point in the history
  • Loading branch information
@ivoire
ivoire committed Feb 14, 2009
1 parent 41e414d commit 72fa5a9
Show file tree
Hide file tree
Showing 26 changed files with 59 additions and 59 deletions.
4 changes: 2 additions & 2 deletions modules/access/cdda/access.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,14 +302,14 @@ static block_t * CDDAReadBlocks( access_t * p_access )
char *psz_mes = cdio_cddap_messages( p_cdda->paranoia_cd );

if( psz_mes || psz_err )
msg_Err( p_access, "%s%s\n", psz_mes ? psz_mes: "",
msg_Err( p_access, "%s%s", psz_mes ? psz_mes: "",
psz_err ? psz_err: "" );

free( psz_err );
free( psz_mes );
if( !p_readbuf )
{
msg_Err( p_access, "paranoia read error on frame %i\n",
msg_Err( p_access, "paranoia read error on frame %i",
p_cdda->i_lsn+i );
}
else
Expand Down
4 changes: 2 additions & 2 deletions modules/access/dv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ static int Raw1394GetNumPorts( access_t *p_access )

if ( ( n_ports = raw1394_get_port_info( handle, pinf, 16 ) ) < 0 )
{
msg_Err( p_access, "raw1394 - failed to get port info: %m.\n" );
msg_Err( p_access, "raw1394 - failed to get port info: %m." );
raw1394_destroy_handle( handle );
return VLC_EGENERIC;
}
Expand Down Expand Up @@ -573,7 +573,7 @@ static int DiscoverAVC( access_t *p_access, int* port, uint64_t guid )
/* select first AV/C Tape Reccorder Player node */
if( rom1394_get_directory( handle, i, &rom_dir ) < 0 )
{
msg_Err( p_access, "error reading config rom directory for node %d\n", i );
msg_Err( p_access, "error reading config rom directory for node %d", i );
continue;
}
if( ( rom1394_get_node_type( &rom_dir ) == ROM1394_NODE_TYPE_AVC ) &&
Expand Down
2 changes: 1 addition & 1 deletion modules/access/vcd/cdrom.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@ int ioctl_ReadSectors( vlc_object_t *p_this, const vcddev_t *p_vcddev,
}
if( sc.retsts || sc.error )
{
msg_Err( p_this, "SCSI command failed: status %d error %d\n",
msg_Err( p_this, "SCSI command failed: status %d error %d",
sc.retsts, sc.error );
if( i_type == VCD_TYPE ) free( p_block );
return -1;
Expand Down
6 changes: 3 additions & 3 deletions modules/access/vcd/vcd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,8 @@ static int Open( vlc_object_t *p_this )
{
input_title_t *t = p_sys->title[i] = vlc_input_title_New();

msg_Dbg( p_access, "title[%d] start=%d\n", i, p_sys->p_sectors[1+i] );
msg_Dbg( p_access, "title[%d] end=%d\n", i, p_sys->p_sectors[i+2] );
msg_Dbg( p_access, "title[%d] start=%d", i, p_sys->p_sectors[1+i] );
msg_Dbg( p_access, "title[%d] end=%d", i, p_sys->p_sectors[i+2] );

t->i_size = ( p_sys->p_sectors[i+2] - p_sys->p_sectors[i+1] ) *
(int64_t)VCD_DATA_SIZE;
Expand Down Expand Up @@ -490,7 +490,7 @@ static int EntryPoints( access_t *p_access )
if( i_title < 0 ) continue; /* Should not occur */
if( i_title >= p_sys->i_titles ) continue;

msg_Dbg( p_access, "Entry[%d] title=%d sector=%d\n",
msg_Dbg( p_access, "Entry[%d] title=%d sector=%d",
i, i_title, i_sector );

s = vlc_seekpoint_New();
Expand Down
14 changes: 7 additions & 7 deletions modules/audio_filter/spatializer/spatializer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ static int Open( vlc_object_t *p_this )
aout_filter_t *p_filter = (aout_filter_t *)p_this;
aout_filter_sys_t *p_sys;
bool b_fit = true;
msg_Dbg(p_this, "Opening filter spatializer %s %s %d\n", __FILE__,__func__,__LINE__);
msg_Dbg(p_this, "Opening filter spatializer %s %s %d", __FILE__,__func__,__LINE__);

if( p_filter->input.i_format != VLC_FOURCC('f','l','3','2' ) ||
p_filter->output.i_format != VLC_FOURCC('f','l','3','2') )
Expand Down Expand Up @@ -185,7 +185,7 @@ static void Close( vlc_object_t *p_this )
delete p_sys->p_reverbm;
vlc_mutex_destroy( &p_sys->lock );
free( p_sys );
msg_Dbg(p_this, "Closing filter spatializer %s %s %d\n", __FILE__,__func__,__LINE__);
msg_Dbg(p_this, "Closing filter spatializer %s %s %d", __FILE__,__func__,__LINE__);
}

/*****************************************************************************
Expand Down Expand Up @@ -280,7 +280,7 @@ static int RoomCallback( vlc_object_t *p_this, char const *psz_cmd,
CLocker locker( &p_sys->lock );

p_sys->p_reverbm->setroomsize(newval.f_float);
msg_Dbg (p_this,"room callback %3.1f %s %s %d\n", newval.f_float, __FILE__,__func__,__LINE__);
msg_Dbg (p_this,"room callback %3.1f %s %s %d", newval.f_float, __FILE__,__func__,__LINE__);
return VLC_SUCCESS;
}

Expand All @@ -291,7 +291,7 @@ static int WidthCallback( vlc_object_t *p_this, char const *psz_cmd,
CLocker locker( &p_sys->lock );

p_sys->p_reverbm->setwidth(newval.f_float);
msg_Dbg (p_this,"width callback %3.1f %s %s %d\n", newval.f_float, __FILE__,__func__,__LINE__);
msg_Dbg (p_this,"width callback %3.1f %s %s %d", newval.f_float, __FILE__,__func__,__LINE__);
return VLC_SUCCESS;
}
static int WetCallback( vlc_object_t *p_this, char const *psz_cmd,
Expand All @@ -301,7 +301,7 @@ static int WetCallback( vlc_object_t *p_this, char const *psz_cmd,
CLocker locker( &p_sys->lock );

p_sys->p_reverbm->setwet(newval.f_float);
msg_Dbg (p_this,"wet callback %3.1f %s %s %d\n", newval.f_float, __FILE__,__func__,__LINE__);
msg_Dbg (p_this,"wet callback %3.1f %s %s %d", newval.f_float, __FILE__,__func__,__LINE__);
return VLC_SUCCESS;
}
static int DryCallback( vlc_object_t *p_this, char const *psz_cmd,
Expand All @@ -311,7 +311,7 @@ static int DryCallback( vlc_object_t *p_this, char const *psz_cmd,
CLocker locker( &p_sys->lock );

p_sys->p_reverbm->setdry(newval.f_float);
msg_Dbg (p_this,"dry callback %3.1f %s %s %d\n", newval.f_float, __FILE__,__func__,__LINE__);
msg_Dbg (p_this,"dry callback %3.1f %s %s %d", newval.f_float, __FILE__,__func__,__LINE__);
return VLC_SUCCESS;
}
static int DampCallback( vlc_object_t *p_this, char const *psz_cmd,
Expand All @@ -321,7 +321,7 @@ static int DampCallback( vlc_object_t *p_this, char const *psz_cmd,
CLocker locker( &p_sys->lock );

p_sys->p_reverbm->setdamp(newval.f_float);
msg_Dbg (p_this, "damp callback %3.1f %s %s %d\n", newval.f_float, __FILE__,__func__,__LINE__);
msg_Dbg (p_this, "damp callback %3.1f %s %s %d", newval.f_float, __FILE__,__func__,__LINE__);
return VLC_SUCCESS;
}

2 changes: 1 addition & 1 deletion modules/codec/avcodec/encoder.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ int OpenEncoder( vlc_object_t *p_this )
msg_Err( p_enc, "cannot find encoder %s\n"
"*** Your FFMPEG installation is crippled. ***\n"
"*** Please check with your FFMPEG packager. ***\n"
"*** This is NOT a VLC media player issue. ***\n", psz_namecodec );
"*** This is NOT a VLC media player issue. ***", psz_namecodec );

intf_UserFatal( p_enc, false, _("Streaming / Transcoding failed"), _(
/* I have had enough of all these MPEG-3 transcoding bug reports.
Expand Down
2 changes: 1 addition & 1 deletion modules/codec/dirac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -800,7 +800,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pic )
p_sys->p_dirac = dirac_encoder_init( &p_sys->ctx, 0 );
if( !p_sys->p_dirac )
{
msg_Err( p_enc, "Failed to initialize dirac encoder\n" );
msg_Err( p_enc, "Failed to initialize dirac encoder" );
p_enc->b_error = 1;
return NULL;
}
Expand Down
10 changes: 5 additions & 5 deletions modules/codec/kate.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -709,13 +709,13 @@ static void GetVideoSize( decoder_t *p_dec, int *w, int *h )
{
*w = p_sys->ki.original_canvas_width;
*h = p_sys->ki.original_canvas_height;
msg_Dbg( p_dec, "original canvas %zu %zu\n",
msg_Dbg( p_dec, "original canvas %zu %zu",
p_sys->ki.original_canvas_width, p_sys->ki.original_canvas_height );
}
else
{
/* nothing, leave defaults */
msg_Dbg( p_dec, "original canvas size unknown\n");
msg_Dbg( p_dec, "original canvas size unknown");
}
#else
/* keep this just in case it might be allowed one day ;) */
Expand All @@ -734,7 +734,7 @@ static void GetVideoSize( decoder_t *p_dec, int *w, int *h )
*w = p_vout->fmt_in.i_width;
*h = p_vout->fmt_in.i_height;
}
msg_Dbg( p_dec, "video: in %d %d, out %d %d, original canvas %zu %zu\n",
msg_Dbg( p_dec, "video: in %d %d, out %d %d, original canvas %zu %zu",
p_vout->fmt_in.i_width, p_vout->fmt_in.i_height,
p_vout->fmt_out.i_width, p_vout->fmt_out.i_height,
p_sys->ki.original_canvas_width, p_sys->ki.original_canvas_height );
Expand Down Expand Up @@ -1110,7 +1110,7 @@ static int OnConfigurationChanged( decoder_t *p_dec, const char *psz_var,

vlc_mutex_lock( &p_sys->lock );

msg_Dbg( p_dec, "OnConfigurationChanged: %s\n", psz_var );
msg_Dbg( p_dec, "OnConfigurationChanged: %s", psz_var );

if( !p_sys->b_use_tiger || !p_sys->p_tr )
{
Expand Down Expand Up @@ -1366,7 +1366,7 @@ static subpicture_t *SetupSimpleKateSPU( decoder_t *p_dec, subpicture_t *p_spu,
/* create the bitmap */
CreateKateBitmap( p_bitmap_region->p_picture, ev->bitmap );

msg_Dbg(p_dec, "Created bitmap, %zux%zu, %zu colors\n", ev->bitmap->width, ev->bitmap->height, ev->palette->ncolors);
msg_Dbg(p_dec, "Created bitmap, %zux%zu, %zu colors", ev->bitmap->width, ev->bitmap->height, ev->palette->ncolors);
}

/* text region */
Expand Down
12 changes: 6 additions & 6 deletions modules/codec/quicktime.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -746,17 +746,17 @@ static int OpenVideo( decoder_t *p_dec )

memset( &icap, 0, sizeof( ImageSubCodecDecompressCapabilities ) );
cres = p_sys->ImageCodecInitialize( p_sys->ci, &icap );
msg_Dbg( p_dec, "ImageCodecInitialize->0x%X size=%d (%d)\n",
msg_Dbg( p_dec, "ImageCodecInitialize->0x%X size=%d (%d)",
(int)cres, (int)icap.recordSize, (int)icap.decompressRecordSize);

memset( &cinfo, 0, sizeof( CodecInfo ) );
cres = p_sys->ImageCodecGetCodecInfo( p_sys->ci, &cinfo );
msg_Dbg( p_dec,
"Flags: compr: 0x%x decomp: 0x%x format: 0x%x\n",
"Flags: compr: 0x%x decomp: 0x%x format: 0x%x",
(unsigned int)cinfo.compressFlags,
(unsigned int)cinfo.decompressFlags,
(unsigned int)cinfo.formatFlags );
msg_Dbg( p_dec, "quicktime_video: Codec name: %.*s\n",
msg_Dbg( p_dec, "quicktime_video: Codec name: %.*s",
((unsigned char*)&cinfo.typeName)[0],
((unsigned char*)&cinfo.typeName)+1 );

Expand Down Expand Up @@ -822,7 +822,7 @@ static int OpenVideo( decoder_t *p_dec )
p_sys->plane,
p_dec->fmt_in.video.i_width * 2 );

msg_Dbg( p_dec, "NewGWorldFromPtr returned:%ld\n",
msg_Dbg( p_dec, "NewGWorldFromPtr returned:%ld",
65536 - ( i_result&0xffff ) );

memset( &p_sys->decpar, 0, sizeof( CodecDecompressParams ) );
Expand All @@ -840,7 +840,7 @@ static int OpenVideo( decoder_t *p_dec )
p_sys->decpar.dstPixMap = **p_sys->GetGWorldPixMap( p_sys->OutBufferGWorld );/*destPixmap; */

cres = p_sys->ImageCodecPreDecompress( p_sys->ci, &p_sys->decpar );
msg_Dbg( p_dec, "quicktime_video: ImageCodecPreDecompress cres=0x%X\n",
msg_Dbg( p_dec, "quicktime_video: ImageCodecPreDecompress cres=0x%X",
(int)cres );

es_format_Init( &p_dec->fmt_out, VIDEO_ES, VLC_FOURCC( 'Y', 'U', 'Y', '2' ));
Expand Down Expand Up @@ -937,7 +937,7 @@ static picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
if( cres &0xFFFF )
{
msg_Dbg( p_dec, "quicktime_video: ImageCodecBandDecompress"
" cres=0x%X (-0x%X) %d :(\n",
" cres=0x%X (-0x%X) %d :(",
(int)cres,(int)-cres, (int)cres );
}

Expand Down
16 changes: 8 additions & 8 deletions modules/control/dbus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ DBUS_METHOD( PositionSet )

if( dbus_error_is_set( &error ) )
{
msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s\n",
msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s",
error.message );
dbus_error_free( &error );
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
Expand Down Expand Up @@ -243,7 +243,7 @@ DBUS_METHOD( VolumeSet )

if( dbus_error_is_set( &error ) )
{
msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s\n",
msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s",
error.message );
dbus_error_free( &error );
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
Expand Down Expand Up @@ -392,7 +392,7 @@ DBUS_METHOD( AddTrack )

if( dbus_error_is_set( &error ) )
{
msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s\n",
msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s",
error.message );
dbus_error_free( &error );
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
Expand Down Expand Up @@ -443,7 +443,7 @@ DBUS_METHOD( GetMetadata )
{
PL_UNLOCK;
pl_Release( (vlc_object_t*) p_this );
msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s\n",
msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s",
error.message );
dbus_error_free( &error );
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
Expand Down Expand Up @@ -488,7 +488,7 @@ DBUS_METHOD( DelTrack )

if( dbus_error_is_set( &error ) )
{
msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s\n",
msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s",
error.message );
dbus_error_free( &error );
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
Expand Down Expand Up @@ -525,7 +525,7 @@ DBUS_METHOD( SetLoop )

if( dbus_error_is_set( &error ) )
{
msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s\n",
msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s",
error.message );
dbus_error_free( &error );
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
Expand Down Expand Up @@ -556,7 +556,7 @@ DBUS_METHOD( Repeat )

if( dbus_error_is_set( &error ) )
{
msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s\n",
msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s",
error.message );
dbus_error_free( &error );
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
Expand Down Expand Up @@ -588,7 +588,7 @@ DBUS_METHOD( SetRandom )

if( dbus_error_is_set( &error ) )
{
msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s\n",
msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s",
error.message );
dbus_error_free( &error );
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
Expand Down
4 changes: 2 additions & 2 deletions modules/gui/pda/pda_callbacks.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ void onFileListRow(GtkTreeView *treeview, GtkTreePath *path,
p_model = gtk_tree_view_get_model(treeview);
if (!p_model)
{
msg_Err(p_intf, "PDA: Filelist model contains a NULL pointer\n" );
msg_Err(p_intf, "PDA: Filelist model contains a NULL pointer" );
return;
}
if (!gtk_tree_model_get_iter(p_model, &iter, path))
Expand Down Expand Up @@ -785,7 +785,7 @@ void onPlaylistRow(GtkTreeView *treeview, GtkTreePath *path,
p_model = gtk_tree_view_get_model(treeview);
if (!p_model)
{
msg_Err(p_intf, "PDA: Playlist model contains a NULL pointer\n" );
msg_Err(p_intf, "PDA: Playlist model contains a NULL pointer" );
return;
}
if (!gtk_tree_model_get_iter(p_model, &iter, path))
Expand Down
2 changes: 1 addition & 1 deletion modules/gui/qt4/components/extended_panels.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ void ExtVideo::ChangeVFiltersString( const char *psz_name, bool b_add )
module_t *p_obj = module_find( psz_name );
if( !p_obj )
{
msg_Err( p_intf, "Unable to find filter module \"%s\n.", psz_name );
msg_Err( p_intf, "Unable to find filter module \"%s\".", psz_name );
return;
}

Expand Down
2 changes: 1 addition & 1 deletion modules/meta_engine/taglib.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ static int WriteMeta( vlc_object_t *p_this )

if( f.isNull() || !f.tag() || f.file()->readOnly() )
{
msg_Err( p_this, "File %s can't be opened for tag writing\n",
msg_Err( p_this, "File %s can't be opened for tag writing",
p_export->psz_file );
return VLC_EGENERIC;
}
Expand Down
4 changes: 2 additions & 2 deletions modules/misc/svg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,14 +415,14 @@ static void svg_RenderPicture( filter_t *p_filter,
( guchar* )p_svg->psz_text, strlen( p_svg->psz_text ),
&error ) )
{
msg_Err( p_filter, "error while rendering SVG: %s\n", error->message );
msg_Err( p_filter, "error while rendering SVG: %s", error->message );
g_object_unref( G_OBJECT( p_handle ) );
return;
}

if( ! rsvg_handle_close( p_handle, &error ) )
{
msg_Err( p_filter, "error while rendering SVG (close): %s\n", error->message );
msg_Err( p_filter, "error while rendering SVG (close): %s", error->message );
g_object_unref( G_OBJECT( p_handle ) );
return;
}
Expand Down
2 changes: 1 addition & 1 deletion modules/services_discovery/sap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1246,7 +1246,7 @@ static sdp_t *ParseSDP (vlc_object_t *p_obj, const char *psz_sdp)
|| ((p_sdp->orig_ip_version != 4)
&& (p_sdp->orig_ip_version != 6)))
{
msg_Dbg (p_obj, "SDP origin not supported: %s\n", data);
msg_Dbg (p_obj, "SDP origin not supported: %s", data);
/* Or maybe out-of-range, but this looks suspicious */
return NULL;
}
Expand Down
2 changes: 1 addition & 1 deletion modules/stream_out/mosaic_bridge.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )

/* Create user specified video filters */
psz_chain = var_GetNonEmptyString( p_stream, CFG_PREFIX "vfilter" );
msg_Dbg( p_stream, "psz_chain: %s\n", psz_chain );
msg_Dbg( p_stream, "psz_chain: %s", psz_chain );
if( psz_chain )
{
p_sys->p_vf2 = filter_chain_New( p_stream, "video filter2", false,
Expand Down
4 changes: 2 additions & 2 deletions modules/video_filter/chain.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,13 @@ static int BuildChromaChain( filter_t *p_filter )

if( var_Create( p_filter, MODULE_STRING"-level", VLC_VAR_INTEGER | (b_first ? VLC_VAR_DOINHERIT : 0 ) ) )
{
msg_Err( p_filter, "Failed to create %s variable\n", psz_option );
msg_Err( p_filter, "Failed to create %s variable", psz_option );
return VLC_EGENERIC;
}
int i_level = var_GetInteger( p_filter, psz_option );
if( i_level >= CHAIN_LEVEL_MAX )
{
msg_Err( p_filter, "Too high level of recursion (%d)\n", i_level );
msg_Err( p_filter, "Too high level of recursion (%d)", i_level );
return VLC_EGENERIC;
}
var_SetInteger( p_filter, psz_option, i_level + 1 );
Expand Down
Loading

0 comments on commit 72fa5a9

Please sign in to comment.