From owner-svn-src-head@freebsd.org Sat Apr 7 09:03:52 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2FDCBF99A3E; Sat, 7 Apr 2018 09:03:52 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BACA56E3A3; Sat, 7 Apr 2018 09:03:51 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B5C6C1EC09; Sat, 7 Apr 2018 09:03:51 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3793pio040311; Sat, 7 Apr 2018 09:03:51 GMT (envelope-from ed@FreeBSD.org) Received: (from ed@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3793pGN040309; Sat, 7 Apr 2018 09:03:51 GMT (envelope-from ed@FreeBSD.org) Message-Id: <201804070903.w3793pGN040309@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ed set sender to ed@FreeBSD.org using -f From: Ed Schouten Date: Sat, 7 Apr 2018 09:03:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r332165 - head/usr.sbin/syslogd X-SVN-Group: head X-SVN-Commit-Author: ed X-SVN-Commit-Paths: head/usr.sbin/syslogd X-SVN-Commit-Revision: 332165 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 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: Sat, 07 Apr 2018 09:03:52 -0000 Author: ed Date: Sat Apr 7 09:03:51 2018 New Revision: 332165 URL: https://svnweb.freebsd.org/changeset/base/332165 Log: Fix enough warnings that we can build syslogd on all targets at WARNS=6. This also fixes the build on MIPS. Reported by: cy (MIPS build failure) Modified: head/usr.sbin/syslogd/Makefile head/usr.sbin/syslogd/syslogd.c Modified: head/usr.sbin/syslogd/Makefile ============================================================================== --- head/usr.sbin/syslogd/Makefile Sat Apr 7 03:51:19 2018 (r332164) +++ head/usr.sbin/syslogd/Makefile Sat Apr 7 09:03:51 2018 (r332165) @@ -11,8 +11,6 @@ SRCS= syslogd.c ttymsg.c LIBADD= util -WARNS?= 3 - .if ${MK_INET_SUPPORT} != "no" CFLAGS+= -DINET .endif Modified: head/usr.sbin/syslogd/syslogd.c ============================================================================== --- head/usr.sbin/syslogd/syslogd.c Sat Apr 7 03:51:19 2018 (r332164) +++ head/usr.sbin/syslogd/syslogd.c Sat Apr 7 09:03:51 2018 (r332165) @@ -581,7 +581,7 @@ main(int argc, char *argv[]) else if (ch == 'p') { mode = DEFFILEMODE; pflag = 1; - } else if (ch == 'S') { + } else { mode = S_IRUSR | S_IWUSR; Sflag = 1; } @@ -931,7 +931,7 @@ static void parsemsg_rfc5424(const char *from, int pri, char *msg) { const struct logtime *timestamp; - struct logtime timestamp_remote = { 0 }; + struct logtime timestamp_remote; const char *omsg, *hostname, *app_name, *procid, *msgid, *structured_data; char line[MAXLINE + 1]; @@ -971,6 +971,7 @@ parsemsg_rfc5424(const char *from, int pri, char *msg) dest = v; \ } while (0) /* Date and time. */ + memset(×tamp_remote, 0, sizeof(timestamp_remote)); PARSE_NUMBER(timestamp_remote.tm.tm_year, 4, 0, 9999); timestamp_remote.tm.tm_year -= 1900; PARSE_CHAR("TIMESTAMP", '-'); @@ -1151,7 +1152,7 @@ parsemsg_rfc3164(const char *from, int pri, char *msg) { struct tm tm_parsed; const struct logtime *timestamp; - struct logtime timestamp_remote = { 0 }; + struct logtime timestamp_remote; const char *app_name, *procid; size_t i, msglen; char line[MAXLINE + 1]; @@ -1187,6 +1188,7 @@ parsemsg_rfc3164(const char *from, int pri, char *msg) timestamp_remote.tm = tm_parsed; timestamp_remote.tm.tm_year = year; timestamp_remote.tm.tm_isdst = -1; + timestamp_remote.usec = 0; if (mktime(×tamp_remote.tm) < t_now + 7 * 24 * 60 * 60) break;