From d96010ae7125ced9a48613b5251a59249f519621 Mon Sep 17 00:00:00 2001 From: Andreas Fritiofson Date: Sat, 28 Sep 2013 16:29:50 +0200 Subject: jtag/tcl: Remove no-op free And use calloc instead of malloc+memset. Change-Id: Icc1ed6e34904972bb5d3728307dcae5c55b32fc3 Signed-off-by: Andreas Fritiofson Reviewed-on: http://openocd.zylin.com/1666 Tested-by: jenkins Reviewed-by: Spencer Oliver --- src/jtag/tcl.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/jtag/tcl.c') diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c index 227222ef..fb060f9a 100644 --- a/src/jtag/tcl.c +++ b/src/jtag/tcl.c @@ -1120,17 +1120,12 @@ COMMAND_HANDLER(handle_irscan_command) return ERROR_COMMAND_SYNTAX_ERROR; } - size_t fields_len = sizeof(struct scan_field) * num_fields; - fields = malloc(fields_len); - memset(fields, 0, fields_len); + fields = calloc(num_fields, sizeof(*fields)); int retval; for (i = 0; i < num_fields; i++) { tap = jtag_tap_by_string(CMD_ARGV[i*2]); if (tap == NULL) { - int j; - for (j = 0; j < i; j++) - free((void *)fields[j].out_value); free(fields); command_print(CMD_CTX, "Tap: %s unknown", CMD_ARGV[i*2]); -- cgit v1.2.3-18-g5258