X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/889202c46ced1be4fc0db3faf63564722eba2865..refs/tags/hexrel-6.7.1:/avr/command.c

diff --git a/avr/command.c b/avr/command.c
index bb88794..ed25dee 100644
--- a/avr/command.c
+++ b/avr/command.c
@@ -1,3 +1,12 @@
+/*
+ * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
+ *
+ * (C) Copyright 2000-2009
+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
 /*
  *  Command Processor Table
  */
@@ -6,7 +15,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <stdio.h>
 
 #include "config.h"
 #include "print-utils.h"
@@ -35,7 +43,7 @@ int strcmp_PP(const FLASH char *s1, const FLASH char *s2)
 {
 	unsigned char c1, c2;
 
-	while ((c1 = *(const FLASH unsigned char *)s1++) 
+	while ((c1 = *(const FLASH unsigned char *)s1++)
 			== (c2 = *(const FLASH unsigned char *)s2++))
 		if (c1 == 0)
 			return 0;
@@ -43,9 +51,9 @@ int strcmp_PP(const FLASH char *s1, const FLASH char *s2)
 	return c1 - c2;
 }
 
-int cmpstringp(const void *p1, const void *p2)
+int cmpstring_PP(const void *p1, const void *p2)
 {
-	return strcmp_PP((*(const FLASH cmd_tbl_t **) p1)->name, 
+	return strcmp_PP((*(const FLASH cmd_tbl_t **) p1)->name,
 		         (*(const FLASH cmd_tbl_t **) p2)->name);
 }
 
@@ -87,7 +95,7 @@ command_ret_t _do_help(cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t * cmdtp,
 		}
 
 		/* Sort command list */
-		qsort(cmd_array, cmd_items, sizeof (cmd_tbl_t *), cmpstringp);
+		qsort(cmd_array, cmd_items, sizeof (cmd_tbl_t *), cmpstring_PP);
 
 		/* print short help (usage) */
 		for (i = 0; i < cmd_items; i++) {
@@ -98,10 +106,10 @@ command_ret_t _do_help(cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t * cmdtp,
 				return CMD_RET_FAILURE;
 			if (usage == NULL)
 				continue;
-#ifdef GCC_BUG_61443 
+#ifdef GCC_BUG_61443
 			print_usage_line(cmd_array[i]->name, max_len, usage);
 #else
-			printf_P(PSTR("%-" stringify(8) /*FIXME*/ "S - %S\n"), 
+			printf_P(PSTR("%-" stringify(8) /*FIXME*/ "S - %S\n"),
 					cmd_array[i]->name, usage);
 #endif
 		}
@@ -112,7 +120,7 @@ command_ret_t _do_help(cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t * cmdtp,
 	 */
 	for (i = 1; i < argc; ++i) {
 		if ((cmdtp = find_cmd_tbl (argv[i], cmd_start, cmd_items )) != NULL) {
-			rcode = cmd_usage(cmdtp);
+			cmd_usage(cmdtp);
 		} else {
 			printf_P(PSTR("Unknown command '%s' - try 'help'"
 				" without arguments.\n\n"), argv[i]
@@ -141,8 +149,8 @@ cmd_tbl_t *find_cmd_tbl (const char *cmd, cmd_tbl_t *table, int table_len)
 	for (cmdtp = table;
 	     cmdtp != table + table_len;
 	     cmdtp++) {
-		if (strncmp_P (cmd, cmdtp->name, len) == 0) {
-			if (len == strlen (cmdtp->name))
+		if (strncmp_P(cmd, cmdtp->name, len) == 0) {
+			if (len == strlen_P(cmdtp->name))
 				return cmdtp;	/* full match */
 
 			cmdtp_temp = cmdtp;	/* abbreviated command ? */