Restore the previous name.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@5222 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/mware/parser.c b/bertos/mware/parser.c
index 2197d8482391b8616ab23fcb755078440ece50c0..e08dd8b66f80a2dba0c1aff5484f705215a17f97 100644 (file)
--- 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 a3575546dfeba589529428ff49c0034bdcc5511c..d681f724d297daaf9ec89553840dd5563dff9d24 100644 (file)
--- 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[]);