len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix possible truncation misc.c->output_dyn_value + use Kibytes

Browse source 
output_dyn_value now requires the count for number of units

Binary scale now shows Kibibytes instead of kilobytes (g#1742)

Fixes output for negative values as well

Change-Id: I8aa896860e97d2453fa35069e2dfe1caac60109f
This commit is contained in:
William Wilgus 2018-12-09 12:09:40 -06:00
parent 74701a16a5
commit 62a5ed49cc
8 changed files with 106 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/debug_menu.c
View file

@ -1326,11 +1326,11 @@ static int disk_callback(int btn, struct gui_synclist *lists)
simplelist_addline( simplelist_addline(
"Blocks: 0x%08lx", card->numblocks); "Blocks: 0x%08lx", card->numblocks);
output_dyn_value(pbuf, sizeof pbuf, card->speed / 1000, output_dyn_value(pbuf, sizeof pbuf, card->speed / 1000,
kbit_units, false); kbit_units, 3, false);
simplelist_addline( simplelist_addline(
"Speed: %s", pbuf); "Speed: %s", pbuf);
output_dyn_value(pbuf, sizeof pbuf, card->taac, output_dyn_value(pbuf, sizeof pbuf, card->taac,
nsec_units, false); nsec_units, 3, false);
simplelist_addline( simplelist_addline(
"Taac: %s", pbuf); "Taac: %s", pbuf);
simplelist_addline( simplelist_addline(

66
apps/lang/english.lang
View file

@ -8441,44 +8441,44 @@
</phrase> </phrase>
<phrase> <phrase>
id: LANG_KILOBYTE id: LANG_KILOBYTE
desc: a unit postfix, also voiced desc: deprecated
user: core user: core
<source> <source>
*: "KB" *: ""
</source> </source>
<dest> <dest>
*: "KB" *: ""
</dest> </dest>
<voice> <voice>
*: "kilobyte" *: ""
</voice> </voice>
</phrase> </phrase>
<phrase> <phrase>
id: LANG_MEGABYTE id: LANG_MEGABYTE
desc: a unit postfix, also voiced desc: deprecated
user: core user: core
<source> <source>
*: "MB" *: ""
</source> </source>
<dest> <dest>
*: "MB" *: ""
</dest> </dest>
<voice> <voice>
*: "megabyte" *: ""
</voice> </voice>
</phrase> </phrase>
<phrase> <phrase>
id: LANG_GIGABYTE id: LANG_GIGABYTE
desc: a unit postfix, also voiced desc: deprecated
user: core user: core
<source> <source>
*: "GB" *: ""
</source> </source>
<dest> <dest>
*: "GB" *: ""
</dest> </dest>
<voice> <voice>
*: "gigabyte" *: ""
</voice> </voice>
</phrase> </phrase>
<phrase> <phrase>
@ -13647,3 +13647,45 @@
*: "Disable Touch" *: "Disable Touch"
</voice> </voice>
</phrase> </phrase>
<phrase>
id: LANG_KIBIBYTE
desc: a unit postfix, also voiced
user: core
<source>
*: "KiB"
</source>
<dest>
*: "KiB"
</dest>
<voice>
*: "kibibyte"
</voice>
</phrase>
<phrase>
id: LANG_MEBIBYTE
desc: a unit postfix, also voiced
user: core
<source>
*: "MiB"
</source>
<dest>
*: "MiB"
</dest>
<voice>
*: "mebibyte"
</voice>
</phrase>
<phrase>
id: LANG_GIBIBYTE
desc: a unit postfix, also voiced
user: core
<source>
*: "GiB"
</source>
<dest>
*: "GiB"
</dest>
<voice>
*: "gibibyte"
</voice>
</phrase>

32
apps/menus/main_menu.c
View file

@ -181,8 +181,8 @@ static const char* info_getname(int selected_item, void *data,
case INFO_BUFFER: /* buffer */ case INFO_BUFFER: /* buffer */
{ {
long kib = audio_buffer_size() / 1024; /* to KiB */ long kib = audio_buffer_size() >> 10; /* to KiB */
output_dyn_value(s1, sizeof(s1), kib, kbyte_units, true); output_dyn_value(s1, sizeof(s1), kib, kibyte_units, 3, true);
snprintf(buffer, buffer_len, "%s %s", str(LANG_BUFFER_STAT), s1); snprintf(buffer, buffer_len, "%s %s", str(LANG_BUFFER_STAT), s1);
} }
break; break;
@ -217,12 +217,12 @@ static const char* info_getname(int selected_item, void *data,
break; break;
case INFO_DISK1: /* disk usage 1 */ case INFO_DISK1: /* disk usage 1 */
#ifdef HAVE_MULTIVOLUME #ifdef HAVE_MULTIVOLUME
output_dyn_value(s1, sizeof s1, info->free, kbyte_units, true); output_dyn_value(s1, sizeof s1, info->free, kibyte_units, 3, true);
output_dyn_value(s2, sizeof s2, info->size, kbyte_units, true); output_dyn_value(s2, sizeof s2, info->size, kibyte_units, 3, true);
snprintf(buffer, buffer_len, "%s %s/%s", str(LANG_DISK_NAME_INTERNAL), snprintf(buffer, buffer_len, "%s %s/%s", str(LANG_DISK_NAME_INTERNAL),
s1, s2); s1, s2);
#else #else
output_dyn_value(s1, sizeof s1, info->free, kbyte_units, true); output_dyn_value(s1, sizeof s1, info->free, kibyte_units, 3, true);
snprintf(buffer, buffer_len, SIZE_FMT, str(LANG_DISK_FREE_INFO), s1); snprintf(buffer, buffer_len, SIZE_FMT, str(LANG_DISK_FREE_INFO), s1);
#endif #endif
break; break;
@ -230,8 +230,8 @@ static const char* info_getname(int selected_item, void *data,
#ifdef HAVE_MULTIVOLUME #ifdef HAVE_MULTIVOLUME
if (info->size2) if (info->size2)
{ {
output_dyn_value(s1, sizeof s1, info->free2, kbyte_units, true); output_dyn_value(s1, sizeof s1, info->free2, kibyte_units, 3, true);
output_dyn_value(s2, sizeof s2, info->size2, kbyte_units, true); output_dyn_value(s2, sizeof s2, info->size2, kibyte_units, 3, true);
snprintf(buffer, buffer_len, "%s %s/%s", str(LANG_DISK_NAME_MMC), snprintf(buffer, buffer_len, "%s %s/%s", str(LANG_DISK_NAME_MMC),
s1, s2); s1, s2);
} }
@ -241,7 +241,7 @@ static const char* info_getname(int selected_item, void *data,
str(LANG_NOT_PRESENT)); str(LANG_NOT_PRESENT));
} }
#else #else
output_dyn_value(s1, sizeof s1, info->size, kbyte_units, true); output_dyn_value(s1, sizeof s1, info->size, kibyte_units, 3, true);
snprintf(buffer, buffer_len, SIZE_FMT, str(LANG_DISK_SIZE_INFO), s1); snprintf(buffer, buffer_len, SIZE_FMT, str(LANG_DISK_SIZE_INFO), s1);
#endif #endif
break; break;
@ -263,8 +263,8 @@ static int info_speak_item(int selected_item, void * data)
case INFO_BUFFER: /* buffer */ case INFO_BUFFER: /* buffer */
{ {
talk_id(LANG_BUFFER_STAT, false); talk_id(LANG_BUFFER_STAT, false);
long kib = audio_buffer_size() / 1024; /* to KiB */ long kib = audio_buffer_size() >> 10; /* to KiB */
output_dyn_value(NULL, 0, kib, kbyte_units, true); output_dyn_value(NULL, 0, kib, kibyte_units, 3, true);
break; break;
} }
case INFO_BATTERY: /* battery */ case INFO_BATTERY: /* battery */
@ -303,12 +303,12 @@ static int info_speak_item(int selected_item, void * data)
case INFO_DISK1: /* disk 1 */ case INFO_DISK1: /* disk 1 */
#ifdef HAVE_MULTIVOLUME #ifdef HAVE_MULTIVOLUME
talk_ids(false, LANG_DISK_NAME_INTERNAL, LANG_DISK_FREE_INFO); talk_ids(false, LANG_DISK_NAME_INTERNAL, LANG_DISK_FREE_INFO);
output_dyn_value(NULL, 0, info->free, kbyte_units, true); output_dyn_value(NULL, 0, info->free, kibyte_units, 3, true);
talk_id(LANG_DISK_SIZE_INFO, true); talk_id(LANG_DISK_SIZE_INFO, true);
output_dyn_value(NULL, 0, info->size, kbyte_units, true); output_dyn_value(NULL, 0, info->size, kibyte_units, 3, true);
#else #else
talk_id(LANG_DISK_FREE_INFO, false); talk_id(LANG_DISK_FREE_INFO, false);
output_dyn_value(NULL, 0, info->free, kbyte_units, true); output_dyn_value(NULL, 0, info->free, kibyte_units, 3, true);
#endif #endif
break; break;
case INFO_DISK2: /* disk 2 */ case INFO_DISK2: /* disk 2 */
@ -317,14 +317,14 @@ static int info_speak_item(int selected_item, void * data)
if (info->size2) if (info->size2)
{ {
talk_id(LANG_DISK_FREE_INFO, true); talk_id(LANG_DISK_FREE_INFO, true);
output_dyn_value(NULL, 0, info->free2, kbyte_units, true); output_dyn_value(NULL, 0, info->free2, kibyte_units, 3, true);
talk_id(LANG_DISK_SIZE_INFO, true); talk_id(LANG_DISK_SIZE_INFO, true);
output_dyn_value(NULL, 0, info->size2, kbyte_units, true); output_dyn_value(NULL, 0, info->size2, kibyte_units, 3, true);
} }
else talk_id(LANG_NOT_PRESENT, true); else talk_id(LANG_NOT_PRESENT, true);
#else #else
talk_id(LANG_DISK_SIZE_INFO, false); talk_id(LANG_DISK_SIZE_INFO, false);
output_dyn_value(NULL, 0, info->size, kbyte_units, true); output_dyn_value(NULL, 0, info->size, kibyte_units, 3, true);
#endif #endif
break; break;

42
apps/misc.c
View file

@ -110,41 +110,47 @@
const unsigned char * const byte_units[] = const unsigned char * const byte_units[] =
{ {
ID2P(LANG_BYTE), ID2P(LANG_BYTE),
ID2P(LANG_KILOBYTE), ID2P(LANG_KIBIBYTE),
ID2P(LANG_MEGABYTE), ID2P(LANG_MEBIBYTE),
ID2P(LANG_GIGABYTE) ID2P(LANG_GIBIBYTE)
}; };
const unsigned char * const * const kbyte_units = &byte_units[1]; const unsigned char * const * const kibyte_units = &byte_units[1];
/* Format a large-range value for output, using the appropriate unit so that /* Format a large-range value for output, using the appropriate unit so that
* the displayed value is in the range 1 <= display < 1000 (1024 for "binary" * the displayed value is in the range 1 <= display < 1000 (1024 for "binary"
* units) if possible, and 3 significant digits are shown. If a buffer is * units) if possible, and 3 significant digits are shown. If a buffer is
* given, the result is snprintf()'d into that buffer, otherwise the result is * given, the result is snprintf()'d into that buffer, otherwise the result is
* voiced.*/ * voiced.*/
char *output_dyn_value(char *buf, int buf_size, int value, char *output_dyn_value(char *buf,
const unsigned char * const *units, bool bin_scale) int buf_size,
int value,
const unsigned char * const *units,
unsigned int unit_count,
bool binary_scale)
{ {
int scale = bin_scale ? 1024 : 1000; unsigned int scale = binary_scale ? 1024 : 1000;
int fraction = 0; unsigned int fraction = 0;
int unit_no = 0; unsigned int unit_no = 0;
unsigned int value_abs = (value < 0) ? -value : value;
char tbuf[5]; char tbuf[5];
while (value >= scale) while (value_abs >= scale && unit_no < (unit_count - 1))
{ {
fraction = value % scale; fraction = value_abs % scale;
value /= scale; value_abs /= scale;
unit_no++; unit_no++;
} }
if (bin_scale)
fraction = fraction * 1000 / 1024; value = (value < 0) ? -value_abs : value_abs; /* preserve sign */
fraction = (fraction * 1000 / scale) / 10;
if (value >= 100 || !unit_no) if (value_abs >= 100 || fraction >= 100 || !unit_no)
tbuf[0] = '\0'; tbuf[0] = '\0';
else if (value >= 10) else if (value_abs >= 10)
snprintf(tbuf, sizeof(tbuf), "%01d", fraction / 100); snprintf(tbuf, sizeof(tbuf), "%01u", fraction / 10);
else else
snprintf(tbuf, sizeof(tbuf), "%02d", fraction / 10); snprintf(tbuf, sizeof(tbuf), "%02u", fraction);
if (buf) if (buf)
{ {

10
apps/misc.h
View file

@ -27,15 +27,19 @@
#include "screen_access.h" #include "screen_access.h"
extern const unsigned char * const byte_units[]; extern const unsigned char * const byte_units[];
extern const unsigned char * const * const kbyte_units; extern const unsigned char * const * const kibyte_units;
/* Format a large-range value for output, using the appropriate unit so that /* Format a large-range value for output, using the appropriate unit so that
* the displayed value is in the range 1 <= display < 1000 (1024 for "binary" * the displayed value is in the range 1 <= display < 1000 (1024 for "binary"
* units) if possible, and 3 significant digits are shown. If a buffer is * units) if possible, and 3 significant digits are shown. If a buffer is
* given, the result is snprintf()'d into that buffer, otherwise the result is * given, the result is snprintf()'d into that buffer, otherwise the result is
* voiced.*/ * voiced.*/
char *output_dyn_value(char *buf, int buf_size, int value, char *output_dyn_value(char *buf,
const unsigned char * const *units, bool bin_scale); int buf_size,
int value,
const unsigned char * const *units,
unsigned int unit_count,
bool binary_scale);
/* Format time into buf. /* Format time into buf.
* *

2
apps/recorder/recording.c
View file

@ -1756,7 +1756,7 @@ bool recording_screen(bool no_source)
{ {
output_dyn_value(buf2, sizeof buf2, output_dyn_value(buf2, sizeof buf2,
num_recorded_bytes, num_recorded_bytes,
byte_units, true); byte_units, 4, true);
snprintf(buf, sizeof(buf), "%s %s", snprintf(buf, sizeof(buf), "%s %s",
str(LANG_RECORDING_SIZE), buf2); str(LANG_RECORDING_SIZE), buf2);
} }

2
apps/screens.c
View file

@ -747,7 +747,7 @@ static const char* id3_get_info(int selected_item, void* data,
val=id3->composer; val=id3->composer;
break; break;
case LANG_FILESIZE: /* not LANG_ID3_FILESIZE because the string is shared */ case LANG_FILESIZE: /* not LANG_ID3_FILESIZE because the string is shared */
output_dyn_value(buffer, buffer_len, id3->filesize, byte_units, true); output_dyn_value(buffer, buffer_len, id3->filesize, byte_units, 4, true);
val=buffer; val=buffer;
break; break;
} }

2
apps/talk.c
View file

@ -1330,7 +1330,7 @@ int talk_value_decimal(long n, int unit, int decimals, bool enqueue)
[UNIT_HERTZ] [UNIT_HERTZ]
= VOICE_HERTZ, = VOICE_HERTZ,
[UNIT_MB] [UNIT_MB]
= LANG_MEGABYTE, = LANG_MEBIBYTE,
[UNIT_KBIT] [UNIT_KBIT]
= VOICE_KBIT_PER_SEC, = VOICE_KBIT_PER_SEC,
[UNIT_PM_TICK] [UNIT_PM_TICK]