use COMMAND_REGISTER macro

[fw/openocd] / src / helper / ioutil.c

diff --git a/src/helper/ioutil.c b/src/helper/ioutil.c
index 1423462c1088b45458fcc08070cff297caeb2da7..52ecb9f26fdd06ac4d6c5c46b33fb7491a95c0f9 100644 (file)
--- a/src/helper/ioutil.c
+++ b/src/helper/ioutil.c
@@ -59,15 +59,15 @@
 
 COMMAND_HANDLER(handle_rm_command)
 {
-       if (argc != 1)
+       if (CMD_ARGC != 1)
        {
-               command_print(cmd_ctx, "rm <filename>");
+               command_print(CMD_CTX, "rm <filename>");
                return ERROR_INVALID_ARGUMENTS;
        }
 
-       if (unlink(args[0]) != 0)
+       if (unlink(CMD_ARGV[0]) != 0)
        {
-               command_print(cmd_ctx, "failed: %d", errno);
+               command_print(CMD_CTX, "failed: %d", errno);
        }
 
        return ERROR_OK;
@@ -135,9 +135,9 @@ int loadFile(const char *fileName, void **data, size_t *len)
 
 COMMAND_HANDLER(handle_cat_command)
 {
-       if (argc != 1)
+       if (CMD_ARGC != 1)
        {
-               command_print(cmd_ctx, "cat <filename>");
+               command_print(CMD_CTX, "cat <filename>");
                return ERROR_INVALID_ARGUMENTS;
        }
 
@@ -145,15 +145,15 @@ COMMAND_HANDLER(handle_cat_command)
        void *data;
        size_t len;
 
-       int retval = loadFile(args[0], &data, &len);
+       int retval = loadFile(CMD_ARGV[0], &data, &len);
        if (retval == ERROR_OK)
        {
-               command_print(cmd_ctx, "%s", (char *)data);
+               command_print(CMD_CTX, "%s", (char *)data);
                free(data);
        }
        else
        {
-               command_print(cmd_ctx, "%s not found %d", args[0], retval);
+               command_print(CMD_CTX, "%s not found %d", CMD_ARGV[0], retval);
        }
 
        return ERROR_OK;
@@ -161,14 +161,14 @@ COMMAND_HANDLER(handle_cat_command)
 
 COMMAND_HANDLER(handle_trunc_command)
 {
-       if (argc != 1)
+       if (CMD_ARGC != 1)
        {
-               command_print(cmd_ctx, "trunc <filename>");
+               command_print(CMD_CTX, "trunc <filename>");
                return ERROR_INVALID_ARGUMENTS;
        }
 
        FILE *config_file = NULL;
-       config_file = fopen(args[0], "w");
+       config_file = fopen(CMD_ARGV[0], "w");
        if (config_file != NULL)
                fclose(config_file);
 
@@ -180,9 +180,9 @@ COMMAND_HANDLER(handle_meminfo_command)
        static int prev = 0;
        struct mallinfo info;
 
-       if (argc != 0)
+       if (CMD_ARGC != 0)
        {
-               command_print(cmd_ctx, "meminfo");
+               command_print(CMD_CTX, "meminfo");
                return ERROR_INVALID_ARGUMENTS;
        }
 
@@ -190,11 +190,11 @@ COMMAND_HANDLER(handle_meminfo_command)
 
        if (prev > 0)
        {
-               command_print(cmd_ctx, "Diff:            %d", prev - info.fordblks);
+               command_print(CMD_CTX, "Diff:            %d", prev - info.fordblks);
        }
        prev = info.fordblks;
 
-       command_print(cmd_ctx, "Available ram:   %d", info.fordblks);
+       command_print(CMD_CTX, "Available ram:   %d", info.fordblks);
 
        return ERROR_OK;
 }
@@ -202,32 +202,32 @@ COMMAND_HANDLER(handle_meminfo_command)
 
 COMMAND_HANDLER(handle_append_command)
 {
-       if (argc < 1)
+       if (CMD_ARGC < 1)
        {
-               command_print(cmd_ctx,
+               command_print(CMD_CTX,
                                "append <filename> [<string1>, [<string2>, ...]]");
                return ERROR_INVALID_ARGUMENTS;
        }
 
        int retval = ERROR_FAIL;
        FILE *config_file = NULL;
-       config_file = fopen(args[0], "a");
+       config_file = fopen(CMD_ARGV[0], "a");
        if (config_file != NULL)
        {
-               int i;
                fseek(config_file, 0, SEEK_END);
 
-               for (i = 1; i < argc; i++)
+               unsigned i;
+               for (i = 1; i < CMD_ARGC; i++)
                {
-                       if (fwrite(args[i], 1, strlen(args[i]), config_file) != strlen(args[i]))
+                       if (fwrite(CMD_ARGV[i], 1, strlen(CMD_ARGV[i]), config_file) != strlen(CMD_ARGV[i]))
                                break;
-                       if (i != argc - 1)
+                       if (i != CMD_ARGC - 1)
                        {
                                if (fwrite(" ", 1, 1, config_file) != 1)
                                        break;
                        }
                }
-               if ((i == argc) && (fwrite("\n", 1, 1, config_file) == 1))
+               if ((i == CMD_ARGC) && (fwrite("\n", 1, 1, config_file) == 1))
                {
                        retval = ERROR_OK;
                }
@@ -241,7 +241,7 @@ COMMAND_HANDLER(handle_append_command)
 
 COMMAND_HANDLER(handle_cp_command)
 {
-       if (argc != 2)
+       if (CMD_ARGC != 2)
        {
                return ERROR_INVALID_ARGUMENTS;
        }
@@ -250,11 +250,11 @@ COMMAND_HANDLER(handle_cp_command)
        void *data;
        size_t len;
 
-       int retval = loadFile(args[0], &data, &len);
+       int retval = loadFile(CMD_ARGV[0], &data, &len);
        if (retval != ERROR_OK)
                return retval;
 
-       FILE *f = fopen(args[1], "wb");
+       FILE *f = fopen(CMD_ARGV[1], "wb");
        if (f == NULL)
                retval = ERROR_INVALID_ARGUMENTS;
 
@@ -276,7 +276,7 @@ COMMAND_HANDLER(handle_cp_command)
                        break;
                }
 
-               command_print(cmd_ctx, "%zu", len - pos);
+               command_print(CMD_CTX, "%zu", len - pos);
 
                pos += chunk;
 
@@ -286,10 +286,10 @@ COMMAND_HANDLER(handle_cp_command)
 
        if (retval == ERROR_OK)
        {
-               command_print(cmd_ctx, "Copied %s to %s", args[0], args[1]);
+               command_print(CMD_CTX, "Copied %s to %s", CMD_ARGV[0], CMD_ARGV[1]);
        } else
        {
-               command_print(cmd_ctx, "Failed: %d", retval);
+               command_print(CMD_CTX, "Failed: %d", retval);
        }
 
        if (data != NULL)
@@ -298,7 +298,7 @@ COMMAND_HANDLER(handle_cp_command)
                fclose(f);
 
        if (retval != ERROR_OK)
-               unlink(args[1]);
+               unlink(CMD_ARGV[1]);
 
        return retval;
 }
@@ -645,24 +645,24 @@ static int zylinjtag_Jim_Command_mac(Jim_Interp *interp, int argc,
 
 
 
-int ioutil_init(struct command_context_s *cmd_ctx)
+int ioutil_init(struct command_context *cmd_ctx)
 {
-       register_command(cmd_ctx, NULL, "rm", handle_rm_command, COMMAND_ANY,
+       COMMAND_REGISTER(cmd_ctx, NULL, "rm", handle_rm_command, COMMAND_ANY,
                        "remove file");
 
-       register_command(cmd_ctx, NULL, "cat", handle_cat_command, COMMAND_ANY,
+       COMMAND_REGISTER(cmd_ctx, NULL, "cat", handle_cat_command, COMMAND_ANY,
                        "display file content");
 
-       register_command(cmd_ctx, NULL, "trunc", handle_trunc_command, COMMAND_ANY,
+       COMMAND_REGISTER(cmd_ctx, NULL, "trunc", handle_trunc_command, COMMAND_ANY,
                        "truncate a file to 0 size");
 
-       register_command(cmd_ctx, NULL, "cp", handle_cp_command,
+       COMMAND_REGISTER(cmd_ctx, NULL, "cp", handle_cp_command,
                                         COMMAND_ANY, "copy a file <from> <to>");
 
-       register_command(cmd_ctx, NULL, "append_file", handle_append_command,
+       COMMAND_REGISTER(cmd_ctx, NULL, "append_file", handle_append_command,
                        COMMAND_ANY, "append a variable number of strings to a file");
 
-       register_command(cmd_ctx, NULL, "meminfo", handle_meminfo_command,
+       COMMAND_REGISTER(cmd_ctx, NULL, "meminfo", handle_meminfo_command,
                        COMMAND_ANY, "display available ram memory");
 
     Jim_CreateCommand(interp, "rm", zylinjtag_Jim_Command_rm, NULL, NULL);