<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/19577">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
dexter: Looks good to me, approved; Verified
pespin: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty/command: reflect global attributes in the XML reference<br><br>Given that commands with either/both of the following attributes:<br><br> - CMD_ATTR_DEPRECATED,<br> - CMD_ATTR_HIDDEN,<br><br>never end up in the XML reference, only CMD_ATTR_IMMEDIATE would<br>be reflected for commands taking effect immediately as follows:<br><br> <command id='foo'><br> <!-- Global attributes --><br> <attributes scope='global'><br> <attribute doc='This command applies immediately' /><br> </attributes><br><br> <!-- Application specific attributes --><br> <attributes scope='application'><br> <!-- ... --><br> </attributes><br><br> <params><br> <!-- ... --><br> </params><br> </command><br><br>Change-Id: I8476c1163c23a9a52641987acf3df0b8c49d8f7b<br>Related: SYS#4937<br>---<br>M src/vty/command.c<br>1 file changed, 26 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/vty/command.c b/src/vty/command.c</span><br><span>index bad2688..30c39a7 100644</span><br><span>--- a/src/vty/command.c</span><br><span>+++ b/src/vty/command.c</span><br><span>@@ -622,6 +622,13 @@</span><br><span> </span><br><span> typedef int (*print_func_t)(void *data, const char *fmt, ...);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static const struct value_string cmd_attr_desc[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { CMD_ATTR_DEPRECATED, "This command is deprecated" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { CMD_ATTR_HIDDEN, "This command is hidden" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { CMD_ATTR_IMMEDIATE, "This command applies immediately" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, NULL }</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*</span><br><span> * Write one cmd_element as XML via a print_func_t.</span><br><span> */</span><br><span>@@ -632,6 +639,25 @@</span><br><span> </span><br><span> print_func(data, " <command id='%s'>%s", xml_string, newline);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Print global attributes and their description */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cmd->attr != 0x00) { /* ... if at least one flag is set */</span><br><span style="color: hsl(120, 100%, 40%);">+ print_func(data, " <attributes scope='global'>%s", newline);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < ARRAY_SIZE(cmd_attr_desc) - 1; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ char *xml_att_desc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (~cmd->attr & cmd_attr_desc[i].value)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ xml_att_desc = xml_escape(cmd_attr_desc[i].str);</span><br><span style="color: hsl(120, 100%, 40%);">+ print_func(data, " <attribute doc='%s' />%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ xml_att_desc, newline);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(xml_att_desc);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ print_func(data, " </attributes>%s", newline);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Print application specific attributes and their description */</span><br><span> if (cmd->usrattr != 0x00) { /* ... if at least one flag is set */</span><br><span> print_func(data, " <attributes scope='application'>%s", newline);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/19577">change 19577</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.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.osmocom.org/c/libosmocore/+/19577"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I8476c1163c23a9a52641987acf3df0b8c49d8f7b </div>
<div style="display:none"> Gerrit-Change-Number: 19577 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>