sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #461 from marckleinebudde/canbusload 

canbusload: coding style cleanups + use less screen estate in redraw mode
pull/462/head
Marc Kleine-Budde 2023-09-27 12:46:15 +02:00 committed by GitHub
parent 3490282fc7 84919edbaa
commit 1be7e0e51d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
canbusload.c
View File

@ -181,7 +181,6 @@ void printstats(int signo)
} }
for (i = 0; i < currmax; i++) { for (i = 0; i < currmax; i++) {
if (color) { if (color) {
if (i % 2) if (i % 2)
printf("%s", FGRED); printf("%s", FGRED);
@ -190,8 +189,8 @@ void printstats(int signo)
} }
if (stat[i].bitrate) if (stat[i].bitrate)
percent = ((stat[i].recv_bits_total-stat[i].recv_bits_dbitrate) * 100) / stat[i].bitrate percent = ((stat[i].recv_bits_total - stat[i].recv_bits_dbitrate) * 100) / stat[i].bitrate +
+ (stat[i].recv_bits_dbitrate * 100) / stat[i].dbitrate; (stat[i].recv_bits_dbitrate * 100) / stat[i].dbitrate;
else else
percent = 0; percent = 0;
@ -224,6 +223,7 @@ void printstats(int signo)
if (color) if (color)
printf("%s", ATTRESET); printf("%s", ATTRESET);
if (!redraw || (i < currmax - 1))
printf("\n"); printf("\n");
stat[i].recv_frames = 0; stat[i].recv_frames = 0;
@ -232,7 +232,9 @@ void printstats(int signo)
stat[i].recv_bits_payload = 0; stat[i].recv_bits_payload = 0;
} }
if (!redraw)
printf("\n"); printf("\n");
fflush(stdout); fflush(stdout);
alarm(1); alarm(1);
@ -305,7 +307,6 @@ int main(int argc, char **argv)
} }
for (i = 0; i < currmax; i++) { for (i = 0; i < currmax; i++) {
ptr = argv[optind + i]; ptr = argv[optind + i];
nbytes = strlen(ptr); nbytes = strlen(ptr);
@ -387,7 +388,6 @@ int main(int argc, char **argv)
printf("%s", CLR_SCREEN); printf("%s", CLR_SCREEN);
while (running) { while (running) {
FD_ZERO(&rdfs); FD_ZERO(&rdfs);
for (i = 0; i < currmax; i++) for (i = 0; i < currmax; i++)
FD_SET(s[i], &rdfs); FD_SET(s[i], &rdfs);
@ -403,7 +403,6 @@ int main(int argc, char **argv)
for (i = 0; i < currmax; i++) { /* check all CAN RAW sockets */ for (i = 0; i < currmax; i++) { /* check all CAN RAW sockets */
if (FD_ISSET(s[i], &rdfs)) { if (FD_ISSET(s[i], &rdfs)) {
nbytes = read(s[i], &frame, sizeof(frame)); nbytes = read(s[i], &frame, sizeof(frame));
if (nbytes < 0) { if (nbytes < 0) {