projects / ipfire-3.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 236898d6 MT |
1 | --- net-tools-1.60/lib/interface.c.siunits 2004-03-14 12:11:22.000000000 -0600 |
| 2 | +++ net-tools-1.60/lib/interface.c 2004-03-14 12:27:31.990679464 -0600 | |
| 3 | @@ -262,7 +262,7 @@ | |
| 4 | &ife->stats.tx_compressed); | |
| 5 | break; | |
| 6 | case 2: | |
| 7 | - sscanf(bp, "%llu %llu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu", | |
| 8 | + sscanf(bp, "%Lu %llu %lu %lu %lu %lu %Lu %Lu %lu %lu %lu %lu %lu", | |
| 9 | &ife->stats.rx_bytes, | |
| 10 | &ife->stats.rx_packets, | |
| 11 | &ife->stats.rx_errors, | |
| 12 | @@ -280,7 +280,7 @@ | |
| 13 | ife->stats.rx_multicast = 0; | |
| 14 | break; | |
| 15 | case 1: | |
| 16 | - sscanf(bp, "%llu %lu %lu %lu %lu %llu %lu %lu %lu %lu %lu", | |
| 17 | + sscanf(bp, "%Lu %lu %lu %lu %lu %Lu %lu %lu %lu %lu %lu", | |
| 18 | &ife->stats.rx_packets, | |
| 19 | &ife->stats.rx_errors, | |
| 20 | &ife->stats.rx_dropped, | |
| 21 | @@ -675,8 +675,8 @@ | |
| 22 | int hf; | |
| 23 | int can_compress = 0; | |
| 24 | unsigned long long rx, tx, short_rx, short_tx; | |
| 25 | - char Rext[5]="b"; | |
| 26 | - char Text[5]="b"; | |
| 27 | + const char *Rext = "b"; | |
| 28 | + const char *Text = "b"; | |
| 29 | ||
| 30 | #if HAVE_AFIPX | |
| 31 | static struct aftype *ipxtype = NULL; | |
| 32 | @@ -882,10 +882,44 @@ | |
| 33 | tx = ptr->stats.tx_bytes; | |
| 34 | short_rx = rx * 10; | |
| 35 | short_tx = tx * 10; | |
| 36 | - if (rx > 1048576) { short_rx /= 1048576; strcpy(Rext, "Mb"); } | |
| 37 | - else if (rx > 1024) { short_rx /= 1024; strcpy(Rext, "Kb"); } | |
| 38 | - if (tx > 1048576) { short_tx /= 1048576; strcpy(Text, "Mb"); } | |
| 39 | - else if (tx > 1024) { short_tx /= 1024; strcpy(Text, "Kb"); } | |
| 40 | + if (rx > 1152921504606846976ull) { | |
| 41 | + short_rx /= 1152921504606846976ull; | |
| 42 | + Rext = "EiB"; | |
| 43 | + } else if (rx > 1125899906842624ull) { | |
| 44 | + short_rx /= 1125899906842624ull; | |
| 45 | + Rext = "PiB"; | |
| 46 | + } else if (rx > 1099511627776ull) { | |
| 47 | + short_rx /= 1099511627776ull; | |
| 48 | + Rext = "TiB"; | |
| 49 | + } else if (rx > 1073741824ull) { | |
| 50 | + short_rx /= 1073741824ull; | |
| 51 | + Rext = "GiB"; | |
| 52 | + } else if (rx > 1048576) { | |
| 53 | + short_rx /= 1048576; | |
| 54 | + Rext = "MiB"; | |
| 55 | + } else if (rx > 1024) { | |
| 56 | + short_rx /= 1024; | |
| 57 | + Rext = "KiB"; | |
| 58 | + } | |
| 59 | + if (tx > 1152921504606846976ull) { | |
| 60 | + short_tx /= 1152921504606846976ull; | |
| 61 | + Text = "EiB"; | |
| 62 | + } else if (tx > 1125899906842624ull) { | |
| 63 | + short_tx /= 1125899906842624ull; | |
| 64 | + Text = "PiB"; | |
| 65 | + } else if (tx > 1099511627776ull) { | |
| 66 | + short_tx /= 1099511627776ull; | |
| 67 | + Text = "TiB"; | |
| 68 | + } else if (tx > 1073741824ull) { | |
| 69 | + short_tx /= 1073741824ull; | |
| 70 | + Text = "GiB"; | |
| 71 | + } else if (tx > 1048576) { | |
| 72 | + short_tx /= 1048576; | |
| 73 | + Text = "MiB"; | |
| 74 | + } else if (tx > 1024) { | |
| 75 | + short_tx /= 1024; | |
| 76 | + Text = "KiB"; | |
| 77 | + } | |
| 78 | ||
| 79 | printf(" "); | |
| 80 | printf(_("TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"), |