Removes trailing spaces. Removes tabs.

[vlc] / modules / misc / memcpy / memcpy.c

diff --git a/modules/misc/memcpy/memcpy.c b/modules/misc/memcpy/memcpy.c
index c44e9e16c5e67d480e55c98e791df3ca6bf61bf6..1f2706536f8ad86b323807fd96f84662c4932398 100644 (file)
--- a/modules/misc/memcpy/memcpy.c
+++ b/modules/misc/memcpy/memcpy.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * memcpy.c : classic memcpy module
  *****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: memcpy.c,v 1.2 2002/08/09 16:39:08 sam Exp $
+ * Copyright (C) 2001 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,14 +18,12 @@
  *
  * 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.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>
-#include <string.h>
 
 #include <vlc/vlc.h>
 
@@ -63,11 +61,11 @@
 static int Activate ( vlc_object_t *p_this )
 {
 #ifdef MODULE_NAME_IS_memcpy
-    p_this->p_vlc->pf_memcpy = memcpy;
-    p_this->p_vlc->pf_memset = memset;
+    p_this->p_libvlc->pf_memcpy = memcpy;
+    p_this->p_libvlc->pf_memset = memset;
 #else
-    p_this->p_vlc->pf_memcpy = fast_memcpy;
-    p_this->p_vlc->pf_memset = NULL;
+    p_this->p_libvlc->pf_memcpy = fast_memcpy;
+    p_this->p_libvlc->pf_memset = NULL;
 #endif
 
     return VLC_SUCCESS;
@@ -77,24 +75,26 @@ static int Activate ( vlc_object_t *p_this )
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
+    set_category( CAT_ADVANCED );
+    set_subcategory( SUBCAT_ADVANCED_MISC );
 #ifdef MODULE_NAME_IS_memcpy
-    set_description( _("libc memcpy module") );
+    set_description( _("libc memcpy") );
     add_shortcut( "c" );
     add_shortcut( "libc" );
 #elif defined( MODULE_NAME_IS_memcpy3dn )
-    set_description( _("3D Now! memcpy module") );
+    set_description( _("3D Now! memcpy") );
     add_requirement( 3DNOW );
     add_shortcut( "3dn" );
     add_shortcut( "3dnow" );
     add_shortcut( "memcpy3dn" );
     add_shortcut( "memcpy3dnow" );
 #elif defined( MODULE_NAME_IS_memcpymmx )
-    set_description( _("MMX memcpy module") );
+    set_description( _("MMX memcpy") );
     add_requirement( MMX );
     add_shortcut( "mmx" );
     add_shortcut( "memcpymmx" );
 #elif defined( MODULE_NAME_IS_memcpymmxext )
-    set_description( _("MMX EXT memcpy module") );
+    set_description( _("MMX EXT memcpy") );
     add_requirement( MMXEXT );
     add_shortcut( "mmxext" );
     add_shortcut( "memcpymmxext" );