matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ipaddress: Unify print_link_stats() and print_link_stats64() 

To show real differences between these two variants adjust whitespace
intendation and use print_uint() instead of print_int() as all members
in both @struct rtnl_link_stats and @struct rtnl_link_stats64 are
unsigned.

Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
Serhey Popovych 2018-02-07 08:30:51 +02:00 committed by David Ahern
parent 306d616093
commit fb7b816827
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ip/ipaddress.c
View File

@ -609,8 +609,7 @@ static void print_link_stats64(FILE *fp, const struct rtnl_link_stats64 *s,
print_uint(PRINT_JSON, "multicast", NULL, s->multicast); print_uint(PRINT_JSON, "multicast", NULL, s->multicast);
if (s->rx_compressed) if (s->rx_compressed)
print_uint(PRINT_JSON, print_uint(PRINT_JSON,
"compressed", "compressed", NULL, s->rx_compressed);
NULL, s->rx_compressed);
/* RX error stats */ /* RX error stats */
if (show_stats > 1) { if (show_stats > 1) {
@ -647,8 +646,7 @@ static void print_link_stats64(FILE *fp, const struct rtnl_link_stats64 *s,
print_uint(PRINT_JSON, "collisions", NULL, s->collisions); print_uint(PRINT_JSON, "collisions", NULL, s->collisions);
if (s->tx_compressed) if (s->tx_compressed)
print_uint(PRINT_JSON, print_uint(PRINT_JSON,
"compressed", "compressed", NULL, s->tx_compressed);
NULL, s->tx_compressed);
/* TX error stats */ /* TX error stats */
if (show_stats > 1) { if (show_stats > 1) {
@ -668,9 +666,9 @@ static void print_link_stats64(FILE *fp, const struct rtnl_link_stats64 *s,
print_uint(PRINT_JSON, "carrier_changes", NULL, print_uint(PRINT_JSON, "carrier_changes", NULL,
rta_getattr_u32(carrier_changes)); rta_getattr_u32(carrier_changes));
} }
close_json_object();
close_json_object();
close_json_object();
close_json_object();
} else { } else {
/* RX stats */ /* RX stats */
fprintf(fp, " RX: bytes packets errors dropped overrun mcast %s%s", fprintf(fp, " RX: bytes packets errors dropped overrun mcast %s%s",
@ -691,7 +689,6 @@ static void print_link_stats64(FILE *fp, const struct rtnl_link_stats64 *s,
fprintf(fp, "%s", _SL_); fprintf(fp, "%s", _SL_);
fprintf(fp, " RX errors: length crc frame fifo missed%s%s", fprintf(fp, " RX errors: length crc frame fifo missed%s%s",
s->rx_nohandler ? " nohandler" : "", _SL_); s->rx_nohandler ? " nohandler" : "", _SL_);
fprintf(fp, " "); fprintf(fp, " ");
print_num(fp, 8, s->rx_length_errors); print_num(fp, 8, s->rx_length_errors);
print_num(fp, 7, s->rx_crc_errors); print_num(fp, 7, s->rx_crc_errors);
@ -700,7 +697,6 @@ static void print_link_stats64(FILE *fp, const struct rtnl_link_stats64 *s,
print_num(fp, 7, s->rx_missed_errors); print_num(fp, 7, s->rx_missed_errors);
if (s->rx_nohandler) if (s->rx_nohandler)
print_num(fp, 7, s->rx_nohandler); print_num(fp, 7, s->rx_nohandler);
} }
fprintf(fp, "%s", _SL_); fprintf(fp, "%s", _SL_);
@ -753,9 +749,8 @@ static void print_link_stats32(FILE *fp, const struct rtnl_link_stats *s,
print_uint(PRINT_JSON, "over_errors", NULL, s->rx_over_errors); print_uint(PRINT_JSON, "over_errors", NULL, s->rx_over_errors);
print_uint(PRINT_JSON, "multicast", NULL, s->multicast); print_uint(PRINT_JSON, "multicast", NULL, s->multicast);
if (s->rx_compressed) if (s->rx_compressed)
print_int(PRINT_JSON, print_uint(PRINT_JSON,
"compressed", "compressed", NULL, s->rx_compressed);
NULL, s->rx_compressed);
/* RX error stats */ /* RX error stats */
if (show_stats > 1) { if (show_stats > 1) {
@ -775,9 +770,8 @@ static void print_link_stats32(FILE *fp, const struct rtnl_link_stats *s,
"missed_errors", "missed_errors",
NULL, s->rx_missed_errors); NULL, s->rx_missed_errors);
if (s->rx_nohandler) if (s->rx_nohandler)
print_int(PRINT_JSON, print_uint(PRINT_JSON,
"nohandler", "nohandler", NULL, s->rx_nohandler);
NULL, s->rx_nohandler);
} }
close_json_object(); close_json_object();
@ -792,9 +786,8 @@ static void print_link_stats32(FILE *fp, const struct rtnl_link_stats *s,
NULL, s->tx_carrier_errors); NULL, s->tx_carrier_errors);
print_uint(PRINT_JSON, "collisions", NULL, s->collisions); print_uint(PRINT_JSON, "collisions", NULL, s->collisions);
if (s->tx_compressed) if (s->tx_compressed)
print_int(PRINT_JSON, print_uint(PRINT_JSON,
"compressed", "compressed", NULL, s->tx_compressed);
NULL, s->tx_compressed);
/* TX error stats */ /* TX error stats */
if (show_stats > 1) { if (show_stats > 1) {
@ -811,9 +804,7 @@ static void print_link_stats32(FILE *fp, const struct rtnl_link_stats *s,
"heartbeat_errors", "heartbeat_errors",
NULL, s->tx_heartbeat_errors); NULL, s->tx_heartbeat_errors);
if (carrier_changes) if (carrier_changes)
print_uint(PRINT_JSON, print_uint(PRINT_JSON, "carrier_changes", NULL,
"carrier_changes",
NULL,
rta_getattr_u32(carrier_changes)); rta_getattr_u32(carrier_changes));
} }
@ -824,7 +815,6 @@ static void print_link_stats32(FILE *fp, const struct rtnl_link_stats *s,
fprintf(fp, " RX: bytes packets errors dropped overrun mcast %s%s", fprintf(fp, " RX: bytes packets errors dropped overrun mcast %s%s",
s->rx_compressed ? "compressed" : "", _SL_); s->rx_compressed ? "compressed" : "", _SL_);
fprintf(fp, " "); fprintf(fp, " ");
print_num(fp, 10, s->rx_bytes); print_num(fp, 10, s->rx_bytes);
print_num(fp, 8, s->rx_packets); print_num(fp, 8, s->rx_packets);