From 513dabe9a2df6e997d0ac0a92196999775643986 Mon Sep 17 00:00:00 2001 From: merlokk Date: Fri, 8 Dec 2017 19:29:18 +0200 Subject: [PATCH] simplify --- client/cliparser/cliparser.h | 3 +++ client/cmdhf14a.c | 11 ++--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/client/cliparser/cliparser.h b/client/cliparser/cliparser.h index cbd27a81..bd662516 100644 --- a/client/cliparser/cliparser.h +++ b/client/cliparser/cliparser.h @@ -20,6 +20,9 @@ #define arg_get_int(n)(((struct arg_int*)argtable[n])->ival[0]) #define arg_get_str(n)((struct arg_str*)argtable[n]) +#define CLIExecWithReturn(cmd,atbl,ifempty) if (CLIParserParseString(cmd, atbl, arg_getsize(atbl), ifempty)){CLIParserFree();return 0;} +#define CLIGetStrWithReturn(paramnum, data, datalen, delta) if (CLIParamHexToBuf(arg_get_str(paramnum), data, sizeof(data) - (delta), datalen)) {CLIParserFree();return 1;} + extern int CLIParserInit(char *vprogramName, char *vprogramHint, char *vprogramHelp); extern int CLIParserParseString(const char* str, void* argtable[], size_t vargtableLen, bool allowEmptyExec); extern int CLIParserParseArg(int argc, char **argv, void* argtable[], size_t vargtableLen, bool allowEmptyExec); diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c index c142e4d9..3168d823 100644 --- a/client/cmdhf14a.c +++ b/client/cmdhf14a.c @@ -740,20 +740,13 @@ int CmdHF14AAPDU(const char *cmd) { arg_str1(NULL, NULL, "", NULL), arg_param_end }; - if (CLIParserParseString(cmd, argtable, arg_getsize(argtable), false)){ - CLIParserFree(); - - return 0; - } + CLIExecWithReturn(cmd, argtable, false); activateField = arg_get_lit(1); leaveSignalON = arg_get_lit(2); decodeTLV = arg_get_lit(3); // len = data + PCB(1b) + CRC(2b) - if (CLIParamHexToBuf(arg_get_str(4), data, sizeof(data) - 1 -2, &datalen)) { - CLIParserFree(); - return 1; - } + CLIGetStrWithReturn(4, data, &datalen, 1 + 2); CLIParserFree(); // PrintAndLog("---str [%d] %s", arg_get_str(4)->count, arg_get_str(4)->sval[0]);