From 362204d3e1aabcfde4877219d5ea3406e2d6f9ef Mon Sep 17 00:00:00 2001 From: asterix Date: Thu, 5 Jan 2012 17:26:03 +0000 Subject: [PATCH] Restore the previous name. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@5222 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/mware/parser.c | 10 +++++----- bertos/mware/parser.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bertos/mware/parser.c b/bertos/mware/parser.c index 2197d848..e08dd8b6 100644 --- a/bertos/mware/parser.c +++ b/bertos/mware/parser.c @@ -151,13 +151,13 @@ static bool parseArgs(const char *fmt, const char *input, parms argv[]) break; case 's': - (*argv).str.p = begin; - (*argv).str.sz = end - begin; + (*argv).s.p = begin; + (*argv).s.sz = end - begin; /* Remove the quotes from argument */ if (*begin == '"' && *(end - 1) == '"') { - (*argv).str.p += 1; - (*argv).str.sz -= 2; + (*argv).s.p += 1; + (*argv).s.sz -= 2; } argv++; break; @@ -286,7 +286,7 @@ bool parser_get_cmd_arguments(const char* input, const struct CmdTemplate* cmdp, if (!input) return false; - args[0].str.p = cmdp->name; + args[0].s.p = cmdp->name; if (!parseArgs(cmdp->arg_fmt, input, args + 1)) return false; diff --git a/bertos/mware/parser.h b/bertos/mware/parser.h index a3575546..d681f724 100644 --- a/bertos/mware/parser.h +++ b/bertos/mware/parser.h @@ -138,7 +138,7 @@ typedef struct } str_parm; /** union that contains parameters passed to and from commands */ -typedef union { long l; str_parm str; } parms; +typedef union { long l; str_parm s; } parms; /** pointer to commands */ typedef ResultCode (*CmdFuncPtr)(parms args_results[]); -- 2.25.1