diff options
| -rw-r--r-- | coreutils/stat.c | 2 | ||||
| -rw-r--r-- | e2fsprogs/blkid/blkid_getsize.c | 2 | ||||
| -rw-r--r-- | libbb/human_readable.c | 6 | ||||
| -rw-r--r-- | networking/interface.c | 32 |
4 files changed, 21 insertions, 21 deletions
diff --git a/coreutils/stat.c b/coreutils/stat.c index c845a2aa7..36e0dadf3 100644 --- a/coreutils/stat.c +++ b/coreutils/stat.c @@ -400,7 +400,7 @@ static int do_statfs(char const *filename, char const *format) #else format = (flags & OPT_TERSE - ? "%s %Lx %lu " + ? "%s %llx %lu " : " File: \"%s\"\n" " ID: %-8Lx Namelen: %-7lu "); printf(format, diff --git a/e2fsprogs/blkid/blkid_getsize.c b/e2fsprogs/blkid/blkid_getsize.c index 58cc7352a..3bc11e3f4 100644 --- a/e2fsprogs/blkid/blkid_getsize.c +++ b/e2fsprogs/blkid/blkid_getsize.c @@ -173,7 +173,7 @@ int main(int argc, char **argv) perror(argv[0]); bytes = blkid_get_dev_size(fd); - printf("Device %s has %Ld 1k blocks.\n", argv[1], bytes >> 10); + printf("Device %s has %lld 1k blocks.\n", argv[1], bytes >> 10); return 0; } diff --git a/libbb/human_readable.c b/libbb/human_readable.c index ad9025c08..cf029c0a2 100644 --- a/libbb/human_readable.c +++ b/libbb/human_readable.c @@ -33,8 +33,8 @@ const char *make_human_readable_str(unsigned long long size, { /* The code will adjust for additional (appended) units. */ static const char zero_and_units[] = { '0', 0, 'k', 'M', 'G', 'T' }; - static const char fmt[] = "%Lu"; - static const char fmt_tenths[] = "%Lu.%d%c"; + static const char fmt[] = "%llu"; + static const char fmt_tenths[] = "%llu.%d%c"; static char str[21]; /* Sufficient for 64 bit unsigned integers. */ @@ -74,7 +74,7 @@ const char *make_human_readable_str(unsigned long long size, if ( frac >= 5 ) { ++val; } - f = "%Lu%*c" /* fmt_no_tenths */ ; + f = "%llu%*c" /* fmt_no_tenths */ ; frac = 1; } #endif diff --git a/networking/interface.c b/networking/interface.c index 0c395272f..e1af2bf19 100644 --- a/networking/interface.c +++ b/networking/interface.c @@ -1038,23 +1038,23 @@ static char *get_name(char *name, char *p) * args. */ /* static const char * const ss_fmt[] = { */ -/* "%Ln%Lu%lu%lu%lu%lu%ln%ln%Ln%Lu%lu%lu%lu%lu%lu", */ -/* "%Lu%Lu%lu%lu%lu%lu%ln%ln%Lu%Lu%lu%lu%lu%lu%lu", */ -/* "%Lu%Lu%lu%lu%lu%lu%lu%lu%Lu%Lu%lu%lu%lu%lu%lu%lu" */ +/* "%lln%llu%lu%lu%lu%lu%ln%ln%lln%llu%lu%lu%lu%lu%lu", */ +/* "%llu%llu%lu%lu%lu%lu%ln%ln%llu%llu%lu%lu%lu%lu%lu", */ +/* "%llu%llu%lu%lu%lu%lu%lu%lu%llu%llu%lu%lu%lu%lu%lu%lu" */ /* }; */ /* Lie about the size of the int pointed to for %n. */ #if INT_MAX == LONG_MAX static const char * const ss_fmt[] = { - "%n%Lu%u%u%u%u%n%n%n%Lu%u%u%u%u%u", - "%Lu%Lu%u%u%u%u%n%n%Lu%Lu%u%u%u%u%u", - "%Lu%Lu%u%u%u%u%u%u%Lu%Lu%u%u%u%u%u%u" + "%n%llu%u%u%u%u%n%n%n%llu%u%u%u%u%u", + "%llu%llu%u%u%u%u%n%n%llu%llu%u%u%u%u%u", + "%llu%llu%u%u%u%u%u%u%llu%llu%u%u%u%u%u%u" }; #else static const char * const ss_fmt[] = { - "%n%Lu%lu%lu%lu%lu%n%n%n%Lu%lu%lu%lu%lu%lu", - "%Lu%Lu%lu%lu%lu%lu%n%n%Lu%Lu%lu%lu%lu%lu%lu", - "%Lu%Lu%lu%lu%lu%lu%lu%lu%Lu%Lu%lu%lu%lu%lu%lu%lu" + "%n%llu%lu%lu%lu%lu%n%n%n%llu%lu%lu%lu%lu%lu", + "%llu%llu%lu%lu%lu%lu%n%n%llu%llu%lu%lu%lu%lu%lu", + "%llu%llu%lu%lu%lu%lu%lu%lu%llu%llu%lu%lu%lu%lu%lu%lu" }; #endif @@ -1748,7 +1748,7 @@ static void print_bytes_scaled(unsigned long long ull, const char *end) #endif } while (i); - printf("X bytes:%Lu (%Lu.%u %sB)%s", ull, int_part, frac_part, ext, end); + printf("X bytes:%llu (%llu.%u %sB)%s", ull, int_part, frac_part, ext, end); } static const char * const ife_print_flags_strs[] = { @@ -1989,23 +1989,23 @@ static void ife_print(struct interface *ptr) */ printf(" "); - printf(_("RX packets:%Lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"), + printf("RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n", ptr->stats.rx_packets, ptr->stats.rx_errors, ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors, ptr->stats.rx_frame_errors); if (can_compress) - printf(_(" compressed:%lu\n"), + printf(" compressed:%lu\n", ptr->stats.rx_compressed); printf(" "); - printf(_("TX packets:%Lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"), + printf("TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n", ptr->stats.tx_packets, ptr->stats.tx_errors, ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors, ptr->stats.tx_carrier_errors); - printf(_(" collisions:%lu "), ptr->stats.collisions); + printf(" collisions:%lu "), ptr->stats.collisions; if (can_compress) - printf(_("compressed:%lu "), ptr->stats.tx_compressed); + printf("compressed:%lu ", ptr->stats.tx_compressed); if (ptr->tx_queue_len != -1) - printf(_("txqueuelen:%d "), ptr->tx_queue_len); + printf("txqueuelen:%d ", ptr->tx_queue_len); printf("\n R"); print_bytes_scaled(ptr->stats.rx_bytes, " T"); print_bytes_scaled(ptr->stats.tx_bytes, "\n"); |