diff --git a/asc2log.c b/asc2log.c index 99bd91a6..ecea77ce 100644 --- a/asc2log.c +++ b/asc2log.c @@ -84,7 +84,7 @@ static void print_usage(char *prg) } static void prframe(FILE *file, struct timeval *tv, int dev, - cu_t *cf, char dir) + union cfu *cf, char dir) { static char abuf[BUFLEN]; @@ -177,7 +177,7 @@ static void eval_can(char* buf, struct timeval *date_tvp, char timestamps, cf.len = CAN_ERR_DLC; calc_tv(&tv, &read_tv, date_tvp, timestamps, dplace); - prframe(outfile, &tv, interface, (cu_t *)&cf, NO_DIR); + prframe(outfile, &tv, interface, (union cfu *)&cf, NO_DIR); fflush(outfile); return; } @@ -249,7 +249,7 @@ static void eval_can(char* buf, struct timeval *date_tvp, char timestamps, cf.data[i] = data[i] & 0xFFU; calc_tv(&tv, &read_tv, date_tvp, timestamps, dplace); - prframe(outfile, &tv, interface, (cu_t *)&cf, dir[0]); + prframe(outfile, &tv, interface, (union cfu *)&cf, dir[0]); fflush(outfile); } } @@ -374,7 +374,7 @@ static void eval_canfd(char* buf, struct timeval *date_tvp, char timestamps, } calc_tv(&tv, &read_tv, date_tvp, timestamps, dplace); - prframe(outfile, &tv, interface, (cu_t *)&cf, dir[0]); + prframe(outfile, &tv, interface, (union cfu *)&cf, dir[0]); fflush(outfile); /* No support for really strange CANFD ErrorFrames format m( */ @@ -487,7 +487,7 @@ static void eval_canxl_cc(char* buf, struct timeval *date_tvp, char timestamps, cf.len8_dlc = dlc; calc_tv(&tv, &read_tv, date_tvp, timestamps, dplace); - prframe(outfile, &tv, interface, (cu_t *)&cf, dir[0]); + prframe(outfile, &tv, interface, (union cfu *)&cf, dir[0]); fflush(outfile); } @@ -594,7 +594,7 @@ static void eval_canxl_fd(char* buf, struct timeval *date_tvp, char timestamps, cf.flags |= CANFD_ESI; calc_tv(&tv, &read_tv, date_tvp, timestamps, dplace); - prframe(outfile, &tv, interface, (cu_t *)&cf, dir[0]); + prframe(outfile, &tv, interface, (union cfu *)&cf, dir[0]); fflush(outfile); } @@ -723,7 +723,7 @@ static void eval_canxl_xl(char* buf, struct timeval *date_tvp, char timestamps, cf.flags |= CANXL_RRS; calc_tv(&tv, &read_tv, date_tvp, timestamps, dplace); - prframe(outfile, &tv, interface, (cu_t *)&cf, dir[0]); + prframe(outfile, &tv, interface, (union cfu *)&cf, dir[0]); fflush(outfile); /* No support for CAN XL ErrorFrames */ diff --git a/candump.c b/candump.c index ec97dd6a..02d231df 100644 --- a/candump.c +++ b/candump.c @@ -342,7 +342,7 @@ int main(int argc, char **argv) struct cmsghdr *cmsg; struct can_filter *rfilter; can_err_mask_t err_mask; - static cu_t cu; /* union for CAN CC/FD/XL frames */ + static union cfu cu; /* union for CAN CC/FD/XL frames */ int nbytes, i; struct ifreq ifr; struct timespec ts, last_ts; diff --git a/cangen.c b/cangen.c index 97cc2656..f5366ab0 100644 --- a/cangen.c +++ b/cangen.c @@ -299,7 +299,7 @@ static int setsockopt_txtime(int fd) return 0; } -static int do_send_one(int fd, cu_t *cu, size_t len, int timeout) +static int do_send_one(int fd, union cfu *cu, size_t len, int timeout) { uint8_t control[CMSG_SPACE(sizeof(uint64_t))] = { 0 }; struct iovec iov = { @@ -494,7 +494,7 @@ int main(int argc, char **argv) struct can_raw_vcid_options vcid_opts = { .flags = CAN_RAW_XL_VCID_TX_PASS, }; - static cu_t cu; + static union cfu cu; int i; struct ifreq ifr = { 0 }; const int enable_canfx = 1; diff --git a/canlogserver.c b/canlogserver.c index b1b667d1..3e9c44ff 100644 --- a/canlogserver.c +++ b/canlogserver.c @@ -191,7 +191,7 @@ int main(int argc, char **argv) .rx_vcid_mask = 0, }; struct can_filter rfilter; - static cu_t cu; /* union for CAN CC/FD/XL frames */ + static union cfu cu; /* union for CAN CC/FD/XL frames */ const int canfx_on = 1; int nbytes, i, j; struct ifreq ifr; diff --git a/canplayer.c b/canplayer.c index f58f5f90..eb15ec96 100644 --- a/canplayer.c +++ b/canplayer.c @@ -261,7 +261,7 @@ int main(int argc, char **argv) struct can_raw_vcid_options vcid_opts = { .flags = CAN_RAW_XL_VCID_TX_PASS, }; - static cu_t cu; + static union cfu cu; static struct timeval today_tv, log_tv, last_log_tv, diff_tv; struct timespec sleep_ts; int s; /* CAN_RAW socket */ diff --git a/cansend.c b/cansend.c index e80f74fa..236ee891 100644 --- a/cansend.c +++ b/cansend.c @@ -117,7 +117,7 @@ int main(int argc, char **argv) struct can_raw_vcid_options vcid_opts = { .flags = CAN_RAW_XL_VCID_TX_PASS, }; - static cu_t cu; + static union cfu cu; struct ifreq ifr; /* check command line options */ diff --git a/lib.c b/lib.c index 3c94749f..aaa5e51f 100644 --- a/lib.c +++ b/lib.c @@ -155,7 +155,7 @@ int hexstring2data(char *arg, unsigned char *data, int maxdlen) return 0; } -int parse_canframe(char *cs, cu_t *cu) +int parse_canframe(char *cs, union cfu *cu) { /* documentation see lib.h */ @@ -309,7 +309,7 @@ int parse_canframe(char *cs, cu_t *cu) return mtu; } -int snprintf_canframe(char *buf, size_t size, cu_t *cu, int sep) +int snprintf_canframe(char *buf, size_t size, union cfu *cu, int sep) { /* documentation see lib.h */ @@ -433,7 +433,7 @@ int snprintf_canframe(char *buf, size_t size, cu_t *cu, int sep) return offset; } -int snprintf_long_canframe(char *buf, size_t size, cu_t *cu, int view) +int snprintf_long_canframe(char *buf, size_t size, union cfu *cu, int view) { /* documentation see lib.h */ diff --git a/lib.h b/lib.h index 33426e29..2b21a453 100644 --- a/lib.h +++ b/lib.h @@ -59,11 +59,11 @@ static inline int pr_debug(const char* fmt, ...) {return 0;} #endif /* CAN CC/FD/XL frame union */ -typedef union { +union cfu { struct can_frame cc; struct canfd_frame fd; struct canxl_frame xl; -} cu_t; +}; /* * The buffer size for ASCII CAN frame string representations @@ -110,7 +110,7 @@ int hexstring2data(char *arg, unsigned char *data, int maxdlen); * */ -int parse_canframe(char *cs, cu_t *cu); +int parse_canframe(char *cs, union cfu *cu); /* * Transfers a valid ASCII string describing a CAN frame into the CAN union * containing CAN CC/FD/XL structs. @@ -180,7 +180,7 @@ int parse_canframe(char *cs, cu_t *cu); * - CAN FD frames do not have a RTR bit */ -int snprintf_canframe(char *buf, size_t size, cu_t *cu, int sep); +int snprintf_canframe(char *buf, size_t size, union cfu *cu, int sep); /* * Creates a CAN frame hexadecimal output in compact format. * The CAN data[] is separated by '.' when sep != 0. @@ -213,7 +213,7 @@ int snprintf_canframe(char *buf, size_t size, cu_t *cu, int sep); #define SWAP_DELIMITER '`' -int snprintf_long_canframe(char *buf, size_t size, cu_t *cu, int view); +int snprintf_long_canframe(char *buf, size_t size, union cfu *cu, int view); /* * Creates a CAN frame hexadecimal output in user readable format. * diff --git a/log2asc.c b/log2asc.c index f1a376be..22c05103 100644 --- a/log2asc.c +++ b/log2asc.c @@ -183,7 +183,7 @@ static void canfd_asc(struct canfd_frame *cf, int devno, int mtu, fprintf(outfile, " %8d %4d %8X 0 0 0 0 0", 130000, 130, flags); } -static void canxl_asc(cu_t *cu, int devno, int mtu, +static void canxl_asc(union cfu *cu, int devno, int mtu, char *extra_info, FILE *outfile) { char id[10]; @@ -314,7 +314,7 @@ int main(int argc, char **argv) { static char buf[BUFSZ], device[DEVSZ], afrbuf[AFRSZ], extra_info[EXTRASZ]; - static cu_t cu; + static union cfu cu; static struct timeval tv, start_tv; FILE *infile = stdin; FILE *outfile = stdout; diff --git a/log2long.c b/log2long.c index 32c6b127..4383a33f 100644 --- a/log2long.c +++ b/log2long.c @@ -68,7 +68,7 @@ int main(void) { static char buf[BUFSZ], timestamp[TIMESZ], device[DEVSZ], afrbuf[AFRSZ]; - static cu_t cu; + static union cfu cu; int mtu; while (fgets(buf, BUFSZ-1, stdin)) {