diff options
| author |   doug <doug@openbsd.org> | 2014-09-10 13:16:20 +0000 |
|---|---|---|
| committer | doug <doug@openbsd.org> | 2014-09-10 13:16:20 +0000 |
| commit | 54def46922eb64ce35aeb2f685457f7ac0390150 (patch) | |
| tree | 27b4f9089b7563fbe168ade0659df0d96e27288e /usr.sbin/syslogd/syslogd.h | |
| parent | document \<word\> as being non standard (diff) | |
| download | wireguard-openbsd-54def46922eb64ce35aeb2f685457f7ac0390150.tar.xz wireguard-openbsd-54def46922eb64ce35aeb2f685457f7ac0390150.zip | |
Remove redundant null check and rename vars consistently in syslogd
Merge in more functionality from bluhm's patch.
ok bluhm@
Diffstat (limited to 'usr.sbin/syslogd/syslogd.h')
| -rw-r--r-- | usr.sbin/syslogd/syslogd.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/syslogd/syslogd.h b/usr.sbin/syslogd/syslogd.h index 63a2e03c678..42599daa1d8 100644 --- a/usr.sbin/syslogd/syslogd.h +++ b/usr.sbin/syslogd/syslogd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syslogd.h,v 1.13 2014/09/08 00:43:42 doug Exp $ */ +/* $OpenBSD: syslogd.h,v 1.14 2014/09/10 13:16:20 doug Exp $ */ /* * Copyright (c) 2003 Anil Madhavapeddy <anil@recoil.org> @@ -39,9 +39,9 @@ void send_fd(int, int); int receive_fd(int); /* The list of domain sockets */ -#define MAXFUNIX 21 -extern int nfunix; -extern char *funixn[MAXFUNIX]; +#define MAXUNIX 21 +extern int nunix; +extern char *path_unix[MAXUNIX]; extern char *ctlsock_path; #define dprintf(_f...) do { if (Debug) printf(_f); } while (0) @@ -56,7 +56,7 @@ extern int Startup; #define PFD_INET6 4 /* Offset of inet6 socket entry */ #define PFD_SENDSYS 5 /* Offset of sendsyslog(2) entry */ #define PFD_UNIX_0 6 /* Start of Unix socket entries */ -#define N_PFD (PFD_UNIX_0 + MAXFUNIX) /* # of pollfd entries */ +#define N_PFD (PFD_UNIX_0 + MAXUNIX) /* # of pollfd entries */ extern struct pollfd pfd[N_PFD]; struct ringbuf { |