diff options
| author |  Robert C. Helling <helling@atdotde.de> | 2019-03-18 20:54:18 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-04-04 15:15:20 -0700 |
| commit | f4021bcecdc1f5126d590618e86239c5aca3ecb2 (patch) | |
| tree | f8f9a556133fc1f3f78b0c0b4ac20d0e9d300291 | |
| parent | 101be9e9674cc7c8b7aba5a9759b5a2665a3140e (diff) | |
| download | subsurface-f4021bcecdc1f5126d590618e86239c5aca3ecb2.tar.gz | |
Core: fix another variable name conflict
Addresses LGTM.com issue.
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | core/parse-xml.c | 22 |
1 files 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); } |