command_handler: change to 'argc' to CMD_ARGC

[fw/openocd] / src / xsvf / xsvf.c

diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c
index 2e78447acc148b7c5072c1c0d1bd1f8ec7e536d2..311acc6077fb4008e0bec565fc3d44f8f40a5de0 100644 (file)
--- a/src/xsvf/xsvf.c
+++ b/src/xsvf/xsvf.c
@@ -219,7 +219,7 @@ COMMAND_HANDLER(handle_xsvf_command)
        */
        struct jtag_tap *tap = NULL;
 
-       if (argc < 2)
+       if (CMD_ARGC < 2)
        {
                command_print(cmd_ctx, "usage: xsvf <device#|plain> <file> [<variant>] [quiet]");
                return ERROR_FAIL;
@@ -245,14 +245,14 @@ COMMAND_HANDLER(handle_xsvf_command)
        }
 
        /* if this argument is present, then interpret xruntest counts as TCK cycles rather than as usecs */
-       if ((argc > 2) && (strcmp(args[2], "virt2") == 0))
+       if ((CMD_ARGC > 2) && (strcmp(args[2], "virt2") == 0))
        {
                runtest_requires_tck = 1;
-               --argc;
+               --CMD_ARGC;
                ++args;
        }
 
-       if ((argc > 2) && (strcmp(args[2], "quiet") == 0))
+       if ((CMD_ARGC > 2) && (strcmp(args[2], "quiet") == 0))
        {
                verbose = 0;
        }
@@ -470,7 +470,7 @@ COMMAND_HANDLER(handle_xsvf_command)
                                                        TAP_IDLE,
                                                };
 
-                                               jtag_add_pathmove(DIM(exception_path), exception_path);
+                                               jtag_add_pathmove(ARRAY_SIZE(exception_path), exception_path);
 
                                                if (verbose)
                                                        LOG_USER("%s mismatch, xsdrsize=%d retry=%d", op_name, xsdrsize, attempt);