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

Fix two clang 3.6.0 warnings in usr.sbin/syslogd:

Browse Source 
usr.sbin/syslogd/syslogd.c:1023:10: error: address of array 'f->f_prevline' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion]
                    f->f_prevline && !strcmp(msg, f->f_prevline) &&
                    ~~~^~~~~~~~~~
usr.sbin/syslogd/syslogd.c:1178:16: error: address of array 'f->f_prevline' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion]
        } else if (f->f_prevline) {
               ~~  ~~~^~~~~~~~~~

In both cases, the f_prevline field of struct filed is a char array, so
it can never be null.  Remove the checks.

Reviewed by:	jilles
MFC after:	3 days
Differential Revision: https://reviews.freebsd.org/D1716
This commit is contained in:
dim 2015-02-05 22:28:00 +00:00
parent d99174b27c
commit 49ba8ceb19
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1020,7 +1020,7 @@ logmsg(int pri, const char *msg, const char *from, int flags)
*/ */
if (no_compress - (f->f_type != F_PIPE) < 1 && if (no_compress - (f->f_type != F_PIPE) < 1 &&
(flags & MARK) == 0 && msglen == f->f_prevlen && (flags & MARK) == 0 && msglen == f->f_prevlen &&
f->f_prevline && !strcmp(msg, f->f_prevline) && !strcmp(msg, f->f_prevline) &&
!strcasecmp(from, f->f_prevhost)) { !strcasecmp(from, f->f_prevhost)) {
(void)strlcpy(f->f_lasttime, timestamp, (void)strlcpy(f->f_lasttime, timestamp,
sizeof(f->f_lasttime)); sizeof(f->f_lasttime));
@ -1175,11 +1175,9 @@ fprintlog(struct filed *f, int flags, const char *msg)
v->iov_base = repbuf; v->iov_base = repbuf;
v->iov_len = snprintf(repbuf, sizeof repbuf, v->iov_len = snprintf(repbuf, sizeof repbuf,
"last message repeated %d times", f->f_prevcount); "last message repeated %d times", f->f_prevcount);
} else if (f->f_prevline) { } else {
v->iov_base = f->f_prevline; v->iov_base = f->f_prevline;
v->iov_len = f->f_prevlen; v->iov_len = f->f_prevlen;
} else {
return;
} }
v++; v++;