arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

fix the missing minimum width requirement

Browse Source
This commit is contained in:
Martin Ayotte 2015-08-07 11:06:06 -04:00
parent 80ccbaef0d
commit aa6965c172
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cores/esp8266/core_esp8266_noniso.c
View File

@ -165,8 +165,7 @@ char * dtostrf(double number, signed char width, unsigned char prec, char *s) {
char* out = s; char* out = s;
// Handle negative numbers // Handle negative numbers
if (number < 0.0) { if (number < 0.0) {
*out = '-'; *out++ = '-';
++out;
number = -number; number = -number;
} }
@ -186,9 +185,12 @@ char * dtostrf(double number, signed char width, unsigned char prec, char *s) {
// Print the decimal point, but only if there are digits beyond // Print the decimal point, but only if there are digits beyond
if (prec > 0) { if (prec > 0) {
*out = '.'; *out++ = '.';
++out;
} }
// make sure the string is terminated before mesuring it length
*out = 0;
// Reduce minimum width accordingly
width -= strlen(s);
// Print the digits after the decimal point // Print the digits after the decimal point
int8_t digit = 0; int8_t digit = 0;
@ -196,10 +198,13 @@ char * dtostrf(double number, signed char width, unsigned char prec, char *s) {
remainder *= 10.0; remainder *= 10.0;
digit = (int8_t)remainder; digit = (int8_t)remainder;
if (digit > 9) digit = 9; // insurance if (digit > 9) digit = 9; // insurance
*out = (char)('0' | digit); *out++ = (char)('0' | digit);
++out; width--;
remainder -= digit; remainder -= digit;
} }
// add '0' to fill minimum width requirement
while (width-- > 0) *out++ = '0';
// make sure the string is terminated
*out = 0; *out = 0;
return s; return s;
} }