enum command_ret_t --> typedef

[z180-stamp.git] / avr / env.c

diff --git a/avr/env.c b/avr/env.c
index 7cf33acaac8b738261e19006a7bb1d9f8a9c4102..8487c6f5e0cffb096b8c9ecf537941eddc8ebf16 100644 (file)
--- a/avr/env.c
+++ b/avr/env.c
@@ -596,34 +596,33 @@ int env_print_ramsize(void)
 }
 
 
-int do_env_print(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_env_print(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       int i;
-       int rcode = 0;
+       command_ret_t rc = CMD_RET_SUCCESS;
 
        (void) cmdtp; (void) flag;
 
        if (argc == 1) {
                /* print all env vars */
-               rcode = env_print(NULL);
-               if (rcode < 0)
-                       return 1;
+               int size = env_print(NULL);
+               if (size < 0)
+                       return CMD_RET_FAILURE;
                printf_P(PSTR("\nEnvironment size: %d/%d bytes\n"),
-                       rcode, ENV_SIZE);
+                       size, ENV_SIZE);
                env_print_ramsize();
-               return 0;
+               return CMD_RET_SUCCESS;
        }
 
        /* print selected env vars */
-       for (i = 1; i < argc; ++i) {
+       for (int i = 1; i < argc; ++i) {
                int rc = env_print(argv[i]);
                if (rc < 0) {
                        printf_P(PSTR("## Error: \"%s\" not defined\n"), argv[i]);
-                       ++rcode;
+                       rc = CMD_RET_FAILURE;
                }
        }
 
-       return rcode;
+       return rc;
 }
 
 
@@ -642,7 +641,7 @@ int do_env_print(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
  * @return 0 if ok, 1 on error
  */
 static
-int _do_env_set(int flag, int argc, char * const argv[])
+command_ret_t _do_env_set(int flag, int argc, char * const argv[])
 {
        int i, len;
        char *name, *value, *s;
@@ -657,12 +656,12 @@ int _do_env_set(int flag, int argc, char * const argv[])
        if (strchr(name, '=')) {
                printf_P(PSTR("## Error: illegal character '='"
                       "in variable name \"%s\"\n"), name);
-               return 1;
+               return CMD_RET_FAILURE;
        }
        if (strlen(name) > CONFIG_SYS_ENV_NAMELEN) {
                printf_P(PSTR("## Error: Variable name \"%s\" too long. "
                       "(max %d characters)\n"), name, CONFIG_SYS_ENV_NAMELEN);
-               return 1;
+               return CMD_RET_FAILURE;
        }
 /*
        env_id++;
@@ -670,7 +669,7 @@ int _do_env_set(int flag, int argc, char * const argv[])
        /* Delete only ? */
        if (argc < 3 || argv[2] == NULL) {
                int rc = envlist_delete(name);
-               return rc != 0;
+               return rc ? CMD_RET_FAILURE : CMD_RET_SUCCESS;
        }
 
        /*
@@ -682,7 +681,7 @@ int _do_env_set(int flag, int argc, char * const argv[])
        value = xmalloc(len);
        if (value == NULL) {
                printf_P(PSTR("## Can't malloc %d bytes\n"), len);
-               return 1;
+               return CMD_RET_FAILURE;
        }
        for (i = 2, s = value; i < argc; ++i) {
                char *v = argv[i];
@@ -701,10 +700,10 @@ int _do_env_set(int flag, int argc, char * const argv[])
        if (!ep) {
                printf_P(PSTR("## Error inserting \"%s\" variable.\n"),
                        name);
-               return 1;
+               return CMD_RET_FAILURE;
        }
 
-       return 0;
+       return CMD_RET_SUCCESS;
 }
 
 /**
@@ -723,7 +722,7 @@ int setenv(const char *varname, const char *varvalue)
        if (varvalue == NULL || varvalue[0] == '\0')
                --argc;
                
-       return _do_env_set(0, argc, (char * const *)argv);
+       return (int) _do_env_set(0, argc, (char * const *)argv);
 }
 
 #if 0
@@ -781,7 +780,7 @@ unsigned long getenv_hex(const char *varname, unsigned long default_val)
        return value;
 }
 
-int do_env_set(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_env_set(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        (void) cmdtp;
 
@@ -792,12 +791,12 @@ int do_env_set(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 }
 
 
-int do_env_save(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+command_ret_t do_env_save(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        (void) cmdtp; (void) flag; (void) argc; (void) argv;
 
        printf_P(PSTR("Saving Environment ...\n"));
-       return saveenv() ? 1 : 0;
+       return saveenv() ? CMD_RET_FAILURE : CMD_RET_SUCCESS;
 }
 
 #if defined(CONFIG_AUTO_COMPLETE)