about summary refs log tree commit diff stats
path: root/src/tools
diff options
context:
space:
mode:
authorMichael Vetter <jubalh@iodoru.org>2020-07-20 15:33:19 +0200
committerMichael Vetter <jubalh@iodoru.org>2020-07-20 15:33:19 +0200
commit86281072f9b943c23119f1c90cd33934caf1d737 (patch)
treee6109de8096bc23298f1346b49f2053cc407ac03 /src/tools
parentc5c969a9295abe688ad7fd9afce430bae5df910c (diff)
downloadprofani-tty-86281072f9b943c23119f1c90cd33934caf1d737.tar.gz
Use parse_args_with_freetext() for `/correct`
This commit partly reverts
8f37afcd37ad8663ca36c13ca7fbc4a431119f73
Which was using a wrong approach to achieve this.

It changed parse_args() to have a -1 for infinite parameters.
But actually parse_args_with_freetext() should have been used exactly
for this behaviour.

Discovered when checking for
https://github.com/profanity-im/profanity/issues/1404
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/parser.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/parser.c b/src/tools/parser.c
index 240d5358..2e1d5c98 100644
--- a/src/tools/parser.c
+++ b/src/tools/parser.c
@@ -48,7 +48,7 @@
  *
  * inp - The line of input
  * min - The minimum allowed number of arguments
- * max - The maximum allowed number of arguments, -1 for infinite
+ * max - The maximum allowed number of arguments
  *
  * Returns - An NULL terminated array of strings representing the arguments
  * of the command, or NULL if the validation fails.
@@ -135,7 +135,7 @@ parse_args(const char* const inp, int min, int max, gboolean* result)
     int num = g_slist_length(tokens) - 1;
 
     // if num args not valid return NULL
-    if ((num < min) || ((max != -1) && (num > max))) {
+    if ((num < min) || (num > max)) {
         g_slist_free_full(tokens, free);
         g_free(copy);
         *result = FALSE;