[vlc-commits] dmo: avoid useless string conversion

Rémi Denis-Courmont git at videolan.org
Mon Mar 16 18:30:44 CET 2015


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Mar 16 18:58:51 2015 +0200| [c88d0de638684abe5b590560855ceecacd41628a] | committer: Rémi Denis-Courmont

dmo: avoid useless string conversion

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c88d0de638684abe5b590560855ceecacd41628a
---

 modules/codec/dmo/dmo.c |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/modules/codec/dmo/dmo.c b/modules/codec/dmo/dmo.c
index 820a7ba..6910e9e 100644
--- a/modules/codec/dmo/dmo.c
+++ b/modules/codec/dmo/dmo.c
@@ -726,23 +726,18 @@ static int LoadDMO( vlc_object_t *p_this, HINSTANCE *p_hmsdmo_dll,
     while( ( S_OK == p_enum_dmo->vt->Next( p_enum_dmo, 1, &clsid_dmo,
                      &psz_dmo_name, &i_dummy /* NULL doesn't work */ ) ) )
     {
-        char *psz_temp = FromWide( psz_dmo_name );
-        msg_Dbg( p_this, "found DMO: %s", psz_temp );
+        msg_Dbg( p_this, "found DMO: %ls", psz_dmo_name );
         CoTaskMemFree( psz_dmo_name );
 
         /* Create DMO */
         if( CoCreateInstance( &clsid_dmo, NULL, CLSCTX_INPROC,
                               &IID_IMediaObject, (void **)pp_dmo ) )
         {
-            msg_Warn( p_this, "can't create DMO: %s", psz_temp );
-            free( psz_temp );
+            msg_Warn( p_this, "can't create DMO: %ls", psz_dmo_name );
             *pp_dmo = 0;
         }
         else
-        {
-            free( psz_temp );
             break;
-        }
     }
 
     p_enum_dmo->vt->Release( (IUnknown *)p_enum_dmo );



More information about the vlc-commits mailing list