From: Andreas Fritiofson Date: Tue, 15 Nov 2011 22:46:10 +0000 (+0100) Subject: bitq: remove dead code X-Git-Tag: v0.6.0-rc1~430 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d31803d3d9bc4750ff34d14cffb809c916401d1e;p=openocd bitq: remove dead code field->in_value is already checked so it must be non-null here, which means the else clause can never execute so the entire buffer allocation and handling code is completely dead. Change-Id: Id465012a7e607349401d554fc7a8e5db7e967998 Signed-off-by: Andreas Fritiofson Reviewed-on: http://openocd.zylin.com/205 Tested-by: jenkins Reviewed-by: Spencer Oliver --- diff --git a/src/jtag/drivers/bitq.c b/src/jtag/drivers/bitq.c index 46eb27ae..4e2dbc21 100644 --- a/src/jtag/drivers/bitq.c +++ b/src/jtag/drivers/bitq.c @@ -37,12 +37,8 @@ struct bitq_state { }; static struct bitq_state bitq_in_state; -static uint8_t* bitq_in_buffer; /* buffer dynamically reallocated as needed */ -static int bitq_in_bufsize = 32; /* min. buffer size */ - /* * input queue processing does not use jtag_read_buffer() to avoid unnecessary overhead - * also the buffer for incomming data is reallocated only if necessary * no parameters, makes use of stored state information */ void bitq_in_proc(void) @@ -72,32 +68,7 @@ void bitq_in_proc(void) /* initialize field scanning */ in_mask = 0x01; in_idx = 0; - if (field->in_value) - in_buff = field->in_value; - else - { - /* buffer reallocation needed? */ - if (field->num_bits > bitq_in_bufsize * 8) - { - /* buffer previously allocated? */ - if (bitq_in_buffer != NULL) - { - /* free it */ - free(bitq_in_buffer); - bitq_in_buffer = NULL; - } - /* double the buffer size until it fits */ - while (field->num_bits > bitq_in_bufsize * 8) - bitq_in_bufsize *= 2; - } - /* if necessary, allocate buffer and check for malloc error */ - if (bitq_in_buffer == NULL && (bitq_in_buffer = malloc(bitq_in_bufsize)) == NULL) - { - LOG_ERROR("malloc error"); - exit(-1); - } - in_buff = (void*) bitq_in_buffer; - } + in_buff = field->in_value; } /* field scanning */ @@ -390,9 +361,4 @@ int bitq_execute_queue(void) void bitq_cleanup(void) { - if (bitq_in_buffer != NULL) - { - free(bitq_in_buffer); - bitq_in_buffer = NULL; - } }