Changeset eda425f069750a98ac8f8872aad0fcc9758560f7

Timestamp:

16/12/07 15:40:15 (10 months ago)

Author:

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

git-committer:

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

git-parent:

[1f9d8d6cc17156bbf51e76f71cbb8367594d6c8a]

git-author:

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

Message:

Simplification, and no-ops removal

Files:

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

src/config/core.c

@@ -521 +521 @@
-    {
-        p_module->p_config[i] = p_orig[i];
-
-        if (IsConfigIntegerType (p_module->p_config[i].i_type))
-        {
-            p_module->p_config[i].orig.i = p_orig[i].value.i;
-            p_module->p_config[i].saved.i = p_orig[i].value.i;
-        }
-        else
-        if (IsConfigFloatType (p_module->p_config[i].i_type))
-        {
-            p_module->p_config[i].orig.f = p_orig[i].value.f;
-            p_module->p_config[i].saved.f = p_orig[i].value.f;
-        }
-        else
-        if (IsConfigStringType (p_module->p_config[i].i_type))
-        {
-            p_module->p_config[i].value.psz = strdupnull (p_orig[i].value.psz);
-            p_module->p_config[i].orig.psz = strdupnull (p_orig[i].value.psz);
-            p_module->p_config[i].saved.psz = NULL;
-        }
-
-        p_module->p_config[i].psz_type = p_orig[i].psz_type;
-        p_module->p_config[i].psz_name = p_orig[i].psz_name;
-        p_module->p_config[i].psz_current = p_orig[i].psz_current;
-        p_module->p_config[i].psz_text = p_orig[i].psz_text;
-        p_module->p_config[i].psz_longtext = p_orig[i].psz_longtext;
-
-        p_module->p_config[i].p_lock = &p_module->object_lock;
-

src/modules/entry.c

@@ -199 +199 @@
-            if (IsConfigIntegerType (item->i_type))
-            {
+                item->orig.i = item->saved.i =
-                item->value.i = va_arg (ap, int);
-                ret = 0;
@@ -205 +206 @@
-            if (IsConfigFloatType (item->i_type))
-            {
+                item->orig.f = item->saved.f =
-                item->value.f = va_arg (ap, double);
-                ret = 0;
@@ -213 +215 @@
-                const char *value = va_arg (ap, const char *);
-                item->value.psz = value ? strdup (value) : NULL;
+                item->orig.psz = value ? strdup (value) : NULL;
+                item->saved.psz = value ? strdup (value) : NULL;
-                ret = 0;
-            }