Renamed cmd_reset to prevent collisions

SpacehuhnTech · Jun 14, 2022 · 37d6e51 · 37d6e51
1 parent f3f7959
commit 37d6e51
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "SimpleCLI",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "keywords": "cli, parser, command, line, interface",
   "description": "Add a command line interface to your project the easy way",
   "repository": {

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=SimpleCLI
-version=1.1.3
+version=1.1.4
 author=Spacehuhn
 maintainer=Spacehuhn Technologies <[email protected]>
 sentence=A Command Line Interface Library for Arduino

diff --git a/src/SimpleCLI.cpp b/src/SimpleCLI.cpp
@@ -105,7 +105,7 @@ void SimpleCLI::parse(const char* str, size_t len) {
 
             cmd_error_destroy(e);
 
-            cmd_reset(h);
+            cmd_reset_cli(h);
 
             h = h->next;
         }

diff --git a/src/SimpleCLI.h b/src/SimpleCLI.h
@@ -9,7 +9,7 @@
 
 #include "CommandError.h" // CommandError, Command, Argument
 
-#define SIMPLECLI_VERSION "1.1.3"
+#define SIMPLECLI_VERSION "1.1.4"
 #define SIMPLECLI_VERSION_MAJOR 1
 #define SIMPLECLI_VERSION_MINOR 1
 #define SIMPLECLI_VERSION_REVISION 3

diff --git a/src/c/cmd.c b/src/c/cmd.c
@@ -163,7 +163,7 @@ cmd* cmd_add_arg(cmd* c, arg* a) {
 }
 
 // Reset CMD
-void cmd_reset(cmd* c) {
+void cmd_reset_cli(cmd* c) {
     if (c) {
         if (c->mode == CMD_BOUNDLESS) {
             arg_destroy_rec(c->arg_list);
@@ -174,10 +174,10 @@ void cmd_reset(cmd* c) {
     }
 }
 
-void cmd_reset_rec(cmd* c) {
+void cmd_reset_cli_rec(cmd* c) {
     if (c) {
-        cmd_reset(c);
-        cmd_reset_rec(c->next);
+        cmd_reset_cli(c);
+        cmd_reset_cli_rec(c->next);
     }
 }
 

diff --git a/src/c/cmd.h b/src/c/cmd.h
@@ -34,8 +34,8 @@ cmd* cmd_push(cmd* l, cmd* c, int max_size);
 cmd* cmd_add_arg(cmd* c, arg* a);
 
 // Reset CMD
-void cmd_reset(cmd* c);
-void cmd_reset_rec(cmd* c);
+void cmd_reset_cli(cmd* c);
+void cmd_reset_cli_rec(cmd* c);
 
 // Comparisons
 int cmd_name_equals(cmd* c, const char* name, size_t name_len, int case_sensetive);