Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

file properties: display correctly file/folder sizes > 2GB

Browse source 
Use unsigned type for file sizes (some directory/file structures should be changed too)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31449 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2011-12-26 23:39:43 +00:00
parent 0b885f2628
commit 565b869438
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/plugins/properties.c
View file

@ -40,7 +40,7 @@ char str_duration[32];
int num_properties; int num_properties;
static const char human_size_prefix[4] = { '\0', 'K', 'M', 'G' }; static const char human_size_prefix[4] = { '\0', 'K', 'M', 'G' };
static unsigned human_size_log(long long size) static unsigned human_size_log(unsigned long long size)
{ {
const size_t n = sizeof(human_size_prefix)/sizeof(human_size_prefix[0]); const size_t n = sizeof(human_size_prefix)/sizeof(human_size_prefix[0]);
@ -76,9 +76,9 @@ static bool file_properties(char* selected_file)
rb->snprintf(str_dirname, sizeof str_dirname, "Path: %s", tstr); rb->snprintf(str_dirname, sizeof str_dirname, "Path: %s", tstr);
rb->snprintf(str_filename, sizeof str_filename, "Name: %s", rb->snprintf(str_filename, sizeof str_filename, "Name: %s",
selected_file+dirlen); selected_file+dirlen);
log = human_size_log(info.size); log = human_size_log((unsigned long)info.size);
rb->snprintf(str_size, sizeof str_size, "Size: %ld %cB", rb->snprintf(str_size, sizeof str_size, "Size: %lu %cB",
info.size >> (log*10), human_size_prefix[log]); ((unsigned long)info.size) >> (log*10), human_size_prefix[log]);
rb->snprintf(str_date, sizeof str_date, "Date: %04d/%02d/%02d", rb->snprintf(str_date, sizeof str_date, "Date: %04d/%02d/%02d",
((info.wrtdate >> 9 ) & 0x7F) + 1980, /* year */ ((info.wrtdate >> 9 ) & 0x7F) + 1980, /* year */
((info.wrtdate >> 5 ) & 0x0F), /* month */ ((info.wrtdate >> 5 ) & 0x0F), /* month */
@ -138,7 +138,7 @@ typedef struct {
int len; int len;
unsigned int dc; unsigned int dc;
unsigned int fc; unsigned int fc;
long long bc; unsigned long long bc;
} DPS; } DPS;
static bool _dir_properties(DPS* dps) static bool _dir_properties(DPS* dps)
@ -184,7 +184,7 @@ static bool _dir_properties(DPS* dps)
rb->lcd_putsf(0,3,"Directories: %d", dps->dc); rb->lcd_putsf(0,3,"Directories: %d", dps->dc);
rb->lcd_putsf(0,4,"Files: %d", dps->fc); rb->lcd_putsf(0,4,"Files: %d", dps->fc);
log = human_size_log(dps->bc); log = human_size_log(dps->bc);
rb->lcd_putsf(0,5,"Size: %ld %cB", (long) (dps->bc >> (10*log)), rb->lcd_putsf(0,5,"Size: %lu %cB", (unsigned long)(dps->bc >> (10*log)),
human_size_prefix[log]); human_size_prefix[log]);
rb->lcd_update(); rb->lcd_update();
} }