[vlc-devel] commit: Simplification ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Thu May 29 18:53:06 2008 +0300| [e3fa003bfa151ec22840ae6c2047e7c468761092]

Simplification

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

 src/libvlc-common.c |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/libvlc-common.c b/src/libvlc-common.c
index 7be0f85..4433a18 100644
--- a/src/libvlc-common.c
+++ b/src/libvlc-common.c
@@ -1111,20 +1111,18 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc,
     {
         char *psz_interface = config_GetPsz( p_libvlc, "intf" );
         if( !psz_interface || !*psz_interface ) /* "intf" has not been set */
-            msg_Info( p_libvlc, _("Running vlc with the default interface. Use 'cvlc' to use vlc without interface.") );
-        free( psz_interface );
-    }
-
+        {
 #ifndef WIN32
-    if( b_daemon && b_block && !psz_module )
-    {
-        /* Daemon mode hack.
-         * We prefer the dummy interface if none is specified. */
-        char *psz_interface = config_GetPsz( p_libvlc, "intf" );
-        if( !psz_interface || !*psz_interface ) psz_module = "dummy";
+            if( b_daemon )
+                 /* Daemon mode hack.
+                  * We prefer the dummy interface if none is specified. */
+                psz_module = "dummy";
+            else
+#endif
+                msg_Info( p_libvlc, _("Running vlc with the default interface. Use 'cvlc' to use vlc without interface.") );
+        }
         free( psz_interface );
     }
-#endif
 
     /* Try to create the interface */
     p_intf = intf_Create( p_libvlc, psz_module ? psz_module : "$intf",