From 1b6a45ac17fd87294c4c7a1305bc796e3f797c88 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Fri, 19 Apr 2019 00:47:51 +0200
Subject: [PATCH] propagate CmdsParse return value

---
 client/cmdanalyse.c     | 3 +--
 client/cmddata.c        | 3 +--
 client/cmdhf.c          | 3 +--
 client/cmdhf14a.c       | 3 +--
 client/cmdhf14b.c       | 3 +--
 client/cmdhf15.c        | 5 ++---
 client/cmdhfepa.c       | 3 +--
 client/cmdhffelica.c    | 3 +--
 client/cmdhffido.c      | 3 +--
 client/cmdhficlass.c    | 3 +--
 client/cmdhflegic.c     | 3 +--
 client/cmdhfmf.c        | 3 +--
 client/cmdhfmfdes.c     | 3 +--
 client/cmdhfmfdesfire.c | 3 +--
 client/cmdhfmfp.c       | 3 +--
 client/cmdhfmfu.c       | 3 +--
 client/cmdhftopaz.c     | 3 +--
 client/cmdlf.c          | 3 +--
 client/cmdlfawid.c      | 3 +--
 client/cmdlfcotag.c     | 3 +--
 client/cmdlfem4x.c      | 3 +--
 client/cmdlffdx.c       | 3 +--
 client/cmdlfguard.c     | 3 +--
 client/cmdlfhid.c       | 3 +--
 client/cmdlfhitag.c     | 3 +--
 client/cmdlfindala.c    | 3 +--
 client/cmdlfio.c        | 3 +--
 client/cmdlfjablotron.c | 3 +--
 client/cmdlfkeri.c      | 3 +--
 client/cmdlfnedap.c     | 3 +--
 client/cmdlfnexwatch.c  | 3 +--
 client/cmdlfnoralsy.c   | 3 +--
 client/cmdlfpac.c       | 3 +--
 client/cmdlfparadox.c   | 3 +--
 client/cmdlfpcf7931.c   | 3 +--
 client/cmdlfpresco.c    | 3 +--
 client/cmdlfpyramid.c   | 3 +--
 client/cmdlfsecurakey.c | 3 +--
 client/cmdlft55xx.c     | 3 +--
 client/cmdlfti.c        | 3 +--
 client/cmdlfviking.c    | 3 +--
 client/cmdlfvisa2000.c  | 3 +--
 client/cmdscript.c      | 3 +--
 client/cmdsmartcard.c   | 3 +--
 client/cmdtrace.c       | 3 +--
 client/emv/cmdemv.c     | 3 +--
 46 files changed, 47 insertions(+), 93 deletions(-)

diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 97e4eae0b..3e334efc5 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -925,6 +925,5 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdAnalyse(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
diff --git a/client/cmddata.c b/client/cmddata.c
index 78e6df0a7..80ebc7317 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -2147,7 +2147,6 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdData(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
diff --git a/client/cmdhf.c b/client/cmdhf.c
index 4c4f6f7df..713f5821d 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -127,8 +127,7 @@ static command_t CommandTable[] = {
 
 int CmdHF(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int CmdHelp(const char *Cmd) {
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 6429d3c99..074db3706 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -1156,8 +1156,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdHF14A(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int infoHF14A(bool verbose, bool do_nack_test) {
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 6fa549468..4f06e5b75 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -1120,8 +1120,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdHF14B(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 // get and print all info known about any known 14b tag
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 9aef649cc..58fe81945 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -1293,7 +1293,7 @@ static int CmdHF15Restore(const char *Cmd) {
     return 0;
 }
 
-static command_t CommandTable15[] = {
+static command_t CommandTable[] = {
     {"help",        CmdHF15Help,        1, "This help"},
     {"demod",       CmdHF15Demod,       1, "Demodulate ISO15693 from tag"},
     {"dump",        CmdHF15Dump,        0, "Read all memory pages of an ISO15693 tag, save to file"},
@@ -1320,8 +1320,7 @@ static int CmdHF15Help(const char *Cmd) {
 
 int CmdHF15(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable15, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 // used with 'hf search'
diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index 6a7674ddd..3f95894e7 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -178,6 +178,5 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdHFEPA(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index e628101b3..24cc696b3 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -562,8 +562,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdHFFelica(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int readFelicaUid(bool verbose) {
diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index f834fd32c..2bdb9421b 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -906,8 +906,7 @@ static command_t CommandTable[] = {
 
 int CmdHFFido(const char *Cmd) {
     (void)WaitForResponseTimeout(CMD_ACK, NULL, 100);
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int CmdHelp(const char *Cmd) {
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index faa8f3941..bfd76d377 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -2454,8 +2454,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdHFiClass(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int readIclass(bool loop, bool verbose) {
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 78b0d24a2..18555b957 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -1311,8 +1311,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdHFLegic(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int readLegicUid(bool verbose) {
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 96bfb06b6..2a4430262 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -3585,7 +3585,6 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdHFMF(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index cfe531050..fc903361e 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -659,7 +659,6 @@ static int CmdHelp(const char *Cmd) {
 int CmdHFMFDes(const char *Cmd) {
     // flush
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
diff --git a/client/cmdhfmfdesfire.c b/client/cmdhfmfdesfire.c
index 824190ba7..ac078f2ce 100644
--- a/client/cmdhfmfdesfire.c
+++ b/client/cmdhfmfdesfire.c
@@ -241,6 +241,5 @@ static int CmdHelp(const char *Cmd) {
 int CmdHFMFDesfire(const char *Cmd) {
     // flush
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index 32566988e..4b6d2afb2 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -862,7 +862,6 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdHFMFP(const char *Cmd) {
     (void)WaitForResponseTimeout(CMD_ACK, NULL, 100);
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 3e41e1608..ca7ae75be 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -2671,7 +2671,6 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdHFMFUltra(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index 962a19c8d..3cf443c76 100644
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -525,8 +525,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdHFTopaz(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int readTopazUid(void) {
diff --git a/client/cmdlf.c b/client/cmdlf.c
index ae8dc39dd..4a78f6e92 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -1007,8 +1007,7 @@ static command_t CommandTable[] = {
 
 int CmdLF(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 4b22292bf..d28d4bc37 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -522,8 +522,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFAWID(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 //refactored by marshmellow
diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index a8deaf584..98d1cbe1a 100644
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -118,8 +118,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFCOTAG(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int demodCOTAG(void) {
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 10faa0de9..266b8d0a2 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -1495,8 +1495,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFEM4X(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int demodEM410x(void) {
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 7eb4d37b6..060717d50 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -344,8 +344,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFFdx(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 // Ask/Biphase Demod then try to locate an ISO 11784/85 ID
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index 8959583dc..b92129fd8 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -241,8 +241,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFGuard(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 // by marshmellow
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 4a4e43f5a..5675b1824 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -624,8 +624,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFHID(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int demodHID(void) {
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 32d346f75..ede8c3cd1 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -720,8 +720,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFHitag(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int readHitagUid(void) {
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index ff19b9e27..c4ad8bb3b 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -480,8 +480,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFINDALA(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 // redesigned by marshmellow adjusted from existing decode functions
diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index cbba850c0..cc5fec9d5 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -282,8 +282,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFIO(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int demodIOProx(void) {
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 0febca75c..fbe1168a6 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -217,8 +217,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFJablotron(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int getJablotronBits(uint64_t fullcode, uint8_t *bits) {
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index 5815b8b6a..10e171bdd 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -214,8 +214,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFKeri(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 // find KERI preamble in already demoded data
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index bcf9496f4..43fd1a1b0 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -320,8 +320,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFNedap(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 // find nedap preamble in already demoded data
diff --git a/client/cmdlfnexwatch.c b/client/cmdlfnexwatch.c
index 67536d06e..6adc3bc1a 100644
--- a/client/cmdlfnexwatch.c
+++ b/client/cmdlfnexwatch.c
@@ -89,8 +89,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFNEXWATCH(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int detectNexWatch(uint8_t *dest, size_t *size, bool *invert) {
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index fc3a6fb14..66b2183af 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -222,8 +222,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFNoralsy(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int getnoralsyBits(uint32_t id, uint16_t year, uint8_t *bits) {
diff --git a/client/cmdlfpac.c b/client/cmdlfpac.c
index 5aa1edd45..333269494 100644
--- a/client/cmdlfpac.c
+++ b/client/cmdlfpac.c
@@ -71,8 +71,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFPac(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 // by marshmellow
diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index 3b76c9ac6..173871e0e 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -164,8 +164,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFParadox(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 // loop to get raw paradox waveform then FSK demodulate the TAG ID from it
diff --git a/client/cmdlfpcf7931.c b/client/cmdlfpcf7931.c
index 686ded78c..ad212f926 100644
--- a/client/cmdlfpcf7931.c
+++ b/client/cmdlfpcf7931.c
@@ -173,7 +173,6 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFPCF7931(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index 1d6d3de44..0560862ec 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -175,8 +175,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFPresco(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 // find presco preamble 0x10D in already demoded data
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 60fd5396a..cb146edd3 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -295,8 +295,7 @@ static command_t CommandTable[] = {
 
 int CmdLFPyramid(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int CmdHelp(const char *Cmd) {
diff --git a/client/cmdlfsecurakey.c b/client/cmdlfsecurakey.c
index ab5079dd5..23acad670 100644
--- a/client/cmdlfsecurakey.c
+++ b/client/cmdlfsecurakey.c
@@ -116,8 +116,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFSecurakey(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 // by marshmellow
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 2f6fb3775..65693dac6 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -2335,7 +2335,6 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFT55XX(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index b675f693a..9276c903c 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -315,8 +315,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFTI(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int demodTI(void) {
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index d0a42295b..3234da145 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -143,8 +143,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFViking(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 // calc checksum
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index 05fe3f098..6a6b14f00 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -227,8 +227,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdLFVisa2k(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 // by iceman
diff --git a/client/cmdscript.c b/client/cmdscript.c
index bcaf581bf..ba581290f 100644
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -193,7 +193,6 @@ static int CmdHelp(const char *Cmd) {
  */
 int CmdScript(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 656753395..3f933b4ad 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -1166,8 +1166,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdSmartcard(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index 88be40892..7cda18d77 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -586,8 +586,7 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdTrace(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }
 
 int CmdTraceList(const char *Cmd) {
diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 2fceab02b..8af27b9a8 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1968,7 +1968,6 @@ static int CmdHelp(const char *Cmd) {
 
 int CmdEMV(const char *Cmd) {
     clearCommandBuffer();
-    CmdsParse(CommandTable, Cmd);
-    return 0;
+    return CmdsParse(CommandTable, Cmd);
 }