<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/20846">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty/command: make some 'struct cmd_element' pointers const<br><br>Change-Id: I4a8b3bada44538a5e5711bbc4dccf8b2cf3e2e08<br>---<br>M src/vty/command.c<br>1 file changed, 9 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/46/20846/1</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 0edfce5..53ebcd8 100644</span><br><span>--- a/src/vty/command.c</span><br><span>+++ b/src/vty/command.c</span><br><span>@@ -674,7 +674,8 @@</span><br><span> /*</span><br><span> * Write one cmd_element as XML via a print_func_t.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-static int vty_dump_element(struct cmd_element *cmd, print_func_t print_func, void *data, const char *newline)</span><br><span style="color: hsl(120, 100%, 40%);">+static int vty_dump_element(const struct cmd_element *cmd, print_func_t print_func,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *data, const char *newline)</span><br><span> {</span><br><span> char *xml_string = xml_escape(cmd->string);</span><br><span> unsigned int i;</span><br><span>@@ -768,7 +769,7 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static bool vty_command_is_common(struct cmd_element *cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+static bool vty_command_is_common(const struct cmd_element *cmd);</span><br><span> </span><br><span> /*</span><br><span> * Dump all nodes and commands associated with a given node as XML via a print_func_t.</span><br><span>@@ -786,16 +787,14 @@</span><br><span> print_func(data, " <description>These commands are available on all VTY nodes. They are listed"</span><br><span> " here only once, to unclutter the VTY reference.</description>%s", newline);</span><br><span> for (i = 0; i < vector_active(cmdvec); ++i) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct cmd_node *cnode;</span><br><span style="color: hsl(0, 100%, 40%);">- cnode = vector_slot(cmdvec, i);</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct cmd_node *cnode = vector_slot(cmdvec, i);</span><br><span> if (!cnode)</span><br><span> continue;</span><br><span> if (cnode->node != CONFIG_NODE)</span><br><span> continue;</span><br><span> </span><br><span> for (j = 0; j < vector_active(cnode->cmd_vector); ++j) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct cmd_element *elem;</span><br><span style="color: hsl(0, 100%, 40%);">- elem = vector_slot(cnode->cmd_vector, j);</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct cmd_element *elem = vector_slot(cnode->cmd_vector, j);</span><br><span> if (!vty_command_is_common(elem))</span><br><span> continue;</span><br><span> if (elem->attr & CMD_ATTR_DEPRECATED)</span><br><span>@@ -808,8 +807,7 @@</span><br><span> print_func(data, " </node>%s", newline);</span><br><span> </span><br><span> for (i = 0; i < vector_active(cmdvec); ++i) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct cmd_node *cnode;</span><br><span style="color: hsl(0, 100%, 40%);">- cnode = vector_slot(cmdvec, i);</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct cmd_node *cnode = vector_slot(cmdvec, i);</span><br><span> if (!cnode)</span><br><span> continue;</span><br><span> if (vector_active(cnode->cmd_vector) < 1)</span><br><span>@@ -820,8 +818,7 @@</span><br><span> * 'name', the second becomes 'name_2', then 'name_3', ... */</span><br><span> same_name_count = 1;</span><br><span> for (j = 0; j < i; ++j) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct cmd_node *cnode2;</span><br><span style="color: hsl(0, 100%, 40%);">- cnode2 = vector_slot(cmdvec, j);</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct cmd_node *cnode2 = vector_slot(cmdvec, j);</span><br><span> if (!cnode2)</span><br><span> continue;</span><br><span> if (strcmp(cnode->name, cnode2->name) == 0)</span><br><span>@@ -835,8 +832,7 @@</span><br><span> print_func(data, " <name>%s</name>%s", cnode->name, newline);</span><br><span> </span><br><span> for (j = 0; j < vector_active(cnode->cmd_vector); ++j) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct cmd_element *elem;</span><br><span style="color: hsl(0, 100%, 40%);">- elem = vector_slot(cnode->cmd_vector, j);</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct cmd_element *elem = vector_slot(cnode->cmd_vector, j);</span><br><span> if (vty_command_is_common(elem))</span><br><span> continue;</span><br><span> if (elem->attr & CMD_ATTR_DEPRECATED)</span><br><span>@@ -4195,7 +4191,7 @@</span><br><span> /*! Return true if a node is installed by install_basic_node_commands(), so</span><br><span> * that we can avoid repeating them for each and every node during 'show</span><br><span> * running-config' */</span><br><span style="color: hsl(0, 100%, 40%);">-static bool vty_command_is_common(struct cmd_element *cmd)</span><br><span style="color: hsl(120, 100%, 40%);">+static bool vty_command_is_common(const struct cmd_element *cmd)</span><br><span> {</span><br><span> if (cmd == &config_help_cmd</span><br><span> || cmd == &show_vty_attr_all_cmd</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/20846">change 20846</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/+/20846"/><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: I4a8b3bada44538a5e5711bbc4dccf8b2cf3e2e08 </div>
<div style="display:none"> Gerrit-Change-Number: 20846 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>