romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 02:33:33 +03:00
Code Issues Projects Releases Packages Wiki Activity

fixup move out the snprintf() from the loop

Browse source
This commit is contained in:
Daniel Stenberg 2025-11-10 11:36:08 +01:00
parent f7fb088b2f
commit 676fe5c269
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

35
lib/progress.c
View file

@ -69,26 +69,25 @@ static char *max6data(curl_off_t bytes, char *max6)
{
/* a signed 64-bit value is 8192 petabytes maximum, shown as
8.0E (exabytes)*/
const char unit[] = { 'k', 'M', 'G', 'T', 'P', 'E', 0 };
int k = 0;
if(bytes < 100000) {
if(bytes < 100000)
curl_msnprintf(max6, 7, "%6" CURL_FORMAT_CURL_OFF_T, bytes);
return max6;
else {
const char unit[] = { 'k', 'M', 'G', 'T', 'P', 'E', 0 };
int k = 0;
curl_off_t nbytes;
do {
nbytes = bytes / 1024;
if(nbytes < 1000)
break;
bytes = nbytes;
k++;
DEBUGASSERT(unit[k]);
} while(unit[k]);
/* xxx.yU */
curl_msnprintf(max6, 7, "%3" CURL_FORMAT_CURL_OFF_T
".%" CURL_FORMAT_CURL_OFF_T "%c", nbytes,
(bytes%1024) / (1024/10), unit[k]);
}
do {
curl_off_t nbytes = bytes / 1024;
if(nbytes < 1000) {
/* xxx.yU */
curl_msnprintf(max6, 7, "%3" CURL_FORMAT_CURL_OFF_T
".%" CURL_FORMAT_CURL_OFF_T "%c", nbytes,
(bytes%1024) / (1024/10), unit[k]);
break;
}
bytes = nbytes;
k++;
DEBUGASSERT(unit[k]);
} while(unit[k]);
return max6;
}
#endif