avr
/
avrdude
mirror of https://github.com/mariusgreuel/avrdude.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove unnecessary bool is_float in terminal write

This commit is contained in:
Stefan Rueger 2022-07-12 11:35:27 +01:00
parent 51355d04fb
commit feda75b60a
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/term.c
View File

@ -413,7 +413,6 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
// Data info // Data info
int32_t bytes_grown; int32_t bytes_grown;
uint8_t size; uint8_t size;
bool is_float;
char * str_ptr; char * str_ptr;
// Data union // Data union
union { union {
@ -425,7 +424,6 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
} data = { } data = {
.bytes_grown = 0, .bytes_grown = 0,
.size = 0, .size = 0,
.is_float = false,
.str_ptr = NULL, .str_ptr = NULL,
.ll = 0 .ll = 0
}; };
@ -436,7 +434,6 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
char *argi = argv[i]; char *argi = argv[i];
size_t arglen = strlen(argi); size_t arglen = strlen(argi);
data.is_float = false;
data.size = 0; data.size = 0;
// Free string pointer if already allocated // Free string pointer if already allocated
@ -531,7 +528,6 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
// Try float // Try float
data.f = strtof(argi, &end_ptr); data.f = strtof(argi, &end_ptr);
if (end_ptr != argi && toupper(*end_ptr) == 'F' && end_ptr[1] == 0) { if (end_ptr != argi && toupper(*end_ptr) == 'F' && end_ptr[1] == 0) {
data.is_float = true;
data.size = 4; data.size = 4;
} else { } else {
// Try single character // Try single character
@ -565,9 +561,9 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
buf[i - start_offset + data.bytes_grown++] = (uint8_t)data.str_ptr[j]; buf[i - start_offset + data.bytes_grown++] = (uint8_t)data.str_ptr[j];
} else { } else {
buf[i - start_offset + data.bytes_grown] = data.a[0]; buf[i - start_offset + data.bytes_grown] = data.a[0];
if (llabs(data.ll) > 0x000000FF || data.size >= 2 || data.is_float) if (llabs(data.ll) > 0x000000FF || data.size >= 2)
buf[i - start_offset + ++data.bytes_grown] = data.a[1]; buf[i - start_offset + ++data.bytes_grown] = data.a[1];
if (llabs(data.ll) > 0x0000FFFF || data.size >= 4 || data.is_float) { if (llabs(data.ll) > 0x0000FFFF || data.size >= 4) {
buf[i - start_offset + ++data.bytes_grown] = data.a[2]; buf[i - start_offset + ++data.bytes_grown] = data.a[2];
buf[i - start_offset + ++data.bytes_grown] = data.a[3]; buf[i - start_offset + ++data.bytes_grown] = data.a[3];
} }