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

canerrsim: convert from show_custom_format_and_exit() to err_exit()

pull/624/head
Marc Kleine-Budde 2026-03-09 12:20:50 +01:00
parent 3fe1c42bbf
commit 7e8e247b2f
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
canerrsim.c
View File

@ -134,21 +134,14 @@ void __attribute__((format (printf, 1, 2))) err_exit(const char *format, ...)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
void show_custom_format_and_exit(const char *param, const char *format)
{
char str_buf[80];
sprintf(str_buf, format, param);
err_exit("%s", str_buf);
}
void show_invalid_option(const char *option) void show_invalid_option(const char *option)
{ {
show_custom_format_and_exit(option, "Error: Invalid option %s\n"); err_exit("Error: Invalid option %s\n", option);
} }
void show_err_and_exit(const char *err_type) void show_err_and_exit(const char *err_type)
{ {
show_custom_format_and_exit(err_type, "Error: You can only have one %s parameter!\n"); err_exit("Error: You can only have one %s parameter!\n", err_type);
} }
void show_loc_err_and_exit() void show_loc_err_and_exit()
@ -182,7 +175,6 @@ int main(int argc, char *argv[])
struct ifreq ifr; struct ifreq ifr;
struct can_frame frame; struct can_frame frame;
bool show_bits = false, location_processed = false, transceiver_processed = false, arbitration_processed = false; bool show_bits = false, location_processed = false, transceiver_processed = false, arbitration_processed = false;
char tmp_str[256];
printf("CAN Sockets Error Messages Simulator\n"); printf("CAN Sockets Error Messages Simulator\n");
if (argc < 3) if (argc < 3)
@ -547,10 +539,8 @@ int main(int argc, char *argv[])
// set interface name // set interface name
strcpy(ifr.ifr_name, argv[1]); // can0, vcan0... strcpy(ifr.ifr_name, argv[1]); // can0, vcan0...
if (ioctl(sock, SIOCGIFINDEX, &ifr) < 0) { if (ioctl(sock, SIOCGIFINDEX, &ifr) < 0)
sprintf(tmp_str, "Error setting CAN interface name %s", argv[1]); err_exit("Error setting CAN interface name %s\n", argv[1]);
err_exit(tmp_str);
}
// bind socket to the CAN interface // bind socket to the CAN interface
addr.can_family = AF_CAN; addr.can_family = AF_CAN;