Changeset 927f27d8c6feedb36da0b1e442bb897e2be6f90e

Timestamp:

12/17/07 21:27:03 (9 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1197923223 +0000

git-parent:

[cbe2c26778b462d055750a1160b386d2024be7fb]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1197923223 +0000

Message:

Save one memory copy and fix the helper module leak

Files:

• include/vlc_modules_macros.h (modified) (1 diff)
• src/config/core.c (modified) (3 diffs)
• src/modules/entry.c (modified) (2 diffs)

include/vlc_modules_macros.h

@@ -122 +122 @@
-#define vlc_module_end( )                                                     \
-        }                                                                     \
-
-
-
-
-
+
-                                                                              \
-    error:                                                                    \
-free( p_config );                    
+/* FIXME: config_Free( p_config ); */
-        /* FIXME: cleanup submodules objects ??? */                           \
-        return VLC_EGENERIC;                                                  \

src/config/core.c

@@ -493 +493 @@
-
-    /* Calculate the structure length */
-    p_module->i_config_items = 0;
-    p_module->i_bool_items = 0;
-
-    for( p_item = p_orig; p_item < p_end; p_item++ )
-    {
@@ -509 +506 @@
-    }
-
-
-
-
-
-
-
-
+
-    p_module->confsize = n;
-
@@ -521 +512 @@
-    for( size_t i = 0; i < n ; i++ )
-    {
-        p_module->p_config[i] = p_orig[i];
-        p_module->p_config[i].p_lock = &p_module->object_lock;
-    }

src/modules/entry.c

@@ -41 +41 @@
-    module->psz_capability = "";
-    module->i_score = 1;
+    module->i_config_items = module->i_bool_items = 0;
+
-    return module;
-}
@@ -162 +164 @@
-    tab[confsize].p_lock = &module->object_lock;
-
+    if (type & CONFIG_ITEM)
+    {
+        module->i_config_items++;
+        if (type == CONFIG_ITEM_BOOL)
+            module->i_bool_items++;
+    }
+
-    return tab + confsize;
-}