C has a function named strchr().

[vlc] / src / modules / modules.c

diff --git a/src/modules/modules.c b/src/modules/modules.c
index 5705de6b5befd735d409fa770ae6ec8352c47662..cdd26307aab60cf005d9ce4005ff2952c4b1ec61 100644 (file)
--- a/src/modules/modules.c
+++ b/src/modules/modules.c
@@ -437,16 +437,13 @@ module_t * __module_need( vlc_object_t *p_this, const char *psz_capability,
         }
 
         i_shortcuts++;
-        psz_shortcuts = psz_last_shortcut = strdup( psz_name );
+        psz_parser = psz_shortcuts = psz_last_shortcut = strdup( psz_name );
 
-        for( psz_parser = psz_shortcuts; *psz_parser; psz_parser++ )
+        while( ( psz_parser = strchr( psz_parser, ',' ) ) )
         {
-            if( *psz_parser == ',' )
-            {
-                 *psz_parser = '\0';
-                 i_shortcuts++;
-                 psz_last_shortcut = psz_parser + 1;
-            }
+             *psz_parser = '\0';
+             i_shortcuts++;
+             psz_last_shortcut = ++psz_parser;
         }
 
         /* Check if the user wants to override the "strict" mode */
@@ -475,7 +472,7 @@ module_t * __module_need( vlc_object_t *p_this, const char *psz_capability,
     count = 0;
     for (size_t i = 0; (p_module = p_all[i]) != NULL; i++)
     {
-        bool b_shortcut_bonus = false;
+        int i_shortcut_bonus = 0;
 
         /* Test that this module can do what we need */
         if( !module_provides( p_module, psz_capability ) )
@@ -502,7 +499,7 @@ module_t * __module_need( vlc_object_t *p_this, const char *psz_capability,
                         /* Found it */
                         if( c && c[1] )
                             psz_alias = c+1;
-                        b_shortcut_bonus = true;
+                        i_shortcut_bonus = i_short * 10000;
                         goto found_shortcut;
                     }
                 }
@@ -525,10 +522,8 @@ module_t * __module_need( vlc_object_t *p_this, const char *psz_capability,
 found_shortcut:
         /* Store this new module */
         p_list[count].p_module = module_hold (p_module);
-        p_list[count].i_score = p_module->i_score;
-        if( b_shortcut_bonus )
-            p_list[count].i_score += 10000;
-        p_list[count].b_force = b_shortcut_bonus && b_strict;
+        p_list[count].i_score = p_module->i_score + i_shortcut_bonus;
+        p_list[count].b_force = i_shortcut_bonus && b_strict;
         count++;
     }
 
@@ -737,80 +732,6 @@ out:
     return module;
 }
 
-/**
- * GetModuleNamesForCapability
- *
- * Return a NULL terminated array with the names of the modules
- * that have a certain capability.
- * Free after uses both the string and the table.
- * \param psz_capability the capability asked
- * \param pppsz_longname an pointer to an array of string to contain
-    the long names of the modules. If set to NULL the function don't use it.
- * \return the NULL terminated array
- */
-char ** module_GetModulesNamesForCapability( const char *psz_capability,
-                                             char ***pppsz_longname )
-{
-    size_t count = 0;
-    char **psz_ret;
-
-    module_t **list = module_list_get (NULL);
-
-    /* Proceed in two passes: count the number of modules first */
-    for (size_t i = 0; list[i]; i++)
-    {
-        module_t *p_module = list[i];
-        const char *psz_module_capability = p_module->psz_capability;
-
-        if( psz_module_capability
-         && !strcmp( psz_module_capability, psz_capability ) )
-            count++;
-    }
-
-    /* Then get the names */
-    psz_ret = malloc( sizeof(char*) * (count+1) );
-    if( pppsz_longname )
-        *pppsz_longname = malloc( sizeof(char*) * (count+1) );
-    if( !psz_ret || ( pppsz_longname && *pppsz_longname == NULL ) )
-    {
-        free( psz_ret );
-        if( pppsz_longname )
-        {
-            free( *pppsz_longname );
-            *pppsz_longname = NULL;
-        }
-        module_list_free (list);
-        return NULL;
-    }
-
-    for (size_t i = 0, j = 0; list[i]; i++)
-    {
-        module_t *p_module = list[i];
-        const char *psz_module_capability = p_module->psz_capability;
-
-        if( psz_module_capability
-         && !strcmp( psz_module_capability, psz_capability ) )
-        {
-            /* Explicit hack: Use the last shortcut. It _should_ be
-             * different from the object name, at least if the object
-             * contains multiple submodules with the same capability. */
-            unsigned k = 0;
-            while( p_module->pp_shortcuts[k] != NULL )
-                k++;
-            assert( k > 0); /* pp_shortcuts[0] is always set */
-            psz_ret[j] = strdup( p_module->pp_shortcuts[k - 1] );
-            if( pppsz_longname )
-                (*pppsz_longname)[j] = strdup( module_get_name( p_module, true ) );
-            j++;
-        }
-    }
-    psz_ret[count] = NULL;
-
-    module_list_free (list);
-
-    return psz_ret;
-}
-
 /**
  * Get the configuration of a module
  *