diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-03-29 22:34:47 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-03-29 22:34:47 +0000 |
| commit | d409c3a2f787dd2276d242d70e03b25e33436cea (patch) | |
| tree | adec7d9142ff4899bb9d0319bbbd5822359fbc0b /networking | |
| parent | abaef6565e03b03fb750c7935737fd0309395729 (diff) | |
| download | busybox-d409c3a2f787dd2276d242d70e03b25e33436cea.tar.gz | |
- Rich Felker writes: fix invalid printf format strings
http://busybox.net/lists/busybox/2006-March/019568.html
text data bss dec hex filename
900619 10316 1038724 1949659 1dbfdb busybox.oorig
900603 10316 1038724 1949643 1dbfcb busybox
Diffstat (limited to 'networking')
| -rw-r--r-- | networking/interface.c | 32 |
1 files changed, 16 insertions, 16 deletions
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"); |