d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix enough warnings that we can build syslogd on all targets at WARNS=6.

Browse Source 
This also fixes the build on MIPS.

Reported by:	cy (MIPS build failure)
This commit is contained in:
ed 2018-04-07 09:03:51 +00:00
parent c2e6899488
commit b907579827
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/syslogd/Makefile
View File

@ -11,8 +11,6 @@ SRCS= syslogd.c ttymsg.c
LIBADD= util LIBADD= util
WARNS?= 3
.if ${MK_INET_SUPPORT} != "no" .if ${MK_INET_SUPPORT} != "no"
CFLAGS+= -DINET CFLAGS+= -DINET
.endif .endif

8
usr.sbin/syslogd/syslogd.c
View File

@ -581,7 +581,7 @@ main(int argc, char *argv[])
else if (ch == 'p') { else if (ch == 'p') {
mode = DEFFILEMODE; mode = DEFFILEMODE;
pflag = 1; pflag = 1;
} else if (ch == 'S') { } else {
mode = S_IRUSR | S_IWUSR; mode = S_IRUSR | S_IWUSR;
Sflag = 1; Sflag = 1;
} }
@ -931,7 +931,7 @@ static void
parsemsg_rfc5424(const char *from, int pri, char *msg) parsemsg_rfc5424(const char *from, int pri, char *msg)
{ {
const struct logtime *timestamp; const struct logtime *timestamp;
struct logtime timestamp_remote = { 0 }; struct logtime timestamp_remote;
const char *omsg, *hostname, *app_name, *procid, *msgid, const char *omsg, *hostname, *app_name, *procid, *msgid,
*structured_data; *structured_data;
char line[MAXLINE + 1]; char line[MAXLINE + 1];
@ -971,6 +971,7 @@ parsemsg_rfc5424(const char *from, int pri, char *msg)
dest = v; \ dest = v; \
} while (0) } while (0)
/* Date and time. */ /* Date and time. */
memset(&timestamp_remote, 0, sizeof(timestamp_remote));
PARSE_NUMBER(timestamp_remote.tm.tm_year, 4, 0, 9999); PARSE_NUMBER(timestamp_remote.tm.tm_year, 4, 0, 9999);
timestamp_remote.tm.tm_year -= 1900; timestamp_remote.tm.tm_year -= 1900;
PARSE_CHAR("TIMESTAMP", '-'); PARSE_CHAR("TIMESTAMP", '-');
@ -1151,7 +1152,7 @@ parsemsg_rfc3164(const char *from, int pri, char *msg)
{ {
struct tm tm_parsed; struct tm tm_parsed;
const struct logtime *timestamp; const struct logtime *timestamp;
struct logtime timestamp_remote = { 0 }; struct logtime timestamp_remote;
const char *app_name, *procid; const char *app_name, *procid;
size_t i, msglen; size_t i, msglen;
char line[MAXLINE + 1]; 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_parsed;
timestamp_remote.tm.tm_year = year; timestamp_remote.tm.tm_year = year;
timestamp_remote.tm.tm_isdst = -1; timestamp_remote.tm.tm_isdst = -1;
timestamp_remote.usec = 0;
if (mktime(&timestamp_remote.tm) < if (mktime(&timestamp_remote.tm) <
t_now + 7 * 24 * 60 * 60) t_now + 7 * 24 * 60 * 60)
break; break;