X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/c3ce66a888beadf2a6d524101dd009d5acd452ae..2dec14cd1dbf09755b0839859da1a942944a8376:/avr/env.c?ds=sidebyside

diff --git a/avr/env.c b/avr/env.c
index 70209ca..b2b4e6f 100644
--- a/avr/env.c
+++ b/avr/env.c
@@ -4,19 +4,13 @@
  * SPDX-License-Identifier:	GPL-2.0
  */
 
-#include "common.h"
-#include <string.h>
-#include <stdlib.h>
-#include <stdbool.h>
+#include "env.h"
 #include <avr/eeprom.h>
 
 #include "config.h"
 #include "debug.h"
-#include "xmalloc.h"
 #include "crc.h"
 #include "getopt-min.h"
-#include "command.h"
-#include "env.h"
 
 
 #define ENV_SIZE	(CONFIG_ENV_SIZE - sizeof(uint16_t) -1)
@@ -200,7 +194,7 @@ int envlist_import(uint8_t flags)
 				return -1;
 		}
 
-		np = (char *) xmalloc(len+1);
+		np = (char *) malloc(len+1);
 		if (np == NULL) {
 			printf_P(PSTR("## Can't malloc %d bytes\n"), len+1);
 			return 1;
@@ -456,7 +450,7 @@ int env_print(const MEMX char *name, bool mode)
  * @return 0 if ok, 1 on error
  */
 static
-command_ret_t _do_env_set(int flag, int argc, char * const argv[])
+command_ret_t _do_env_set(uint_fast8_t flag, int argc, char * const argv[])
 {
 	int i, len;
 	char *name, *value, *valp, *p;
@@ -493,7 +487,7 @@ command_ret_t _do_env_set(int flag, int argc, char * const argv[])
 	for (i = 2, len += 1; i < argc; ++i)
 		len += strlen(argv[i]) + 1;
 
-	value = xmalloc(len);
+	value = malloc(len);
 	if (value == NULL) {
 		printf_P(PSTR("## Can't malloc %d bytes\n"), len);
 		return CMD_RET_FAILURE;
@@ -649,7 +643,7 @@ bool getenv_yesno(const MEMX char *name)
 */
 }
 
-command_ret_t do_env_print(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_env_print(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[])
 {
 	(void) cmdtp; (void) flag;
 
@@ -695,7 +689,7 @@ command_ret_t do_env_print(cmd_tbl_t *cmdtp, int flag, int argc, char * const ar
 }
 
 
-command_ret_t do_env_set(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_env_set(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[])
 {
 	(void) cmdtp;
 
@@ -706,7 +700,7 @@ command_ret_t do_env_set(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv
 }
 
 
-command_ret_t do_env_default(cmd_tbl_t *cmdtp, int flag,
+command_ret_t do_env_default(cmd_tbl_t *cmdtp, uint_fast8_t flag,
 			  int argc, char * const argv[])
 {
 	(void) cmdtp; (void) flag; (void) argc;	(void) argv;
@@ -724,7 +718,7 @@ command_ret_t do_env_default(cmd_tbl_t *cmdtp, int flag,
 }
 
 
-command_ret_t do_env_save(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_env_save(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[])
 {
 	(void) cmdtp; (void) flag; (void) argc;	(void) argv;