97e242658
Eric Andersen
2003-08-22
Subject
"staywithu" writes:
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/libbb.h+2 -1
| @@ -267,7 +267,8 @@ enum { | |
| MEGABYTE = (KILOBYTE*1024), | |
| GIGABYTE = (MEGABYTE*1024) | |
| }; | |
| - | const char *make_human_readable_str(unsigned long size, unsigned long block_size, unsigned long display_unit); |
| + | const char *make_human_readable_str(unsigned long long size, |
| + | unsigned long block_size, unsigned long display_unit); |
| int bb_ask_confirmation(void); | |
| int klogctl(int type, char * b, int len); | |
libbb/human_readable.c+3 -4
| @@ -28,9 +28,8 @@ | |
| #include <stdio.h> | |
| #include "libbb.h" | |
| - | const char *make_human_readable_str(unsigned long size, |
| - | unsigned long block_size, |
| - | unsigned long display_unit) |
| + | const char *make_human_readable_str(unsigned long long size, |
| + | unsigned long block_size, unsigned long display_unit) |
| { | |
| /* The code will adjust for additional (appended) units. */ | |
| static const char zero_and_units[] = { '0', 0, 'k', 'M', 'G', 'T' }; | |
| @@ -48,7 +47,7 @@ const char *make_human_readable_str(unsigned long size, | |
| f = fmt; | |
| frac = 0; | |
| - | val = ((unsigned long long) size) * block_size; |
| + | val = size * block_size; |
| if (val == 0) { | |
| return u; | |
| } | |