From 238cc87048585f3699df2f4dbe307c85ed13336f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Cl=C3=A9ment=20Stenac?= <zorglub@videolan.org>
Date: Sun, 19 Feb 2006 13:36:15 +0000
Subject: [PATCH] Be consistant in naming

---
 src/Makefile.am                                       | 10 +++++-----
 src/control/{core.c => libvlc_core.c}                 |  3 +--
 src/control/{control_input.c => libvlc_input.c}       |  0
 src/control/{control_playlist.c => libvlc_playlist.c} |  0
 src/control/{video.c => libvlc_video.c}               |  3 +--
 src/control/{control_vlm.c => libvlc_vlm.c}           | 10 +++++-----
 6 files changed, 12 insertions(+), 14 deletions(-)
 rename src/control/{core.c => libvlc_core.c} (98%)
 rename src/control/{control_input.c => libvlc_input.c} (100%)
 rename src/control/{control_playlist.c => libvlc_playlist.c} (100%)
 rename src/control/{video.c => libvlc_video.c} (98%)
 rename src/control/{control_vlm.c => libvlc_vlm.c} (94%)

diff --git a/src/Makefile.am b/src/Makefile.am
index 477deaf783..cd716b6d38 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -300,11 +300,11 @@ SOURCES_libvlc_common = \
 	misc/hashtables.c \
 	misc/version.c \
 	extras/libc.c \
-	control/core.c \
-	control/control_playlist.c \
-	control/control_vlm.c \
-	control/control_input.c \
-	control/video.c \
+	control/libvlc_core.c \
+	control/libvlc_playlist.c \
+	control/libvlc_vlm.c \
+	control/libvlc_input.c \
+	control/libvlc_video.c \
 	control/mediacontrol_core.c \
 	control/mediacontrol_util.c \
 	control/mediacontrol_audio_video.c \
diff --git a/src/control/core.c b/src/control/libvlc_core.c
similarity index 98%
rename from src/control/core.c
rename to src/control/libvlc_core.c
index b9837bc97d..c4fb362055 100644
--- a/src/control/core.c
+++ b/src/control/libvlc_core.c
@@ -61,8 +61,7 @@ inline void libvlc_exception_raise( libvlc_exception_t *p_exception,
                                     char *psz_format, ... )
 {
     va_list args;
-    char *psz_message;
-    va_start( args, p_exception->psz_message );
+    va_start( args, psz_format );
     vasprintf( &p_exception->psz_message, psz_format, args );
     va_end( args );
 
diff --git a/src/control/control_input.c b/src/control/libvlc_input.c
similarity index 100%
rename from src/control/control_input.c
rename to src/control/libvlc_input.c
diff --git a/src/control/control_playlist.c b/src/control/libvlc_playlist.c
similarity index 100%
rename from src/control/control_playlist.c
rename to src/control/libvlc_playlist.c
diff --git a/src/control/video.c b/src/control/libvlc_video.c
similarity index 98%
rename from src/control/video.c
rename to src/control/libvlc_video.c
index 8605b9c0dd..9a1a7c9c58 100644
--- a/src/control/video.c
+++ b/src/control/libvlc_video.c
@@ -70,14 +70,13 @@ void libvlc_set_fullscreen( libvlc_input_t *p_input, int b_fullscreen,
     /* GetVout will raise the exception for us */
     if( !p_vout1 )
     {
-        fprintf( stderr, "No vout\n");
         return;
     }
 
     if( b_fullscreen ) val.b_bool = VLC_TRUE;
     else               val.b_bool = VLC_FALSE;
 
-    var_Set( p_vout1, "fullscreen", val );
+    i_ret = var_Set( p_vout1, "fullscreen", val );
     if( i_ret )
         libvlc_exception_raise( p_e,
                         "Unexpected error while setting fullscreen value" );
diff --git a/src/control/control_vlm.c b/src/control/libvlc_vlm.c
similarity index 94%
rename from src/control/control_vlm.c
rename to src/control/libvlc_vlm.c
index c4e30697b6..aa981c8a2d 100644
--- a/src/control/control_vlm.c
+++ b/src/control/libvlc_vlm.c
@@ -144,13 +144,13 @@ void libvlc_vlm_set_input( libvlc_instance_t *p_instance, char *psz_name,
     vlc_mutex_lock( &p_instance->p_vlm->lock );
     GET_MEDIA;
 
-    vlm_MediaSetup( p_instance->p_vlm, p_media, "inputdel", "all" );
+    i_ret = vlm_MediaSetup( p_instance->p_vlm, p_media, "inputdel", "all" );
     if( i_ret )
     {
          libvlc_exception_raise( p_exception, "Unable to change input" );
          vlc_mutex_unlock( &p_instance->p_vlm->lock );return;
     }
-    vlm_MediaSetup( p_instance->p_vlm, p_media, "input", psz_input );
+    i_ret = vlm_MediaSetup( p_instance->p_vlm, p_media, "input", psz_input );
     if( i_ret )
     {
         libvlc_exception_raise( p_exception, "Unable to change input" );
@@ -170,7 +170,7 @@ void libvlc_vlm_add_input( libvlc_instance_t *p_instance, char *psz_name,
     vlc_mutex_lock( &p_instance->p_vlm->lock );
     GET_MEDIA;
 
-    vlm_MediaSetup( p_instance->p_vlm, p_media, "input", psz_input );
+    i_ret = vlm_MediaSetup( p_instance->p_vlm, p_media, "input", psz_input );
     if( i_ret )
     {
          libvlc_exception_raise( p_exception, "Unable to change input" );
@@ -212,13 +212,13 @@ void libvlc_vlm_change_media( libvlc_instance_t *p_instance, char *psz_name,
         libvlc_exception_raise( p_exception, "Unable to set output" );
         vlc_mutex_unlock( &p_instance->p_vlm->lock ); return;
     }
-    vlm_MediaSetup( p_instance->p_vlm, p_media, "inputdel", "all" );
+    i_ret = vlm_MediaSetup( p_instance->p_vlm, p_media, "inputdel", "all" );
     if( i_ret )
     {
         libvlc_exception_raise( p_exception, "Unable to change input" );
         vlc_mutex_unlock( &p_instance->p_vlm->lock ); return;
     }
-    vlm_MediaSetup( p_instance->p_vlm, p_media, "input", psz_input );
+    i_ret = vlm_MediaSetup( p_instance->p_vlm, p_media, "input", psz_input );
     if( i_ret )
     {
         libvlc_exception_raise( p_exception, "Unable to change input" );
-- 
2.39.2