On Tue, Aug 19, 2014 at 01:59:42AM +0200, Alexander Bluhm wrote: > I will split this diff into smaller parts to make review and > discussion easier.
Let's start with the easy part, fix trailing white spaces.
ok?
bluhm
Index: usr.sbin/syslogd/syslogd.c
===================================================================
RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/syslogd/syslogd.c,v
retrieving revision 1.111
diff -u -p -u -p -r1.111 syslogd.c
--- usr.sbin/syslogd/syslogd.c 14 Jul 2014 04:02:33 -0000 1.111
+++ usr.sbin/syslogd/syslogd.c 19 Aug 2014 00:00:14 -0000
@@ -1014,7 +1014,7 @@ fprintlog(struct filed *f, int flags, ch
case F_MEMBUF:
dprintf("\n");
snprintf(line, sizeof(line), "%.15s %s %s",
- (char *)iov[0].iov_base, (char *)iov[2].iov_base,
+ (char *)iov[0].iov_base, (char *)iov[2].iov_base,
(char *)iov[4].iov_base);
if (ringbuf_append_line(f->f_un.f_mb.f_rb, line) == 1)
f->f_un.f_mb.f_overflow = 1;
@@ -1538,9 +1538,9 @@ cfline(char *line, char *prog)
logerror(ebuf);
break;
}
- addr_len = priv_gethostserv(f->f_un.f_forw.f_hname,
- cp == NULL ? "syslog" : cp,
- (struct sockaddr*)&f->f_un.f_forw.f_addr,
+ addr_len = priv_gethostserv(f->f_un.f_forw.f_hname,
+ cp == NULL ? "syslog" : cp,
+ (struct sockaddr*)&f->f_un.f_forw.f_addr,
sizeof(f->f_un.f_forw.f_addr));
if (addr_len < 1) {
snprintf(ebuf, sizeof(ebuf), "bad hostname \"%s\"", p);
pgpFDZFMnCUDS.pgp
Description: PGP signature
