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

candump: remove trailing whitespace 

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
pull/270/head
Marc Kleine-Budde 2020-12-04 16:16:02 +01:00
parent aa6411075f
commit 15f3a2e385
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
candump.c
View File

@ -109,7 +109,7 @@ static struct if_info sock_info[MAXSOCK];
static char devname[MAXIFNAMES][IFNAMSIZ+1]; static char devname[MAXIFNAMES][IFNAMSIZ+1];
static int dindex[MAXIFNAMES]; static int dindex[MAXIFNAMES];
static int max_devname_len; /* to prevent frazzled device name output */ static int max_devname_len; /* to prevent frazzled device name output */
const int canfd_on = 1; const int canfd_on = 1;
#define MAXANI 4 #define MAXANI 4
@ -368,7 +368,7 @@ int main(int argc, char **argv)
print_usage(basename(argv[0])); print_usage(basename(argv[0]));
exit(0); exit(0);
} }
if (logfrmt && view) { if (logfrmt && view) {
fprintf(stderr, "Log file format selected: Please disable ASCII/BINARY/SWAP/RAWDLC options!\n"); fprintf(stderr, "Log file format selected: Please disable ASCII/BINARY/SWAP/RAWDLC options!\n");
exit(0); exit(0);
@ -478,14 +478,14 @@ int main(int argc, char **argv)
nptr = strchr(ptr, ','); /* update exit condition */ nptr = strchr(ptr, ','); /* update exit condition */
if (sscanf(ptr, "%x:%x", if (sscanf(ptr, "%x:%x",
&rfilter[numfilter].can_id, &rfilter[numfilter].can_id,
&rfilter[numfilter].can_mask) == 2) { &rfilter[numfilter].can_mask) == 2) {
rfilter[numfilter].can_mask &= ~CAN_ERR_FLAG; rfilter[numfilter].can_mask &= ~CAN_ERR_FLAG;
if (*(ptr+8) == ':') if (*(ptr+8) == ':')
rfilter[numfilter].can_id |= CAN_EFF_FLAG; rfilter[numfilter].can_id |= CAN_EFF_FLAG;
numfilter++; numfilter++;
} else if (sscanf(ptr, "%x~%x", } else if (sscanf(ptr, "%x~%x",
&rfilter[numfilter].can_id, &rfilter[numfilter].can_id,
&rfilter[numfilter].can_mask) == 2) { &rfilter[numfilter].can_mask) == 2) {
rfilter[numfilter].can_id |= CAN_INV_FILTER; rfilter[numfilter].can_id |= CAN_INV_FILTER;
rfilter[numfilter].can_mask &= ~CAN_ERR_FLAG; rfilter[numfilter].can_mask &= ~CAN_ERR_FLAG;
@ -494,7 +494,7 @@ int main(int argc, char **argv)
numfilter++; numfilter++;
} else if (*ptr == 'j' || *ptr == 'J') { } else if (*ptr == 'j' || *ptr == 'J') {
join_filter = 1; join_filter = 1;
} else if (sscanf(ptr, "#%x", &err_mask) != 1) { } else if (sscanf(ptr, "#%x", &err_mask) != 1) {
fprintf(stderr, "Error in filter option parsing: '%s'\n", ptr); fprintf(stderr, "Error in filter option parsing: '%s'\n", ptr);
return 1; return 1;
} }