<html><head></head><body>Yes?<br><br><div class="gmail_quote">Le 25 septembre 2020 18:36:44 GMT+03:00, Romain Vimont <rom1v@videolabs.io> a écrit :<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
<pre class="k9mail">Revector?<br><br>On Thu, Sep 24, 2020 at 11:00:21PM +0300, Rémi Denis-Courmont wrote:<br><blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;">(no functional changes)<hr> src/modules/modules.c | 27 +++++++++++++--------------<br> 1 file changed, 13 insertions(+), 14 deletions(-)<br><br>diff --git a/src/modules/modules.c b/src/modules/modules.c<br>index 653107b7c6..004e56c18f 100644<br>--- a/src/modules/modules.c<br>+++ b/src/modules/modules.c<br>@@ -196,20 +196,10 @@ ssize_t vlc_module_match(const char *capability, const char *names,<br> return matches;<br> }<br> <br>-static int module_load(vlc_logger_t *log, module_t *m,<br>- vlc_activate_t init, bool forced, va_list args)<br>+static<br>+void *vlc_module_map(vlc_logger_t *log, module_t *module)<br> {<br>- va_list ap;<br>- int ret;<br>-<br>- if (vlc_plugin_Map(log, m->plugin))<br>- return VLC_EGENERIC;<br>-<br>- assert(m->pf_activate != NULL);<br>- va_copy(ap, args);<br>- ret = init(m->pf_activate, forced, ap);<br>- va_end(ap);<br>- return ret;<br>+ return vlc_plugin_Map(log, module->plugin) ? NULL : module->pf_activate;<br> }<br> <br> /**<br>@@ -258,7 +248,16 @@ module_t *(vlc_module_load)(struct vlc_logger *log, const char *capability,<br> <br> for (size_t i = 0; i < (size_t)total; i++) {<br> module_t *cand = mods[i];<br>- int ret = module_load(log, cand, probe, i < strict_total, args);<br>+ int ret = VLC_EGENERIC;<br>+ void *cb = vlc_module_map(log, cand);<br>+<br>+ if (cb != NULL) {<br>+ va_list ap;<br>+<br>+ va_copy(ap, args);<br>+ ret = probe(cb, i < strict_total, ap);<br>+ va_end(ap);<br>+ }<br> <br> switch (ret) {<br> case VLC_SUCCESS:<br>-- <br>2.28.0<hr>vlc-devel mailing list<br>To unsubscribe or modify your subscription options:<br><a href="https://mailman.videolan.org/listinfo/vlc-devel">https://mailman.videolan.org/listinfo/vlc-devel</a><br></blockquote><hr>vlc-devel mailing list<br>To unsubscribe or modify your subscription options:<br><a href="https://mailman.videolan.org/listinfo/vlc-devel">https://mailman.videolan.org/listinfo/vlc-devel</a></pre></blockquote></div><br>-- <br>Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté.</body></html>