Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

j1939acd: remove legacy '-p' option (prefix to use when logging) #552

Merged
merged 2 commits into from
Jul 24, 2024
Merged

j1939acd: remove legacy '-p' option (prefix to use when logging) #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d337863
j1939acd: remove legacy '-p' option (prefix to use when logging)
pseiderer Jul 22, 2024
a63bf46
j1939sr: remove legacy program_invocation_name/program_invocation_sho…
pseiderer Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions j1939acd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ static const char help_msg[] =
" e.g. 80,50-100,200-210 (defaults to 0-253)" "\n"
" -c, --cache=FILE Cache file to save/restore the source address" "\n"
" -a, --address=ADDRESS Start with Source Address ADDRESS" "\n"
" -p, --prefix=STR Prefix to use when logging" "\n"
"\n"
"NAME is the 64bit nodename" "\n"
"\n"
Expand All @@ -54,14 +53,13 @@ static struct option long_opts[] = {
{ "range", required_argument, NULL, 'r', },
{ "cache", required_argument, NULL, 'c', },
{ "address", required_argument, NULL, 'a', },
{ "prefix", required_argument, NULL, 'p', },
{ },
};
#else
#define getopt_long(argc, argv, optstring, longopts, longindex) \
getopt((argc), (argv), (optstring))
#endif
static const char optstring[] = "vr:c:a:p:?";
static const char optstring[] = "vr:c:a:?";

/* byte swap functions */
static inline int host_is_little_endian(void)
Expand Down Expand Up @@ -466,9 +464,6 @@ int main(int argc, char *argv[])
struct sockaddr_can saddr;
uint64_t cmd_name;

#ifdef _GNU_SOURCE
program_invocation_name = program_invocation_short_name;
#endif
/* argument parsing */
while ((opt = getopt_long(argc, argv, optstring, long_opts, NULL)) != -1)
switch (opt) {
Expand All @@ -484,15 +479,6 @@ int main(int argc, char *argv[])
case 'a':
s.current_sa = strtoul(optarg, 0, 0);
break;
case 'p':
#ifdef _GNU_SOURCE
if (asprintf(&program_invocation_name, "%s.%s",
program_invocation_short_name, optarg) < 0)
err(1, "asprintf(program invocation name)");
#else
err(0, "compile with -D_GNU_SOURCE to use -p");
#endif
break;
default:
fputs(help_msg, stderr);
exit(1);
Expand Down
3 changes: 0 additions & 3 deletions j1939sr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,6 @@ int main(int argc, char **argv)
struct pollfd pfd[2];
uint8_t *buf;

#ifdef _GNU_SOURCE
program_invocation_name = program_invocation_short_name;
#endif
/* argument parsing */
while ((opt = getopt_long(argc, argv, optstring, long_opts, NULL)) != -1)
switch (opt) {
Expand Down
Loading