Removes trailing spaces. Removes tabs.

[vlc] / modules / misc / testsuite / test4.c

diff --git a/modules/misc/testsuite/test4.c b/modules/misc/testsuite/test4.c
index 8063d16d2b2e11c74ae2a4e2896575d76f914011..409f1be0292af13224b6049688b624ae3b786ca7 100644 (file)
--- a/modules/misc/testsuite/test4.c
+++ b/modules/misc/testsuite/test4.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * test4.c : Miscellaneous stress tests module for vlc
  *****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: test4.c,v 1.6 2002/12/14 19:34:06 gbazin Exp $
+ * Copyright (C) 2002 the VideoLAN team
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -10,7 +10,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -26,7 +26,6 @@
  *****************************************************************************/
 #include <vlc/vlc.h>
 
-#include <stdlib.h>
 #include <signal.h>
 
 /*****************************************************************************
@@ -87,12 +86,12 @@ static int Foo( vlc_object_t *p_this, char const *psz_cmd,
     var_Create( p_this, "honk", VLC_VAR_STRING | VLC_VAR_HASCHOICE );
 
     val.psz_string = "foo";
-    var_Change( p_this, "honk", VLC_VAR_ADDCHOICE, &val );
+    var_Change( p_this, "honk", VLC_VAR_ADDCHOICE, &val, NULL );
     val.psz_string = "bar";
-    var_Change( p_this, "honk", VLC_VAR_ADDCHOICE, &val );
+    var_Change( p_this, "honk", VLC_VAR_ADDCHOICE, &val, NULL );
     val.psz_string = "baz";
-    var_Change( p_this, "honk", VLC_VAR_ADDCHOICE, &val );
-    var_Change( p_this, "honk", VLC_VAR_SETDEFAULT, &val );
+    var_Change( p_this, "honk", VLC_VAR_ADDCHOICE, &val, NULL );
+    var_Change( p_this, "honk", VLC_VAR_SETDEFAULT, &val, NULL );
 
     var_Get( p_this, "honk", &val ); printf( "value: %s\n", val.psz_string );
 
@@ -107,16 +106,16 @@ static int Foo( vlc_object_t *p_this, char const *psz_cmd,
     var_Get( p_this, "honk", &val ); printf( "value: %s\n", val.psz_string );
 
     val.psz_string = "baz";
-    var_Change( p_this, "honk", VLC_VAR_DELCHOICE, &val );
+    var_Change( p_this, "honk", VLC_VAR_DELCHOICE, &val, NULL );
 
     var_Get( p_this, "honk", &val ); printf( "value: %s\n", val.psz_string );
 
-    var_Change( p_this, "honk", VLC_VAR_GETLIST, &val );
+    var_Change( p_this, "honk", VLC_VAR_GETLIST, &val, NULL );
     for( i = 0 ; i < val.p_list->i_count ; i++ )
     {
         printf( "value %i: %s\n", i, val.p_list->p_values[i].psz_string );
     }
-    var_Change( p_this, "honk", VLC_VAR_FREELIST, &val );
+    var_Change( p_this, "honk", VLC_VAR_FREELIST, &val, NULL );
 
     var_Destroy( p_this, "honk" );
 
@@ -175,7 +174,7 @@ static int Callback( vlc_object_t *p_this, char const *psz_cmd,
 
     for( i = 0; i < 10; i++ )
     {
-        pp_objects[i]->b_die = VLC_TRUE;
+        vlc_object_kill( pp_objects[i] );
         vlc_thread_join( pp_objects[i] );
         vlc_object_detach( pp_objects[i] );
         vlc_object_destroy( pp_objects[i] );
@@ -216,7 +215,7 @@ static int MyCallback( vlc_object_t *p_this, char const *psz_var,
     sprintf( psz_newvar, "blork-%i", i_var );
     var_Set( p_this, psz_newvar, newval );
 
-    return VLC_SUCCESS;   
+    return VLC_SUCCESS;
 }
 
 /*****************************************************************************