diff options
author | dwmalone <dwmalone@FreeBSD.org> | 2004-05-26 21:14:13 +0000 |
---|---|---|
committer | dwmalone <dwmalone@FreeBSD.org> | 2004-05-26 21:14:13 +0000 |
commit | a1009a96f6d9c6362a94752a1a9b0e39926f8238 (patch) | |
tree | ee3af6c223a71e42908009c8c66457fad9a0a3d7 /usr.sbin/syslogd | |
parent | b19c4df7f447736f3729e2e0143fd4c39fb33a4a (diff) | |
download | FreeBSD-src-a1009a96f6d9c6362a94752a1a9b0e39926f8238.zip FreeBSD-src-a1009a96f6d9c6362a94752a1a9b0e39926f8238.tar.gz |
Silence some constness and printf type warnings. Most of the
const fixes are ugly 'cos the types in an iovec aren't quite
right for a writev.
Diffstat (limited to 'usr.sbin/syslogd')
-rw-r--r-- | usr.sbin/syslogd/syslogd.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index 9e080b4..d1758cb 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -263,7 +263,7 @@ static struct filed consfile; /* Console */ static int Debug; /* debug flag */ static int resolve = 1; /* resolve hostname */ static char LocalHostName[MAXHOSTNAMELEN]; /* our hostname */ -static char *LocalDomain; /* our local domain name */ +static const char *LocalDomain; /* our local domain name */ static int *finet; /* Internet datagram socket */ static int fklog = -1; /* /dev/klog */ static int Initialized; /* set when we have initialized ourselves */ @@ -971,6 +971,7 @@ fprintlog(struct filed *f, int flags, const char *msg) struct addrinfo *r; int i, l, lsent = 0; char line[MAXLINE + 1], repbuf[80], greetings[200], *wmsg = NULL; + char nul[] = "", space[] = " ", lf[] = "\n", crlf[] = "\r\n"; const char *msgret; v = iov; @@ -981,14 +982,14 @@ fprintlog(struct filed *f, int flags, const char *msg) f->f_prevhost, ctime(&now)); if (v->iov_len > 0) v++; - v->iov_base = ""; + v->iov_base = nul; v->iov_len = 0; v++; } else { v->iov_base = f->f_lasttime; v->iov_len = 15; v++; - v->iov_base = " "; + v->iov_base = space; v->iov_len = 1; v++; } @@ -1030,7 +1031,7 @@ fprintlog(struct filed *f, int flags, const char *msg) v->iov_base = fp_buf; v->iov_len = strlen(fp_buf); } else { - v->iov_base=""; + v->iov_base = nul; v->iov_len = 0; } v++; @@ -1038,7 +1039,7 @@ fprintlog(struct filed *f, int flags, const char *msg) v->iov_base = f->f_prevhost; v->iov_len = strlen(v->iov_base); v++; - v->iov_base = " "; + v->iov_base = space; v->iov_len = 1; v++; @@ -1074,11 +1075,12 @@ fprintlog(struct filed *f, int flags, const char *msg) if (strcasecmp(f->f_prevhost, LocalHostName)) l = snprintf(line, sizeof line - 1, "<%d>%.15s Forwarded from %s: %s", - f->f_prevpri, iov[0].iov_base, f->f_prevhost, - iov[5].iov_base); + f->f_prevpri, (char *)iov[0].iov_base, + f->f_prevhost, (char *)iov[5].iov_base); else l = snprintf(line, sizeof line - 1, "<%d>%.15s %s", - f->f_prevpri, iov[0].iov_base, iov[5].iov_base); + f->f_prevpri, (char *)iov[0].iov_base, + (char *)iov[5].iov_base); if (l < 0) l = 0; else if (l > MAXLINE) @@ -1132,7 +1134,7 @@ fprintlog(struct filed *f, int flags, const char *msg) case F_FILE: dprintf(" %s\n", f->f_un.f_fname); - v->iov_base = "\n"; + v->iov_base = lf; v->iov_len = 1; if (writev(f->f_file, iov, 7) < 0) { int e = errno; @@ -1146,7 +1148,7 @@ fprintlog(struct filed *f, int flags, const char *msg) case F_PIPE: dprintf(" %s\n", f->f_un.f_pipe.f_pname); - v->iov_base = "\n"; + v->iov_base = lf; v->iov_len = 1; if (f->f_un.f_pipe.f_pid == 0) { if ((f->f_file = p_open(f->f_un.f_pipe.f_pname, @@ -1177,7 +1179,7 @@ fprintlog(struct filed *f, int flags, const char *msg) case F_TTY: dprintf(" %s%s\n", _PATH_DEV, f->f_un.f_fname); - v->iov_base = "\r\n"; + v->iov_base = crlf; v->iov_len = 2; errno = 0; /* ttymsg() only sometimes returns an errno */ @@ -1190,7 +1192,7 @@ fprintlog(struct filed *f, int flags, const char *msg) case F_USERS: case F_WALL: dprintf("\n"); - v->iov_base = "\r\n"; + v->iov_base = crlf; v->iov_len = 2; wallmsg(f, iov); break; |