mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

conf, passt: Rename stderr to force_stderr

Browse source 
While building against musl, gcc informs us that 'stderr' is a
protected keyword. This probably comes from a #define stderr (stderr)
in musl's stdio.h, to avoid a clash with extern FILE *const stderr,
but I didn't really track it down. Just rename it to force_stderr, it
makes more sense.

[sbrivio: Added commit message]
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Chris Kuhn 2023-03-08 03:47:45 +01:00 committed by Stefano Brivio
parent fde8004ab0
commit 5c58feab7b
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
conf.c
View file

@ -1357,13 +1357,13 @@ void conf(struct ctx *c, int argc, char **argv)
if (logfile) if (logfile)
die("Can't log to both file and stderr"); die("Can't log to both file and stderr");
if (c->stderr) if (c->force_stderr)
die("Multiple --stderr options given"); die("Multiple --stderr options given");
c->stderr = 1; c->force_stderr = 1;
break; break;
case 'l': case 'l':
if (c->stderr) if (c->force_stderr)
die("Can't log to both stderr and file"); die("Can't log to both stderr and file");
if (logfile) if (logfile)

2
passt.c
View file

@ -241,7 +241,7 @@ int main(int argc, char **argv)
conf(&c, argc, argv); conf(&c, argc, argv);
trace_init(c.trace); trace_init(c.trace);
if (c.stderr || isatty(fileno(stdout))) if (c.force_stderr || isatty(fileno(stdout)))
__openlog(log_name, LOG_PERROR, LOG_DAEMON); __openlog(log_name, LOG_PERROR, LOG_DAEMON);
quit_fd = pasta_netns_quit_init(&c); quit_fd = pasta_netns_quit_init(&c);

4
passt.h
View file

@ -158,7 +158,7 @@ struct ip6_ctx {
* @trace: Enable tracing (extra debug) mode * @trace: Enable tracing (extra debug) mode
* @quiet: Don't print informational messages * @quiet: Don't print informational messages
* @foreground: Run in foreground, don't log to stderr by default * @foreground: Run in foreground, don't log to stderr by default
* @stderr: Force logging to stderr * @force_stderr: Force logging to stderr
* @nofile: Maximum number of open files (ulimit -n) * @nofile: Maximum number of open files (ulimit -n)
* @sock_path: Path for UNIX domain socket * @sock_path: Path for UNIX domain socket
* @pcap: Path for packet capture file * @pcap: Path for packet capture file
@ -207,7 +207,7 @@ struct ctx {
int trace; int trace;
int quiet; int quiet;
int foreground; int foreground;
int stderr; int force_stderr;
int nofile; int nofile;
char sock_path[UNIX_PATH_MAX]; char sock_path[UNIX_PATH_MAX];
char pcap[PATH_MAX]; char pcap[PATH_MAX];