From f4021bcecdc1f5126d590618e86239c5aca3ecb2 Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Mon, 18 Mar 2019 20:54:18 +0100 Subject: Core: fix another variable name conflict Addresses LGTM.com issue. Signed-off-by: Robert C. Helling Signed-off-by: Dirk Hohndel --- core/parse-xml.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/core/parse-xml.c b/core/parse-xml.c index 5f70fdc52..5ce6c5c44 100644 --- a/core/parse-xml.c +++ b/core/parse-xml.c @@ -2139,19 +2139,19 @@ int parse_dlf_buffer(unsigned char *buffer, size_t size, struct dive_table *tabl /* Recording the starting battery status to extra data */ if (battery_start.volt1) { - size_t size = snprintf(NULL, 0, "%dmV (%d%%)", battery_start.volt1, battery_start.percent1) + 1; + size_t stringsize = snprintf(NULL, 0, "%dmV (%d%%)", battery_start.volt1, battery_start.percent1) + 1; char *ptr = malloc(size); if (ptr) { - snprintf(ptr, size, "%dmV (%d%%)", battery_start.volt1, battery_start.percent1); + snprintf(ptr, stringsize, "%dmV (%d%%)", battery_start.volt1, battery_start.percent1); add_extra_data(state.cur_dc, "Battery 1 (start)", ptr); free(ptr); } - size = snprintf(NULL, 0, "%dmV (%d%%)", battery_start.volt2, battery_start.percent2) + 1; - ptr = malloc(size); + stringsize = snprintf(NULL, 0, "%dmV (%d%%)", battery_start.volt2, battery_start.percent2) + 1; + ptr = malloc(stringsize); if (ptr) { - snprintf(ptr, size, "%dmV (%d%%)", battery_start.volt2, battery_start.percent2); + snprintf(ptr, stringsize, "%dmV (%d%%)", battery_start.volt2, battery_start.percent2); add_extra_data(state.cur_dc, "Battery 2 (start)", ptr); free(ptr); } @@ -2159,19 +2159,19 @@ int parse_dlf_buffer(unsigned char *buffer, size_t size, struct dive_table *tabl /* Recording the ending battery status to extra data */ if (battery_end.volt1) { - size_t size = snprintf(NULL, 0, "%dmV (%d%%)", battery_end.volt1, battery_end.percent1) + 1; - char *ptr = malloc(size); + size_t stringsize = snprintf(NULL, 0, "%dmV (%d%%)", battery_end.volt1, battery_end.percent1) + 1; + char *ptr = malloc(stringsize); if (ptr) { - snprintf(ptr, size, "%dmV (%d%%)", battery_end.volt1, battery_end.percent1); + snprintf(ptr, stringsize, "%dmV (%d%%)", battery_end.volt1, battery_end.percent1); add_extra_data(state.cur_dc, "Battery 1 (end)", ptr); free(ptr); } - size = snprintf(NULL, 0, "%dmV (%d%%)", battery_end.volt2, battery_end.percent2) + 1; - ptr = malloc(size); + stringsize = snprintf(NULL, 0, "%dmV (%d%%)", battery_end.volt2, battery_end.percent2) + 1; + ptr = malloc(stringsize); if (ptr) { - snprintf(ptr, size, "%dmV (%d%%)", battery_end.volt2, battery_end.percent2); + snprintf(ptr, stringsize, "%dmV (%d%%)", battery_end.volt2, battery_end.percent2); add_extra_data(state.cur_dc, "Battery 2 (end)", ptr); free(ptr); } -- cgit v1.2.3-70-g09d2