(compilation fixes for my previous commit)

diff --git a/src/misc/configuration.c b/src/misc/configuration.c
index cbec1a9f34394996b204144eb0716e1edb1aac40..a4d8e41768cf58f8076ab7377dd677ade34703db 100644 (file)
--- a/src/misc/configuration.c
+++ b/src/misc/configuration.c
@@ -2,7 +2,7 @@
  * configuration.c management of the modules configuration
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: configuration.c,v 1.37 2002/08/15 12:11:15 sam Exp $
+ * $Id: configuration.c,v 1.38 2002/08/20 18:25:42 sam Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -374,9 +374,7 @@ void config_Duplicate( module_t *p_module, module_config_t *p_orig )
             p_module->p_config[i].ppsz_list[j] = NULL;
         }
 
-        /* the callback pointer is only valid when the module is loaded so this
-         * value is set in module_activate() and reset in module_deactivate() */
-        p_module->p_config[i].pf_callback = NULL;
+        p_module->p_config[i].pf_callback = p_orig[i].pf_callback;
     }
 }
 

diff --git a/src/misc/messages.c b/src/misc/messages.c
index 0fee5ff8652ef46f3b3a1ac8f1a877d10191a134..f36df775a51f55e02c117a4f600f58f1ce12ed42 100644 (file)
--- a/src/misc/messages.c
+++ b/src/misc/messages.c
@@ -4,7 +4,7 @@
  * modules, especially intf modules. See config.h for output configuration.
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: messages.c,v 1.8 2002/08/10 19:23:06 sam Exp $
+ * $Id: messages.c,v 1.9 2002/08/20 18:25:42 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -445,7 +445,7 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
     if( p_this->p_vlc->b_color )
     {
         fprintf( stderr, "[" GREEN "%.2x" GRAY ":" GREEN "%.6x" GRAY "] "
-                         "%s%s: %s%s" GRAY "\n", p_this->p_vlc->i_unique,
+                         "%s%s: %s%s" GRAY "\n", p_this->p_vlc->i_instance,
                          p_item->i_object_id, p_item->psz_module,
                          ppsz_type[i_type], ppsz_color[i_type],
                          p_item->psz_msg );
@@ -453,7 +453,7 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
     else
     {
         fprintf( stderr, "[%.2x:%.6x] %s%s: %s\n",
-                         p_this->p_vlc->i_unique, p_item->i_object_id,
+                         p_this->p_vlc->i_instance, p_item->i_object_id,
                          p_item->psz_module, ppsz_type[i_type],
                          p_item->psz_msg );
     }

diff --git a/src/misc/modules.c b/src/misc/modules.c
index 21812a6865a6de25204b8bdee33f308eb0947ce8..e87c55ebadde78aae2c59d9b66a8831b83ac09b1 100644 (file)
--- a/src/misc/modules.c
+++ b/src/misc/modules.c
@@ -2,7 +2,7 @@
  * modules.c : Builtin and plugin modules management functions
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: modules.c,v 1.88 2002/08/15 12:22:45 sam Exp $
+ * $Id: modules.c,v 1.89 2002/08/20 18:25:42 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Ethan C. Baldridge <BaldridgeE@cadmus.com>
@@ -684,7 +684,6 @@ static int AllocatePluginFile( vlc_object_t * p_this, char * psz_file )
     if( CallEntry( p_module ) != 0 )
     {
         /* We couldn't call module_init() */
-        msg_Err( p_this, "failed calling entry point in `%s'", psz_file );
         vlc_object_destroy( p_module );
         module_unload( handle );
         return -1;