From: Rémi Duraffort Date: Thu, 12 Feb 2009 17:11:36 +0000 (+0100) Subject: No need to add a '\n' at the end of messages passed to msg_* X-Git-Tag: 1.0.0-pre1~685 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=72fa5a9d8e8f5a1bbe0d83ffd1f30b3265a531c7;p=vlc No need to add a '\n' at the end of messages passed to msg_* --- diff --git a/modules/access/cdda/access.c b/modules/access/cdda/access.c index 942b8e7879..da76ede67f 100644 --- a/modules/access/cdda/access.c +++ b/modules/access/cdda/access.c @@ -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 diff --git a/modules/access/dv.c b/modules/access/dv.c index b1f6b9633b..e6922571e8 100644 --- a/modules/access/dv.c +++ b/modules/access/dv.c @@ -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; } @@ -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 ) && diff --git a/modules/access/vcd/cdrom.c b/modules/access/vcd/cdrom.c index 4ac51277dc..5ece9962c2 100644 --- a/modules/access/vcd/cdrom.c +++ b/modules/access/vcd/cdrom.c @@ -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; diff --git a/modules/access/vcd/vcd.c b/modules/access/vcd/vcd.c index 4747221462..96e400c3c0 100644 --- a/modules/access/vcd/vcd.c +++ b/modules/access/vcd/vcd.c @@ -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; @@ -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(); diff --git a/modules/audio_filter/spatializer/spatializer.cpp b/modules/audio_filter/spatializer/spatializer.cpp index 822029f2bb..2bee57e8e1 100644 --- a/modules/audio_filter/spatializer/spatializer.cpp +++ b/modules/audio_filter/spatializer/spatializer.cpp @@ -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') ) @@ -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__); } /***************************************************************************** @@ -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; } @@ -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, @@ -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, @@ -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, @@ -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; } diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c index 0e8a0c71cb..6cbe672600 100644 --- a/modules/codec/avcodec/encoder.c +++ b/modules/codec/avcodec/encoder.c @@ -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. diff --git a/modules/codec/dirac.c b/modules/codec/dirac.c index 7367fd067b..8505bd2822 100644 --- a/modules/codec/dirac.c +++ b/modules/codec/dirac.c @@ -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; } diff --git a/modules/codec/kate.c b/modules/codec/kate.c index dc91302fed..6af25e4d25 100644 --- a/modules/codec/kate.c +++ b/modules/codec/kate.c @@ -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 ;) */ @@ -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 ); @@ -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 ) { @@ -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 */ diff --git a/modules/codec/quicktime.c b/modules/codec/quicktime.c index b9ef7aea40..9692208759 100644 --- a/modules/codec/quicktime.c +++ b/modules/codec/quicktime.c @@ -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 ); @@ -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 ) ); @@ -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' )); @@ -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 ); } diff --git a/modules/control/dbus.c b/modules/control/dbus.c index 6da7504453..3d1390fbff 100644 --- a/modules/control/dbus.c +++ b/modules/control/dbus.c @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; diff --git a/modules/gui/pda/pda_callbacks.c b/modules/gui/pda/pda_callbacks.c index 9811b79968..0fb187ab78 100644 --- a/modules/gui/pda/pda_callbacks.c +++ b/modules/gui/pda/pda_callbacks.c @@ -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)) @@ -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)) diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp index 349dca46cf..b78a3ba47a 100644 --- a/modules/gui/qt4/components/extended_panels.cpp +++ b/modules/gui/qt4/components/extended_panels.cpp @@ -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; } diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp index 504835a602..c5740aa068 100644 --- a/modules/meta_engine/taglib.cpp +++ b/modules/meta_engine/taglib.cpp @@ -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; } diff --git a/modules/misc/svg.c b/modules/misc/svg.c index afaa6f7ea1..78f6828740 100644 --- a/modules/misc/svg.c +++ b/modules/misc/svg.c @@ -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; } diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c index b7286ff31f..a7cde36d8d 100644 --- a/modules/services_discovery/sap.c +++ b/modules/services_discovery/sap.c @@ -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; } diff --git a/modules/stream_out/mosaic_bridge.c b/modules/stream_out/mosaic_bridge.c index 247a7dfc22..e7a8d85e80 100644 --- a/modules/stream_out/mosaic_bridge.c +++ b/modules/stream_out/mosaic_bridge.c @@ -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, diff --git a/modules/video_filter/chain.c b/modules/video_filter/chain.c index 4d8b16c4bb..d56f67e5e8 100644 --- a/modules/video_filter/chain.c +++ b/modules/video_filter/chain.c @@ -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 ); diff --git a/modules/video_filter/opencv_example.cpp b/modules/video_filter/opencv_example.cpp index aa6ed84f25..310e16f717 100644 --- a/modules/video_filter/opencv_example.cpp +++ b/modules/video_filter/opencv_example.cpp @@ -103,11 +103,11 @@ static int OpenFilter( vlc_object_t *p_this ) //create the VIDEO_FILTER_EVENT_VARIABLE vlc_value_t val; if (var_Create( p_filter->p_libvlc, VIDEO_FILTER_EVENT_VARIABLE, VLC_VAR_ADDRESS | VLC_VAR_DOINHERIT ) != VLC_SUCCESS) - msg_Err( p_filter, "Could not create %s\n", VIDEO_FILTER_EVENT_VARIABLE); + msg_Err( p_filter, "Could not create %s", VIDEO_FILTER_EVENT_VARIABLE); val.p_address = &(p_sys->event_info); if (var_Set( p_filter->p_libvlc, VIDEO_FILTER_EVENT_VARIABLE, val )!=VLC_SUCCESS) - msg_Err( p_filter, "Could not set %s\n", VIDEO_FILTER_EVENT_VARIABLE); + msg_Err( p_filter, "Could not set %s", VIDEO_FILTER_EVENT_VARIABLE); //OpenCV init specific to this example char* filename = config_GetPsz( p_filter, "opencv-haarcascade-file" ); @@ -197,7 +197,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) CvRect* r; if (faces && (faces->total > 0)) { - //msg_Dbg( p_filter, "Found %d face(s)\n", faces->total ); + //msg_Dbg( p_filter, "Found %d face(s)", faces->total ); if (NULL != p_filter->p_sys->event_info.p_region) { free(p_filter->p_sys->event_info.p_region); diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c index 787240b399..64c1d59059 100644 --- a/modules/video_filter/opencv_wrapper.c +++ b/modules/video_filter/opencv_wrapper.c @@ -533,7 +533,7 @@ static void VlcPictureToIplImage( vout_thread_t *p_vout, picture_t *p_in ) finish = clock(); duration = (double)(finish - start) / CLOCKS_PER_SEC; if (p_sys->i_verbosity > VERB_WARN) - msg_Dbg( p_vout, "VlcPictureToIplImageRgb took %2.4f seconds\n", duration ); + msg_Dbg( p_vout, "VlcPictureToIplImageRgb took %2.4f seconds", duration ); } /***************************************************************************** @@ -586,7 +586,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) finish = clock(); duration = (double)(finish - start) / CLOCKS_PER_SEC; if (p_vout->p_sys->i_verbosity > VERB_WARN) - msg_Dbg( p_vout, "Render took %2.4f seconds\n", duration ); + msg_Dbg( p_vout, "Render took %2.4f seconds", duration ); ReleaseImages(p_vout); p_outpic->date = p_pic->date; diff --git a/modules/video_filter/osdmenu.c b/modules/video_filter/osdmenu.c index 32e4e53b06..82816578b1 100644 --- a/modules/video_filter/osdmenu.c +++ b/modules/video_filter/osdmenu.c @@ -707,7 +707,7 @@ static int MouseEvent( vlc_object_t *p_this, char const *psz_var, osd_ButtonSelect( p_this, p_button ); p_sys->b_update = p_sys->b_visible ? true : false; p_sys->b_clicked = true; - msg_Dbg( p_this, "mouse clicked %s (%d,%d)\n", p_button->psz_name, i_x, i_y ); + msg_Dbg( p_this, "mouse clicked %s (%d,%d)", p_button->psz_name, i_x, i_y ); } } return VLC_SUCCESS; diff --git a/modules/video_output/omapfb.c b/modules/video_output/omapfb.c index df72a10071..9d6d27fbec 100644 --- a/modules/video_output/omapfb.c +++ b/modules/video_output/omapfb.c @@ -598,7 +598,7 @@ static int OpenDisplay( vout_thread_t *p_vout ) if( (p_sys->p_video = (uint8_t *)mmap( 0, p_sys->i_page_size, PROT_READ | PROT_WRITE, MAP_SHARED, p_sys->i_fd, 0 )) == MAP_FAILED ) { - msg_Err( p_vout, "Can't mmap: %s\n", strerror(errno) ); + msg_Err( p_vout, "Can't mmap: %s", strerror(errno) ); return VLC_EGENERIC; } @@ -615,7 +615,7 @@ static int OpenDisplay( vout_thread_t *p_vout ) if( (p_sys->p_null = (uint8_t *)mmap( 0, p_sys->i_page_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, p_sys->i_null_fd, 0 )) == MAP_FAILED ) { - msg_Err( p_vout, "Can't mmap 2: %s\n", strerror(errno) ); + msg_Err( p_vout, "Can't mmap 2: %s", strerror(errno) ); return VLC_EGENERIC; } diff --git a/modules/video_output/x11/xvmc.c b/modules/video_output/x11/xvmc.c index 4c7650f053..0d35750c92 100644 --- a/modules/video_output/x11/xvmc.c +++ b/modules/video_output/x11/xvmc.c @@ -545,7 +545,7 @@ XvMCSubpicture *xxmc_xvmc_alloc_subpicture( vout_thread_t *p_vout, return NULL; } XVMCUNLOCKDISPLAY( p_vout->p_sys->p_display ); - msg_Dbg( p_vout, "video_out_xxmc: created subpicture %d\n", i ); + msg_Dbg( p_vout, "video_out_xxmc: created subpicture %d", i ); handler->subInUse[i] = 1; handler->subValid[i] = 1; pthread_mutex_unlock( &handler->mutex ); diff --git a/src/libvlc.c b/src/libvlc.c index 4ae289ff39..675a913f9e 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -718,7 +718,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, msg_Err( p_libvlc, "verbose-objects usage: \n" "--verbose-objects=+printthatobject," "-dontprintthatone\n" - "(keyword 'all' to applies to all objects)\n"); + "(keyword 'all' to applies to all objects)"); free( psz_verbose_objects ); /* FIXME: leaks!!!! */ return VLC_EGENERIC; diff --git a/src/misc/filter_chain.c b/src/misc/filter_chain.c index 65a822bd7b..e1d065d346 100644 --- a/src/misc/filter_chain.c +++ b/src/misc/filter_chain.c @@ -458,7 +458,7 @@ static picture_t *VideoBufferNew( filter_t *p_filter ) p_fmt->i_width, p_fmt->i_height, p_fmt->i_aspect ); if( !p_picture ) - msg_Err( p_filter, "Failed to allocate picture\n" ); + msg_Err( p_filter, "Failed to allocate picture" ); return p_picture; } static void VideoBufferDelete( filter_t *p_filter, picture_t *p_picture ) diff --git a/src/network/tcp.c b/src/network/tcp.c index 04ce2a4144..b509b66b33 100644 --- a/src/network/tcp.c +++ b/src/network/tcp.c @@ -511,7 +511,7 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj, if( buffer[1] != 0x00 ) { - msg_Err( p_obj, "socks: CONNECT request failed\n" ); + msg_Err( p_obj, "socks: CONNECT request failed" ); return VLC_EGENERIC; } diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index b01db69d91..476eb4303e 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -1332,7 +1332,7 @@ static void* RunThread( void *p_this ) p_vout->b_error = InitThread( p_vout ); if( p_vout->b_error ) - msg_Err( p_vout, "InitThread after VOUT_PICTURE_BUFFERS_CHANGE failed\n" ); + msg_Err( p_vout, "InitThread after VOUT_PICTURE_BUFFERS_CHANGE failed" ); vlc_cond_signal( &p_vout->p->picture_wait ); vlc_mutex_unlock( &p_vout->picture_lock );