From 82be1b348bac7fd344ac7bfbeed62eb6b6a8fb67 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Sat, 25 Nov 2023 19:01:04 +0100 Subject: [PATCH 1/2] cansend: convert towards kernel coding style --- cansend.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/cansend.c b/cansend.c index 72d7016..51d9689 100644 --- a/cansend.c +++ b/cansend.c @@ -56,7 +56,7 @@ #include "lib.h" -void print_usage(char *prg) +static void print_usage(char *prg) { fprintf(stderr, "%s - send CAN-frames via CAN_RAW sockets.\n", prg); fprintf(stderr, "\nUsage: %s .\n", prg); @@ -147,10 +147,12 @@ int main(int argc, char **argv) frame.len = can_fd_dlc2len(can_fd_len2dlc(frame.len)); } - /* disable default receive filter on this RAW socket */ - /* This is obsolete as we do not read from the socket at all, but for */ - /* this reason we can remove the receive list in the Kernel to save a */ - /* little (really a very little!) CPU usage. */ + /* + * disable default receive filter on this RAW socket This is + * obsolete as we do not read from the socket at all, but for + * this reason we can remove the receive list in the Kernel to + * save a little (really a very little!) CPU usage. + */ setsockopt(s, SOL_CAN_RAW, CAN_RAW_FILTER, NULL, 0); if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) { From 50b66ca4033afda3cf03747781c60cee1da6a8c1 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Sat, 25 Nov 2023 19:07:23 +0100 Subject: [PATCH 2/2] cansend: usage(): use a single call to fprintf() This makes the printed text in the code easier to read. --- cansend.c | 48 +++++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/cansend.c b/cansend.c index 51d9689..c2eb30c 100644 --- a/cansend.c +++ b/cansend.c @@ -58,27 +58,33 @@ static void print_usage(char *prg) { - fprintf(stderr, "%s - send CAN-frames via CAN_RAW sockets.\n", prg); - fprintf(stderr, "\nUsage: %s .\n", prg); - fprintf(stderr, "\n:\n"); - fprintf(stderr, " #{data} for Classical CAN 2.0 data frames\n"); - fprintf(stderr, " #R{len} for Classical CAN 2.0 data frames\n"); - fprintf(stderr, " #{data}_{dlc} for Classical CAN 2.0 data frames\n"); - fprintf(stderr, " #R{len}_{dlc} for Classical CAN 2.0 data frames\n"); - fprintf(stderr, " ##{data} for CAN FD frames\n\n"); - fprintf(stderr, ":\n" - " 3 (SFF) or 8 (EFF) hex chars\n"); - fprintf(stderr, "{data}:\n" - " 0..8 (0..64 CAN FD) ASCII hex-values (optionally separated by '.')\n"); - fprintf(stderr, "{len}:\n" - " an optional 0..8 value as RTR frames can contain a valid dlc field\n"); - fprintf(stderr, "_{dlc}:\n" - " an optional 9..F data length code value when payload length is 8\n"); - fprintf(stderr, ":\n" - " a single ASCII Hex value (0 .. F) which defines canfd_frame.flags\n\n"); - fprintf(stderr, "Examples:\n"); - fprintf(stderr, " 5A1#11.2233.44556677.88 / 123#DEADBEEF / 5AA# / 123##1 / 213##311223344 /\n" - " 1F334455#1122334455667788_B / 123#R / 00000123#R3 / 333#R8_E\n\n"); + fprintf(stderr, + "%s - send CAN-frames via CAN_RAW sockets.\n" + "\n" + "Usage: %s .\n" + "\n" + ":\n" + " #{data} for Classical CAN 2.0 data frames\n" + " #R{len} for Classical CAN 2.0 data frames\n" + " #{data}_{dlc} for Classical CAN 2.0 data frames\n" + " #R{len}_{dlc} for Classical CAN 2.0 data frames\n" + " ##{data} for CAN FD frames\n\n" + ":\n" + " 3 (SFF) or 8 (EFF) hex chars\n" + "{data}:\n" + " 0..8 (0..64 CAN FD) ASCII hex-values (optionally separated by '.')\n" + "{len}:\n" + " an optional 0..8 value as RTR frames can contain a valid dlc field\n" + "_{dlc}:\n" + " an optional 9..F data length code value when payload length is 8\n" + ":\n" + " a single ASCII Hex value (0 .. F) which defines canfd_frame.flags\n" + "\n" + "Examples:\n" + " 5A1#11.2233.44556677.88 / 123#DEADBEEF / 5AA# / 123##1 / 213##311223344 /\n" + " 1F334455#1122334455667788_B / 123#R / 00000123#R3 / 333#R8_E\n" + "\n", + prg, prg); } int main(int argc, char **argv)