From owner-svn-src-head@FreeBSD.ORG Wed Dec 17 16:51:40 2008 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B3C471065673; Wed, 17 Dec 2008 16:51:40 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9FCED8FC18; Wed, 17 Dec 2008 16:51:40 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBHGpe3r009370; Wed, 17 Dec 2008 16:51:40 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBHGpevq009368; Wed, 17 Dec 2008 16:51:40 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <200812171651.mBHGpevq009368@svn.freebsd.org> From: "David E. O'Brien" Date: Wed, 17 Dec 2008 16:51:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r186234 - head/usr.sbin/syslogd X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Dec 2008 16:51:40 -0000 Author: obrien Date: Wed Dec 17 16:51:40 2008 New Revision: 186234 URL: http://svn.freebsd.org/changeset/base/186234 Log: Rather than hardcode the 'struct iovec iov' array size, use a #define. While I'm here bump WARNS to 3. Obtained from: Juniper Networks Modified: head/usr.sbin/syslogd/Makefile head/usr.sbin/syslogd/syslogd.c Modified: head/usr.sbin/syslogd/Makefile ============================================================================== --- head/usr.sbin/syslogd/Makefile Wed Dec 17 16:25:20 2008 (r186233) +++ head/usr.sbin/syslogd/Makefile Wed Dec 17 16:51:40 2008 (r186234) @@ -12,7 +12,7 @@ SRCS= syslogd.c ttymsg.c DPADD= ${LIBUTIL} LDADD= -lutil -WARNS?= 1 +WARNS?= 3 .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 Modified: head/usr.sbin/syslogd/syslogd.c ============================================================================== --- head/usr.sbin/syslogd/syslogd.c Wed Dec 17 16:25:20 2008 (r186233) +++ head/usr.sbin/syslogd/syslogd.c Wed Dec 17 16:51:40 2008 (r186234) @@ -331,7 +331,7 @@ static void reapchild(int); static void usage(void); static int validate(struct sockaddr *, const char *); static void unmapped(struct sockaddr *); -static void wallmsg(struct filed *, struct iovec *); +static void wallmsg(struct filed *, struct iovec *, const int iovlen); static int waitdaemon(int, int, int); static void timedout(int); static void double_rbuf(int); @@ -1065,10 +1065,11 @@ dofsync(void) } } +#define IOV_SIZE 7 static void fprintlog(struct filed *f, int flags, const char *msg) { - struct iovec iov[7]; + struct iovec iov[IOV_SIZE]; struct iovec *v; struct addrinfo *r; int i, l, lsent = 0; @@ -1253,7 +1254,7 @@ fprintlog(struct filed *f, int flags, co dprintf(" %s\n", f->f_un.f_fname); v->iov_base = lf; v->iov_len = 1; - if (writev(f->f_file, iov, 7) < 0) { + if (writev(f->f_file, iov, IOV_SIZE) < 0) { /* * If writev(2) fails for potentially transient errors * like the filesystem being full, ignore it. @@ -1284,7 +1285,7 @@ fprintlog(struct filed *f, int flags, co break; } } - if (writev(f->f_file, iov, 7) < 0) { + if (writev(f->f_file, iov, IOV_SIZE) < 0) { int e = errno; (void)close(f->f_file); if (f->f_un.f_pipe.f_pid > 0) @@ -1309,7 +1310,7 @@ fprintlog(struct filed *f, int flags, co v->iov_len = 2; errno = 0; /* ttymsg() only sometimes returns an errno */ - if ((msgret = ttymsg(iov, 7, f->f_un.f_fname, 10))) { + if ((msgret = ttymsg(iov, IOV_SIZE, f->f_un.f_fname, 10))) { f->f_type = F_UNUSED; logerror(msgret); } @@ -1320,7 +1321,7 @@ fprintlog(struct filed *f, int flags, co dprintf("\n"); v->iov_base = crlf; v->iov_len = 2; - wallmsg(f, iov); + wallmsg(f, iov, IOV_SIZE); break; } f->f_prevcount = 0; @@ -1334,7 +1335,7 @@ fprintlog(struct filed *f, int flags, co * world, or a list of approved users. */ static void -wallmsg(struct filed *f, struct iovec *iov) +wallmsg(struct filed *f, struct iovec *iov, const int iovlen) { static int reenter; /* avoid calling ourselves */ FILE *uf; @@ -1358,7 +1359,8 @@ wallmsg(struct filed *f, struct iovec *i strncpy(line, ut.ut_line, sizeof(line) - 1); line[sizeof(line) - 1] = '\0'; if (f->f_type == F_WALL) { - if ((p = ttymsg(iov, 7, line, TTYMSGTIME)) != NULL) { + if ((p = ttymsg(iov, iovlen, line, TTYMSGTIME)) != + NULL) { errno = 0; /* already in msg */ logerror(p); } @@ -1370,8 +1372,8 @@ wallmsg(struct filed *f, struct iovec *i break; if (!strncmp(f->f_un.f_uname[i], ut.ut_name, UT_NAMESIZE)) { - if ((p = ttymsg(iov, 7, line, TTYMSGTIME)) - != NULL) { + if ((p = ttymsg(iov, IOV_SIZE, line, + TTYMSGTIME)) != NULL) { errno = 0; /* already in msg */ logerror(p); }