command_handler: change to 'argc' to CMD_ARGC

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

diff --git a/src/helper/ioutil.c b/src/helper/ioutil.c
index 1423462c1088b45458fcc08070cff297caeb2da7..2e8229c5af7b3d07d2db962c07dcffbb2290a8f9 100644 (file)
--- a/src/helper/ioutil.c
+++ b/src/helper/ioutil.c
@@ -59,7 +59,7 @@
 
 COMMAND_HANDLER(handle_rm_command)
 {
-       if (argc != 1)
+       if (CMD_ARGC != 1)
        {
                command_print(cmd_ctx, "rm <filename>");
                return ERROR_INVALID_ARGUMENTS;
@@ -135,7 +135,7 @@ 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>");
                return ERROR_INVALID_ARGUMENTS;
@@ -161,7 +161,7 @@ COMMAND_HANDLER(handle_cat_command)
 
 COMMAND_HANDLER(handle_trunc_command)
 {
-       if (argc != 1)
+       if (CMD_ARGC != 1)
        {
                command_print(cmd_ctx, "trunc <filename>");
                return ERROR_INVALID_ARGUMENTS;
@@ -180,7 +180,7 @@ COMMAND_HANDLER(handle_meminfo_command)
        static int prev = 0;
        struct mallinfo info;
 
-       if (argc != 0)
+       if (CMD_ARGC != 0)
        {
                command_print(cmd_ctx, "meminfo");
                return ERROR_INVALID_ARGUMENTS;
@@ -202,7 +202,7 @@ COMMAND_HANDLER(handle_meminfo_command)
 
 COMMAND_HANDLER(handle_append_command)
 {
-       if (argc < 1)
+       if (CMD_ARGC < 1)
        {
                command_print(cmd_ctx,
                                "append <filename> [<string1>, [<string2>, ...]]");
@@ -214,20 +214,20 @@ COMMAND_HANDLER(handle_append_command)
        config_file = fopen(args[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]))
                                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;
        }
@@ -645,7 +645,7 @@ 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,
                        "remove file");