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