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

asc2log: reduce code duplication 

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
pull/365/head
Oliver Hartkopp 2022-05-01 13:57:25 +02:00
parent 81e76a7a0d
commit d320a4a871
1 changed files with 22 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
asc2log.c
View File

@ -139,7 +139,7 @@ void eval_can(char* buf, struct timeval *date_tvp, char timestamps, char base, i
char tmp1[BUFLEN]; char tmp1[BUFLEN];
char dir[3]; /* 'Rx' or 'Tx' plus terminating zero */ char dir[3]; /* 'Rx' or 'Tx' plus terminating zero */
char *extra_info; char *extra_info;
int i, items, found; int i, items;
/* check for ErrorFrames */ /* check for ErrorFrames */
if (sscanf(buf, "%lu.%lu %d %s", if (sscanf(buf, "%lu.%lu %d %s",
@ -162,66 +162,42 @@ void eval_can(char* buf, struct timeval *date_tvp, char timestamps, char base, i
/* 0.002367 1 390x Rx d 8 17 00 14 00 C0 00 08 00 */ /* 0.002367 1 390x Rx d 8 17 00 14 00 C0 00 08 00 */
found = 0; /* found valid CAN frame ? */ /* check for CAN frames with (hexa)decimal values */
if (base == 'h')
if (base == 'h') { /* check for CAN frames with hexadecimal values */
items = sscanf(buf, "%lu.%lu %d %s %2s %c %x %x %x %x %x %x %x %x %x", items = sscanf(buf, "%lu.%lu %d %s %2s %c %x %x %x %x %x %x %x %x %x",
&read_tv.tv_sec, &read_tv.tv_usec, &interface, &read_tv.tv_sec, &read_tv.tv_usec, &interface,
tmp1, dir, &rtr, &dlc, tmp1, dir, &rtr, &dlc,
&data[0], &data[1], &data[2], &data[3], &data[0], &data[1], &data[2], &data[3],
&data[4], &data[5], &data[6], &data[7]); &data[4], &data[5], &data[6], &data[7]);
else
if (items < 7 ) /* make sure we've read the dlc */
return;
/* dlc is one character hex value 0..F */
if (dlc > CAN_MAX_RAW_DLC)
return;
/* retrieve real data length */
if (dlc > CAN_MAX_DLC)
len = CAN_MAX_DLEN;
else
len = dlc;
if ((items == len + 7 ) || /* data frame */
((items == 6) && (rtr == 'r')) || /* RTR without DLC */
((items == 7) && (rtr == 'r'))) { /* RTR with DLC */
found = 1;
get_can_id(&cf, tmp1, 16);
}
} else { /* check for CAN frames with decimal values */
items = sscanf(buf, "%lu.%lu %d %s %2s %c %x %d %d %d %d %d %d %d %d", items = sscanf(buf, "%lu.%lu %d %s %2s %c %x %d %d %d %d %d %d %d %d",
&read_tv.tv_sec, &read_tv.tv_usec, &interface, &read_tv.tv_sec, &read_tv.tv_usec, &interface,
tmp1, dir, &rtr, &dlc, tmp1, dir, &rtr, &dlc,
&data[0], &data[1], &data[2], &data[3], &data[0], &data[1], &data[2], &data[3],
&data[4], &data[5], &data[6], &data[7]); &data[4], &data[5], &data[6], &data[7]);
if (items < 7 ) /* make sure we've read the dlc */ if (items < 7 ) /* make sure we've read the dlc */
return; return;
/* dlc is one character hex value 0..F */ /* dlc is one character hex value 0..F */
if (dlc > CAN_MAX_RAW_DLC) if (dlc > CAN_MAX_RAW_DLC)
return; return;
/* retrieve real data length */ /* retrieve real data length */
if (dlc > CAN_MAX_DLC) if (dlc > CAN_MAX_DLC)
len = CAN_MAX_DLEN; len = CAN_MAX_DLEN;
else
len = dlc;
if ((items == len + 7 ) || /* data frame */
((items == 6) && (rtr == 'r')) || /* RTR without DLC */
((items == 7) && (rtr == 'r'))) { /* RTR with DLC */
/* check for CAN ID with (hexa)decimal value */
if (base == 'h')
get_can_id(&cf, tmp1, 16);
else else
len = dlc;
if ((items == len + 7 ) || /* data frame */
((items == 6) && (rtr == 'r')) || /* RTR without DLC */
((items == 7) && (rtr == 'r'))) { /* RTR with DLC */
found = 1;
get_can_id(&cf, tmp1, 10); get_can_id(&cf, tmp1, 10);
}
}
if (found) {
/* dlc > 8 => len == CAN_MAX_DLEN => fill len8_dlc value */ /* dlc > 8 => len == CAN_MAX_DLEN => fill len8_dlc value */
if (dlc > CAN_MAX_DLC) if (dlc > CAN_MAX_DLC)