<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/14427">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cosmetic: vty: command.c: Use upper case for enum match_type value names<br><br>Makes code easier to follow because enum values no longer look like<br>variables.<br><br>Change-Id: Ib6e9592c5962d047869a280c10f9b557fae6f435<br>---<br>M src/vty/command.c<br>1 file changed, 101 insertions(+), 101 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/27/14427/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 e9690bb..104053f 100644</span><br><span>--- a/src/vty/command.c</span><br><span>+++ b/src/vty/command.c</span><br><span>@@ -869,17 +869,17 @@</span><br><span> </span><br><span> /* Completion match types. */</span><br><span> enum match_type {</span><br><span style="color: hsl(0, 100%, 40%);">- no_match = 0,</span><br><span style="color: hsl(0, 100%, 40%);">- any_match,</span><br><span style="color: hsl(0, 100%, 40%);">- extend_match,</span><br><span style="color: hsl(0, 100%, 40%);">- ipv4_prefix_match,</span><br><span style="color: hsl(0, 100%, 40%);">- ipv4_match,</span><br><span style="color: hsl(0, 100%, 40%);">- ipv6_prefix_match,</span><br><span style="color: hsl(0, 100%, 40%);">- ipv6_match,</span><br><span style="color: hsl(0, 100%, 40%);">- range_match,</span><br><span style="color: hsl(0, 100%, 40%);">- vararg_match,</span><br><span style="color: hsl(0, 100%, 40%);">- partly_match,</span><br><span style="color: hsl(0, 100%, 40%);">- exact_match,</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_MATCH = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ ANY_MATCH,</span><br><span style="color: hsl(120, 100%, 40%);">+ EXTEND_MATCH,</span><br><span style="color: hsl(120, 100%, 40%);">+ IPV4_PREFIX_MATCH,</span><br><span style="color: hsl(120, 100%, 40%);">+ IPV4_MATCH,</span><br><span style="color: hsl(120, 100%, 40%);">+ IPV6_PREFIX_MATCH,</span><br><span style="color: hsl(120, 100%, 40%);">+ IPV6_MATCH,</span><br><span style="color: hsl(120, 100%, 40%);">+ RANGE_MATCH,</span><br><span style="color: hsl(120, 100%, 40%);">+ VARARG_MATCH,</span><br><span style="color: hsl(120, 100%, 40%);">+ PARTLY_MATCH,</span><br><span style="color: hsl(120, 100%, 40%);">+ EXACT_MATCH,</span><br><span> };</span><br><span> </span><br><span> static enum match_type cmd_ipv4_match(const char *str)</span><br><span>@@ -889,7 +889,7 @@</span><br><span> char buf[4];</span><br><span> </span><br><span> if (str == NULL)</span><br><span style="color: hsl(0, 100%, 40%);">- return partly_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return PARTLY_MATCH;</span><br><span> </span><br><span> for (;;) {</span><br><span> memset(buf, 0, sizeof(buf));</span><br><span>@@ -897,29 +897,29 @@</span><br><span> while (*str != '\0') {</span><br><span> if (*str == '.') {</span><br><span> if (dots >= 3)</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span> if (*(str + 1) == '.')</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span> if (*(str + 1) == '\0')</span><br><span style="color: hsl(0, 100%, 40%);">- return partly_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return PARTLY_MATCH;</span><br><span> </span><br><span> dots++;</span><br><span> break;</span><br><span> }</span><br><span> if (!isdigit((int)*str))</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span> str++;</span><br><span> }</span><br><span> </span><br><span> if (str - sp > 3)</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span> strncpy(buf, sp, str - sp);</span><br><span> if (atoi(buf) > 255)</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span> nums++;</span><br><span> </span><br><span>@@ -930,9 +930,9 @@</span><br><span> }</span><br><span> </span><br><span> if (nums < 4)</span><br><span style="color: hsl(0, 100%, 40%);">- return partly_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return PARTLY_MATCH;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return exact_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return EXACT_MATCH;</span><br><span> }</span><br><span> </span><br><span> static enum match_type cmd_ipv4_prefix_match(const char *str)</span><br><span>@@ -942,7 +942,7 @@</span><br><span> char buf[4];</span><br><span> </span><br><span> if (str == NULL)</span><br><span style="color: hsl(0, 100%, 40%);">- return partly_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return PARTLY_MATCH;</span><br><span> </span><br><span> for (;;) {</span><br><span> memset(buf, 0, sizeof(buf));</span><br><span>@@ -950,44 +950,44 @@</span><br><span> while (*str != '\0' && *str != '/') {</span><br><span> if (*str == '.') {</span><br><span> if (dots == 3)</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span> if (*(str + 1) == '.' || *(str + 1) == '/')</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span> if (*(str + 1) == '\0')</span><br><span style="color: hsl(0, 100%, 40%);">- return partly_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return PARTLY_MATCH;</span><br><span> </span><br><span> dots++;</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span> if (!isdigit((int)*str))</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span> str++;</span><br><span> }</span><br><span> </span><br><span> if (str - sp > 3)</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span> strncpy(buf, sp, str - sp);</span><br><span> if (atoi(buf) > 255)</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span> if (dots == 3) {</span><br><span> if (*str == '/') {</span><br><span> if (*(str + 1) == '\0')</span><br><span style="color: hsl(0, 100%, 40%);">- return partly_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return PARTLY_MATCH;</span><br><span> </span><br><span> str++;</span><br><span> break;</span><br><span> } else if (*str == '\0')</span><br><span style="color: hsl(0, 100%, 40%);">- return partly_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return PARTLY_MATCH;</span><br><span> }</span><br><span> </span><br><span> if (*str == '\0')</span><br><span style="color: hsl(0, 100%, 40%);">- return partly_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return PARTLY_MATCH;</span><br><span> </span><br><span> str++;</span><br><span> }</span><br><span>@@ -995,15 +995,15 @@</span><br><span> sp = str;</span><br><span> while (*str != '\0') {</span><br><span> if (!isdigit((int)*str))</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span> str++;</span><br><span> }</span><br><span> </span><br><span> if (atoi(sp) > 32)</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return exact_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return EXACT_MATCH;</span><br><span> }</span><br><span> </span><br><span> #define IPV6_ADDR_STR "0123456789abcdefABCDEF:.%"</span><br><span>@@ -1027,10 +1027,10 @@</span><br><span> int ret;</span><br><span> </span><br><span> if (str == NULL)</span><br><span style="color: hsl(0, 100%, 40%);">- return partly_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return PARTLY_MATCH;</span><br><span> </span><br><span> if (strspn(str, IPV6_ADDR_STR) != strlen(str))</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span> /* use inet_pton that has a better support,</span><br><span> * for example inet_pton can support the automatic addresses:</span><br><span>@@ -1039,14 +1039,14 @@</span><br><span> ret = inet_pton(AF_INET6, str, &sin6_dummy.sin6_addr);</span><br><span> </span><br><span> if (ret == 1)</span><br><span style="color: hsl(0, 100%, 40%);">- return exact_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return EXACT_MATCH;</span><br><span> </span><br><span> while (*str != '\0') {</span><br><span> switch (state) {</span><br><span> case STATE_START:</span><br><span> if (*str == ':') {</span><br><span> if (*(str + 1) != ':' && *(str + 1) != '\0')</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> colons--;</span><br><span> state = STATE_COLON;</span><br><span> } else {</span><br><span>@@ -1066,10 +1066,10 @@</span><br><span> break;</span><br><span> case STATE_DOUBLE:</span><br><span> if (double_colon)</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span> if (*(str + 1) == ':')</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> else {</span><br><span> if (*(str + 1) != '\0')</span><br><span> colons++;</span><br><span>@@ -1083,7 +1083,7 @@</span><br><span> case STATE_ADDR:</span><br><span> if (*(str + 1) == ':' || *(str + 1) == '\0') {</span><br><span> if (str - sp > 3)</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span> nums++;</span><br><span> state = STATE_COLON;</span><br><span>@@ -1099,20 +1099,20 @@</span><br><span> }</span><br><span> </span><br><span> if (nums > 8)</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span> if (colons > 7)</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span> str++;</span><br><span> }</span><br><span> </span><br><span> #if 0</span><br><span> if (nums < 11)</span><br><span style="color: hsl(0, 100%, 40%);">- return partly_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return PARTLY_MATCH;</span><br><span> #endif /* 0 */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return exact_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return EXACT_MATCH;</span><br><span> }</span><br><span> </span><br><span> static enum match_type cmd_ipv6_prefix_match(const char *str)</span><br><span>@@ -1124,17 +1124,17 @@</span><br><span> char *endptr = NULL;</span><br><span> </span><br><span> if (str == NULL)</span><br><span style="color: hsl(0, 100%, 40%);">- return partly_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return PARTLY_MATCH;</span><br><span> </span><br><span> if (strspn(str, IPV6_PREFIX_STR) != strlen(str))</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span> while (*str != '\0' && state != STATE_MASK) {</span><br><span> switch (state) {</span><br><span> case STATE_START:</span><br><span> if (*str == ':') {</span><br><span> if (*(str + 1) != ':' && *(str + 1) != '\0')</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> colons--;</span><br><span> state = STATE_COLON;</span><br><span> } else {</span><br><span>@@ -1146,7 +1146,7 @@</span><br><span> case STATE_COLON:</span><br><span> colons++;</span><br><span> if (*(str + 1) == '/')</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> else if (*(str + 1) == ':')</span><br><span> state = STATE_DOUBLE;</span><br><span> else {</span><br><span>@@ -1156,10 +1156,10 @@</span><br><span> break;</span><br><span> case STATE_DOUBLE:</span><br><span> if (double_colon)</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span> if (*(str + 1) == ':')</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> else {</span><br><span> if (*(str + 1) != '\0' && *(str + 1) != '/')</span><br><span> colons++;</span><br><span>@@ -1178,11 +1178,11 @@</span><br><span> if (*(str + 1) == ':' || *(str + 1) == '.'</span><br><span> || *(str + 1) == '\0' || *(str + 1) == '/') {</span><br><span> if (str - sp > 3)</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span> for (; sp <= str; sp++)</span><br><span> if (*sp == '/')</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span> nums++;</span><br><span> </span><br><span>@@ -1199,7 +1199,7 @@</span><br><span> break;</span><br><span> case STATE_SLASH:</span><br><span> if (*(str + 1) == '\0')</span><br><span style="color: hsl(0, 100%, 40%);">- return partly_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return PARTLY_MATCH;</span><br><span> </span><br><span> state = STATE_MASK;</span><br><span> break;</span><br><span>@@ -1208,33 +1208,33 @@</span><br><span> }</span><br><span> </span><br><span> if (nums > 11)</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span> if (colons > 7)</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span> str++;</span><br><span> }</span><br><span> </span><br><span> if (state < STATE_MASK)</span><br><span style="color: hsl(0, 100%, 40%);">- return partly_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return PARTLY_MATCH;</span><br><span> </span><br><span> mask = strtol(str, &endptr, 10);</span><br><span> if (*endptr != '\0')</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span> if (mask < 0 || mask > 128)</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span> /* I don't know why mask < 13 makes command match partly.</span><br><span> Forgive me to make this comments. I Want to set static default route</span><br><span> because of lack of function to originate default in ospf6d; sorry</span><br><span> yasu</span><br><span> if (mask < 13)</span><br><span style="color: hsl(0, 100%, 40%);">- return partly_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return PARTLY_MATCH;</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return exact_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return EXACT_MATCH;</span><br><span> }</span><br><span> </span><br><span> #endif /* HAVE_IPV6 */</span><br><span>@@ -1349,7 +1349,7 @@</span><br><span> * as it we only discover it if a user tries to run it</span><br><span> */</span><br><span> if (tmp == NULL)</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span> ret = cmd_match(tmp, command, min, false);</span><br><span> </span><br><span>@@ -1358,45 +1358,45 @@</span><br><span> return ret;</span><br><span> }</span><br><span> else if (CMD_VARARG(str))</span><br><span style="color: hsl(0, 100%, 40%);">- return vararg_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return VARARG_MATCH;</span><br><span> else if (CMD_RANGE(str))</span><br><span> {</span><br><span> if (cmd_range_match(str, command))</span><br><span style="color: hsl(0, 100%, 40%);">- return range_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return RANGE_MATCH;</span><br><span> }</span><br><span> #ifdef HAVE_IPV6</span><br><span> else if (CMD_IPV6(str))</span><br><span> {</span><br><span> if (cmd_ipv6_match(command) >= min)</span><br><span style="color: hsl(0, 100%, 40%);">- return ipv6_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return IPV6_MATCH;</span><br><span> }</span><br><span> else if (CMD_IPV6_PREFIX(str))</span><br><span> {</span><br><span> if (cmd_ipv6_prefix_match(command) >= min)</span><br><span style="color: hsl(0, 100%, 40%);">- return ipv6_prefix_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return IPV6_PREFIX_MATCH;</span><br><span> }</span><br><span> #endif /* HAVE_IPV6 */</span><br><span> else if (CMD_IPV4(str))</span><br><span> {</span><br><span> if (cmd_ipv4_match(command) >= min)</span><br><span style="color: hsl(0, 100%, 40%);">- return ipv4_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return IPV4_MATCH;</span><br><span> }</span><br><span> else if (CMD_IPV4_PREFIX(str))</span><br><span> {</span><br><span> if (cmd_ipv4_prefix_match(command) >= min)</span><br><span style="color: hsl(0, 100%, 40%);">- return ipv4_prefix_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return IPV4_PREFIX_MATCH;</span><br><span> }</span><br><span> else if (CMD_VARIABLE(str))</span><br><span style="color: hsl(0, 100%, 40%);">- return extend_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return EXTEND_MATCH;</span><br><span> else if (strncmp(command, str, strlen(command)) == 0)</span><br><span> {</span><br><span> if (strcmp(command, str) == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return exact_match;</span><br><span style="color: hsl(0, 100%, 40%);">- else if (partly_match >= min)</span><br><span style="color: hsl(0, 100%, 40%);">- return partly_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return EXACT_MATCH;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (PARTLY_MATCH >= min)</span><br><span style="color: hsl(120, 100%, 40%);">+ return PARTLY_MATCH;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> }</span><br><span> </span><br><span> /* Filter vector at the specified index and by the given command string, to</span><br><span>@@ -1412,7 +1412,7 @@</span><br><span> vector descvec;</span><br><span> struct desc *desc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- match_type = no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ match_type = NO_MATCH;</span><br><span> </span><br><span> /* If command and cmd_element string does not match set NULL to vector */</span><br><span> for (i = 0; i < vector_active(v); i++)</span><br><span>@@ -1432,7 +1432,7 @@</span><br><span> </span><br><span> ret = cmd_match (desc->cmd, command, level, true);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (ret != no_match)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ret != NO_MATCH)</span><br><span> matched++;</span><br><span> </span><br><span> if (match_type < ret)</span><br><span>@@ -1443,8 +1443,8 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (match_type == no_match)</span><br><span style="color: hsl(0, 100%, 40%);">- return no_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (match_type == NO_MATCH)</span><br><span style="color: hsl(120, 100%, 40%);">+ return NO_MATCH;</span><br><span> </span><br><span> /* 2nd pass: We now know the 'strongest' match type for the index, so we</span><br><span> * go again and filter out commands whose argument (at this index) is</span><br><span>@@ -1454,7 +1454,7 @@</span><br><span> * foo bar BLAH</span><br><span> *</span><br><span> * and the command string is 'foo bar 10', then we will get here with with</span><br><span style="color: hsl(0, 100%, 40%);">- * 'range_match' being the strongest match. However, if 'BLAH' came</span><br><span style="color: hsl(120, 100%, 40%);">+ * 'RANGE_MATCH' being the strongest match. However, if 'BLAH' came</span><br><span> * earlier, it won't have been filtered out (as a CMD_VARIABLE allows "10").</span><br><span> *</span><br><span> * If we don't do a 2nd pass and filter it out, the higher-layers will</span><br><span>@@ -1475,7 +1475,7 @@</span><br><span> if ((desc = vector_slot(descvec, j))) {</span><br><span> enum match_type ret;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ret = cmd_match(desc->cmd, command, any_match, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = cmd_match(desc->cmd, command, ANY_MATCH, true);</span><br><span> </span><br><span> if (ret >= match_type)</span><br><span> matched++;</span><br><span>@@ -1535,12 +1535,12 @@</span><br><span> }</span><br><span> </span><br><span> switch (type) {</span><br><span style="color: hsl(0, 100%, 40%);">- case exact_match:</span><br><span style="color: hsl(120, 100%, 40%);">+ case EXACT_MATCH:</span><br><span> if (!(CMD_VARIABLE (str))</span><br><span> && strcmp(command, str) == 0)</span><br><span> match++;</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case partly_match:</span><br><span style="color: hsl(120, 100%, 40%);">+ case PARTLY_MATCH:</span><br><span> if (!(CMD_VARIABLE (str))</span><br><span> && strncmp(command, str, strlen (command)) == 0)</span><br><span> {</span><br><span>@@ -1554,7 +1554,7 @@</span><br><span> match++;</span><br><span> }</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case range_match:</span><br><span style="color: hsl(120, 100%, 40%);">+ case RANGE_MATCH:</span><br><span> if (cmd_range_match</span><br><span> (str, command)) {</span><br><span> if (matched</span><br><span>@@ -1568,15 +1568,15 @@</span><br><span> }</span><br><span> break;</span><br><span> #ifdef HAVE_IPV6</span><br><span style="color: hsl(0, 100%, 40%);">- case ipv6_match:</span><br><span style="color: hsl(120, 100%, 40%);">+ case IPV6_MATCH:</span><br><span> if (CMD_IPV6(str))</span><br><span> match++;</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case ipv6_prefix_match:</span><br><span style="color: hsl(120, 100%, 40%);">+ case IPV6_PREFIX_MATCH:</span><br><span> if ((mtype =</span><br><span> cmd_ipv6_prefix_match</span><br><span style="color: hsl(0, 100%, 40%);">- (command)) != no_match) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (mtype == partly_match) {</span><br><span style="color: hsl(120, 100%, 40%);">+ (command)) != NO_MATCH) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mtype == PARTLY_MATCH) {</span><br><span> ret = 2; /* There is incomplete match. */</span><br><span> goto free_and_return;</span><br><span> }</span><br><span>@@ -1585,15 +1585,15 @@</span><br><span> }</span><br><span> break;</span><br><span> #endif /* HAVE_IPV6 */</span><br><span style="color: hsl(0, 100%, 40%);">- case ipv4_match:</span><br><span style="color: hsl(120, 100%, 40%);">+ case IPV4_MATCH:</span><br><span> if (CMD_IPV4(str))</span><br><span> match++;</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case ipv4_prefix_match:</span><br><span style="color: hsl(120, 100%, 40%);">+ case IPV4_PREFIX_MATCH:</span><br><span> if ((mtype =</span><br><span> cmd_ipv4_prefix_match</span><br><span style="color: hsl(0, 100%, 40%);">- (command)) != no_match) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (mtype == partly_match) {</span><br><span style="color: hsl(120, 100%, 40%);">+ (command)) != NO_MATCH) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mtype == PARTLY_MATCH) {</span><br><span> ret = 2; /* There is incomplete match. */</span><br><span> goto free_and_return;</span><br><span> }</span><br><span>@@ -1601,11 +1601,11 @@</span><br><span> match++;</span><br><span> }</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case extend_match:</span><br><span style="color: hsl(120, 100%, 40%);">+ case EXTEND_MATCH:</span><br><span> if (CMD_VARIABLE (str))</span><br><span> match++;</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case no_match:</span><br><span style="color: hsl(120, 100%, 40%);">+ case NO_MATCH:</span><br><span> default:</span><br><span> break;</span><br><span> }</span><br><span>@@ -1771,9 +1771,9 @@</span><br><span> if (!command)</span><br><span> continue;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- match = cmd_filter(command, cmd_vector, i, any_match);</span><br><span style="color: hsl(120, 100%, 40%);">+ match = cmd_filter(command, cmd_vector, i, ANY_MATCH);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (match == vararg_match) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (match == VARARG_MATCH) {</span><br><span> struct cmd_element *cmd_element;</span><br><span> vector descvec;</span><br><span> unsigned int j, k;</span><br><span>@@ -1826,7 +1826,7 @@</span><br><span> /* Make sure that cmd_vector is filtered based on current word */</span><br><span> command = vector_slot(vline, index);</span><br><span> if (command)</span><br><span style="color: hsl(0, 100%, 40%);">- cmd_filter(command, cmd_vector, index, any_match);</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd_filter(command, cmd_vector, index, ANY_MATCH);</span><br><span> </span><br><span> /* Make description vector. */</span><br><span> for (i = 0; i < vector_active(cmd_vector); i++) {</span><br><span>@@ -1974,7 +1974,7 @@</span><br><span> </span><br><span> /* First try completion match, if there is exactly match return 1 */</span><br><span> match =</span><br><span style="color: hsl(0, 100%, 40%);">- cmd_filter(command, cmd_vector, i, any_match);</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd_filter(command, cmd_vector, i, ANY_MATCH);</span><br><span> </span><br><span> /* If there is exact match then filter ambiguous match else check</span><br><span> ambiguousness. */</span><br><span>@@ -2234,9 +2234,9 @@</span><br><span> int ret;</span><br><span> </span><br><span> match = cmd_filter(command, cmd_vector, index,</span><br><span style="color: hsl(0, 100%, 40%);">- any_match);</span><br><span style="color: hsl(120, 100%, 40%);">+ ANY_MATCH);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (match == vararg_match)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (match == VARARG_MATCH)</span><br><span> break;</span><br><span> </span><br><span> ret =</span><br><span>@@ -2259,7 +2259,7 @@</span><br><span> </span><br><span> for (i = 0; i < vector_active(cmd_vector); i++) {</span><br><span> if ((cmd_element = vector_slot(cmd_vector, i))) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (match == vararg_match</span><br><span style="color: hsl(120, 100%, 40%);">+ if (match == VARARG_MATCH</span><br><span> || index >= cmd_element->cmdsize) {</span><br><span> matched_element = cmd_element;</span><br><span> #if 0</span><br><span>@@ -2383,10 +2383,10 @@</span><br><span> int ret;</span><br><span> </span><br><span> match = cmd_filter(vector_slot(vline, index),</span><br><span style="color: hsl(0, 100%, 40%);">- cmd_vector, index, exact_match);</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd_vector, index, EXACT_MATCH);</span><br><span> </span><br><span> /* If command meets '.VARARG' then finish matching. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (match == vararg_match)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (match == VARARG_MATCH)</span><br><span> break;</span><br><span> </span><br><span> ret =</span><br><span>@@ -2409,7 +2409,7 @@</span><br><span> if (vector_slot(cmd_vector, i) != NULL) {</span><br><span> cmd_element = vector_slot(cmd_vector, i);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (match == vararg_match</span><br><span style="color: hsl(120, 100%, 40%);">+ if (match == VARARG_MATCH</span><br><span> || index >= cmd_element->cmdsize) {</span><br><span> matched_element = cmd_element;</span><br><span> matched_count++;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/14427">change 14427</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/+/14427"/><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: Ib6e9592c5962d047869a280c10f9b557fae6f435 </div>
<div style="display:none"> Gerrit-Change-Number: 14427 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>