svf: fix warnings

[openocd.git] / src / svf / svf.c

diff --git a/src/svf/svf.c b/src/svf/svf.c
index 64be127013d6d623940abe54244ec4dc3b78499c..936a0242675dbdaa48a7b2550f1a370a7313ab48 100644 (file)
--- a/src/svf/svf.c
+++ b/src/svf/svf.c
@@ -653,7 +653,7 @@ static int svf_read_command_from_file(FILE * fd)
        unsigned char ch;
        int i = 0;
        size_t cmd_pos = 0;
-       int cmd_ok = 0, slash = 0, comment = 0;
+       int cmd_ok = 0, slash = 0;
 
        if (svf_getline (&svf_read_line, &svf_read_line_size, svf_fd) <= 0)
        {
@@ -699,7 +699,6 @@ static int svf_read_command_from_file(FILE * fd)
                        i = -1;
                case '\r':
                        slash = 0;
-                       comment = 0;
                        /* Don't save '\r' and '\n' if no data is parsed */
                        if (!cmd_pos)
                                break;
@@ -997,7 +996,7 @@ static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
 
        // for RUNTEST
        int run_count;
-       float min_time, max_time;
+       float min_time;
        // for XXR
        struct svf_xxr_para *xxr_para_tmp;
        uint8_t **pbuffer_tmp;
@@ -1282,7 +1281,7 @@ static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
                                buf_set_buf(svf_para.sdr_para.mask, 0, &svf_mask_buffer[svf_buffer_index], i, svf_para.sdr_para.len);
                                i += svf_para.sdr_para.len;
                                buf_set_buf(svf_para.tdr_para.mask, 0, &svf_mask_buffer[svf_buffer_index], i, svf_para.tdr_para.len);
-                               i += svf_para.tdr_para.len;
+
                                // assemble dr check data
                                i = 0;
                                buf_set_buf(svf_para.hdr_para.tdo, 0, &svf_tdo_buffer[svf_buffer_index], i, svf_para.hdr_para.len);
@@ -1380,7 +1379,7 @@ static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
                                buf_set_buf(svf_para.sir_para.mask, 0, &svf_mask_buffer[svf_buffer_index], i, svf_para.sir_para.len);
                                i += svf_para.sir_para.len;
                                buf_set_buf(svf_para.tir_para.mask, 0, &svf_mask_buffer[svf_buffer_index], i, svf_para.tir_para.len);
-                               i += svf_para.tir_para.len;
+
                                // assemble dr check data
                                i = 0;
                                buf_set_buf(svf_para.hir_para.tdo, 0, &svf_tdo_buffer[svf_buffer_index], i, svf_para.hir_para.len);
@@ -1425,7 +1424,6 @@ static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
                // init
                run_count = 0;
                min_time = 0;
-               max_time = 0;
                i = 1;
 
                // run_state
@@ -1478,6 +1476,7 @@ static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
                // MAXIMUM max_time SEC
                if (((i + 3) <= num_of_argu) && !strcmp(argus[i], "MAXIMUM") && !strcmp(argus[i + 2], "SEC"))
                {
+                       float max_time = 0;
                        max_time = atof(argus[i + 1]);
                        LOG_DEBUG("\tmax_time = %fs", max_time);
                        i += 3;
@@ -1507,13 +1506,12 @@ static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
                {
 #if 1
                        /* FIXME handle statemove failures */
-                       int retval;
                        uint32_t min_usec = 1000000 * min_time;
 
                        // enter into run_state if necessary
                        if (cmd_queue_cur_state != svf_para.runtest_run_state)
                        {
-                               retval = svf_add_statemove(svf_para.runtest_run_state);
+                               svf_add_statemove(svf_para.runtest_run_state);
                        }
 
                        // add clocks and/or min wait
@@ -1530,7 +1528,7 @@ static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
                        // move to end_state if necessary
                        if (svf_para.runtest_end_state != svf_para.runtest_run_state)
                        {
-                               retval = svf_add_statemove(svf_para.runtest_end_state);
+                               svf_add_statemove(svf_para.runtest_end_state);
                        }
 #else
                        if (svf_para.runtest_run_state != TAP_IDLE)