Skip to content

Commit d49db60

Browse files
geekfactorygeekfactory
authored andcommitted
Changed error strings
1 parent 15e82d3 commit d49db60

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

Shell.c

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ static int shell_parse(char * buf, char** argv, unsigned short maxargs);
3838
static void shell_prompt();
3939

4040

41-
static void shell_format();
41+
static void shell_format(const char * fmt, va_list va);
4242

4343
/**
4444
* Default message of the day
@@ -145,22 +145,22 @@ void shell_print_error(int error, const char * field)
145145
shell_print((const char *) "#ERROR-TYPE:");
146146
switch (error) {
147147
case E_SHELL_ERR_ARGCOUNT:
148-
shell_print((const char *) "ArgCount");
148+
shell_print((const char *) "ARG_COUNT");
149149
break;
150150
case E_SHELL_ERR_OUTOFRANGE:
151-
shell_print((const char *) "OutOfRange");
151+
shell_print((const char *) "OUT_OF_RANGE");
152152
break;
153153
case E_SHELL_ERR_VALUE:
154-
shell_print((const char *) "InvalidVal");
154+
shell_print((const char *) "INVALID_VALUE");
155155
break;
156156
case E_SHELL_ERR_ACTION:
157-
shell_print((const char *) "InvalidAct");
157+
shell_print((const char *) "INVALID_ACTION");
158158
break;
159159
case E_SHELL_ERR_PARSE:
160-
shell_print((const char *) "Parse");
160+
shell_print((const char *) "PARSING");
161161
break;
162162
case E_SHELL_ERR_STORAGE:
163-
shell_print((const char *) "Storage");
163+
shell_print((const char *) "STORAGE");
164164
break;
165165
case E_SHELL_ERR_IO:
166166
shell_print((const char *) "IO");
@@ -183,7 +183,7 @@ void shell_println(const char * string)
183183
shell_print("\r\n");
184184
}
185185

186-
void shell_printf(char * fmt, ...)
186+
void shell_printf(const char * fmt, ...)
187187
{
188188
va_list argl;
189189
va_start(argl, fmt);
@@ -270,6 +270,7 @@ void shell_task()
270270

271271
/*-------------------------------------------------------------*/
272272
/* Internal functions */
273+
273274
/*-------------------------------------------------------------*/
274275
static int shell_parse(char * buf, char ** argv, unsigned short maxargs)
275276
{
@@ -392,9 +393,9 @@ static int a2d(char ch)
392393
else return -1;
393394
}
394395

395-
static char a2i(char ch, char** src, int base, int* nump)
396+
static char a2i(char ch, const char** src, int base, int* nump)
396397
{
397-
char* p = *src;
398+
const char* p = *src;
398399
int num = 0;
399400
int digit;
400401
while ((digit = a2d(ch)) >= 0) {
@@ -420,7 +421,7 @@ static void putchw(int n, char z, char* bf)
420421
shell_writer(ch);
421422
}
422423

423-
static void shell_format(char * fmt, va_list va)
424+
static void shell_format(const char * fmt, va_list va)
424425
{
425426
char bf[12];
426427
char ch;

Shell.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ void shell_println(const char * string);
215215
*
216216
* @param ... Aditional arguments that are inserted on the string as text
217217
*/
218-
void shell_printf(char * fmt, ...);
218+
void shell_printf(const char * fmt, ...);
219219

220220
/**
221221
* @brief Main Shell processing loop

0 commit comments

Comments
 (0)