<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/7589">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_clialiases: Fix completion pass-through.<br><br>Never ignore contents of line when generating completion options.<br><br>Change-Id: I74389efdfea154019d3b56a9f381610614c044c8<br>---<br>M res/res_clialiases.c<br>1 file changed, 2 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/res/res_clialiases.c b/res/res_clialiases.c<br>index 633ed89..4d932ae 100644<br>--- a/res/res_clialiases.c<br>+++ b/res/res_clialiases.c<br>@@ -105,7 +105,7 @@<br> struct cli_alias tmp = {<br> .cli_entry.command = e->command,<br> };<br>- char *generator;<br>+ char *generator = NULL;<br> const char *line;<br> <br> /* Try to find the alias based on the CLI entry */<br>@@ -120,14 +120,10 @@<br> case CLI_GENERATE:<br> line = a->line;<br> line += (strlen(alias->alias));<br>- if (!strncasecmp(alias->alias, alias->real_cmd, strlen(alias->alias))) {<br>- generator = NULL;<br>- } else if (!ast_strlen_zero(a->word)) {<br>+ if (strncasecmp(alias->alias, alias->real_cmd, strlen(alias->alias))) {<br> struct ast_str *real_cmd = ast_str_alloca(strlen(alias->real_cmd) + strlen(line) + 1);<br> ast_str_append(&real_cmd, 0, "%s%s", alias->real_cmd, line);<br> generator = ast_cli_generator(ast_str_buffer(real_cmd), a->word, a->n);<br>- } else {<br>- generator = ast_cli_generator(alias->real_cmd, a->word, a->n);<br> }<br> ao2_ref(alias, -1);<br> return generator;<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/7589">change 7589</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/7589"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I74389efdfea154019d3b56a9f381610614c044c8 </div>
<div style="display:none"> Gerrit-Change-Number: 7589 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>