47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
From 20a78e06a69bd9b6b4e15468201d5d3aa9c395db Mon Sep 17 00:00:00 2001
|
|
From: Zach van Rijn <me@zv.io>
|
|
Date: Wed, 21 Jun 2023 16:50:30 +0000
|
|
Subject: [PATCH] Revert "sscanf pattern is %Lu not %llu for long long unsigned
|
|
byte counters."
|
|
|
|
This reverts commit 811cf0aaf40a0e7f426f8ffaea7c3ca4b8bebdfc.
|
|
|
|
See also:
|
|
* https://sourceforge.net/p/net-tools/mailman/message/37860727/
|
|
* https://git.adelielinux.org/adelie/packages/-/issues/600
|
|
---
|
|
lib/interface.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/lib/interface.c b/lib/interface.c
|
|
index ef28dec..71d4163 100644
|
|
--- a/lib/interface.c
|
|
+++ b/lib/interface.c
|
|
@@ -254,7 +254,7 @@ static int get_dev_fields(const char *bp, struct interface *ife)
|
|
switch (procnetdev_vsn) {
|
|
case 3:
|
|
sscanf(bp,
|
|
- "%Lu %Lu %lu %lu %lu %lu %lu %lu %Lu %Lu %lu %lu %lu %lu %lu %lu",
|
|
+ "%llu %llu %lu %lu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu %lu",
|
|
&ife->stats.rx_bytes,
|
|
&ife->stats.rx_packets,
|
|
&ife->stats.rx_errors,
|
|
@@ -274,7 +274,7 @@ static int get_dev_fields(const char *bp, struct interface *ife)
|
|
&ife->stats.tx_compressed);
|
|
break;
|
|
case 2:
|
|
- sscanf(bp, "%Lu %Lu %lu %lu %lu %lu %Lu %Lu %lu %lu %lu %lu %lu",
|
|
+ sscanf(bp, "%llu %llu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu",
|
|
&ife->stats.rx_bytes,
|
|
&ife->stats.rx_packets,
|
|
&ife->stats.rx_errors,
|
|
@@ -292,7 +292,7 @@ static int get_dev_fields(const char *bp, struct interface *ife)
|
|
ife->stats.rx_multicast = 0;
|
|
break;
|
|
case 1:
|
|
- sscanf(bp, "%Lu %lu %lu %lu %lu %Lu %lu %lu %lu %lu %lu",
|
|
+ sscanf(bp, "%llu %lu %lu %lu %lu %llu %lu %lu %lu %lu %lu",
|
|
&ife->stats.rx_packets,
|
|
&ife->stats.rx_errors,
|
|
&ife->stats.rx_dropped,
|