Module Name: src
Committed By: christos
Date: Wed Jun 6 00:33:45 UTC 2012
Modified Files:
src/usr.sbin/syslogd: Makefile sign.c syslogd.c tls.c
Log Message:
WARNS=4
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/syslogd/Makefile
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/syslogd/sign.c
cvs rdiff -u -r1.108 -r1.109 src/usr.sbin/syslogd/syslogd.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/syslogd/tls.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/syslogd/Makefile
diff -u src/usr.sbin/syslogd/Makefile:1.23 src/usr.sbin/syslogd/Makefile:1.24
--- src/usr.sbin/syslogd/Makefile:1.23 Wed Jun 9 17:55:42 2010
+++ src/usr.sbin/syslogd/Makefile Tue Jun 5 20:33:45 2012
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2010/06/09 21:55:42 riz Exp $
+# $NetBSD: Makefile,v 1.24 2012/06/06 00:33:45 christos Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk>
+WARNS?=4
USE_FORT?= yes # network server
LINTFLAGS+=-X 132,247,135,259,117,298
Index: src/usr.sbin/syslogd/sign.c
diff -u src/usr.sbin/syslogd/sign.c:1.4 src/usr.sbin/syslogd/sign.c:1.5
--- src/usr.sbin/syslogd/sign.c:1.4 Mon Feb 13 02:40:24 2012
+++ src/usr.sbin/syslogd/sign.c Tue Jun 5 20:33:45 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sign.c,v 1.4 2012/02/13 07:40:24 spz Exp $ */
+/* $NetBSD: sign.c,v 1.5 2012/06/06 00:33:45 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: sign.c,v 1.4 2012/02/13 07:40:24 spz Exp $");
+__RCSID("$NetBSD: sign.c,v 1.5 2012/06/06 00:33:45 christos Exp $");
#ifndef DISABLE_SIGN
#include "syslogd.h"
@@ -154,7 +154,7 @@ sign_global_init(struct filed *Files)
* GlobalSign.privkey, and GlobalSign.pubkey
*/
bool
-sign_get_keys()
+sign_get_keys(void)
{
EVP_PKEY *pubkey = NULL, *privkey = NULL;
unsigned char *der_pubkey = NULL, *ptr_der_pubkey = NULL;
@@ -447,7 +447,7 @@ sign_sg_init(struct filed *Files)
* free all SGs for a given algorithm
*/
void
-sign_global_free()
+sign_global_free(void)
{
struct signature_group_t *sg, *tmp_sg;
struct filed_queue *fq, *tmp_fq;
@@ -894,7 +894,7 @@ sign_string_sign(char *line, char **sign
}
void
-sign_new_reboot_session()
+sign_new_reboot_session(void)
{
struct signature_group_t *sg;
@@ -930,7 +930,7 @@ sign_assign_msg_num(struct signature_gro
/* increment gbc, check overflow */
void
-sign_inc_gbc()
+sign_inc_gbc(void)
{
if (++GlobalSign.gbc > SIGN_MAX_COUNT)
sign_new_reboot_session();
Index: src/usr.sbin/syslogd/syslogd.c
diff -u src/usr.sbin/syslogd/syslogd.c:1.108 src/usr.sbin/syslogd/syslogd.c:1.109
--- src/usr.sbin/syslogd/syslogd.c:1.108 Tue Jun 5 15:33:17 2012
+++ src/usr.sbin/syslogd/syslogd.c Tue Jun 5 20:33:45 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: syslogd.c,v 1.108 2012/06/05 19:33:17 christos Exp $ */
+/* $NetBSD: syslogd.c,v 1.109 2012/06/06 00:33:45 christos Exp $ */
/*
* Copyright (c) 1983, 1988, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94";
#else
-__RCSID("$NetBSD: syslogd.c,v 1.108 2012/06/05 19:33:17 christos Exp $");
+__RCSID("$NetBSD: syslogd.c,v 1.109 2012/06/06 00:33:45 christos Exp $");
#endif
#endif /* not lint */
@@ -4725,9 +4725,9 @@ writev1(int fd, struct iovec *iov, size_
default:
tot += nw;
while (nw > 0) {
- if (iov->iov_len > nw) {
+ if (iov->iov_len > (size_t)nw) {
iov->iov_len -= nw;
- iov->iov_base += nw;
+ iov->iov_base = (char *)iov->iov_base + nw;
break;
} else {
if (count-- == 0)
Index: src/usr.sbin/syslogd/tls.c
diff -u src/usr.sbin/syslogd/tls.c:1.9 src/usr.sbin/syslogd/tls.c:1.10
--- src/usr.sbin/syslogd/tls.c:1.9 Mon Feb 13 02:40:24 2012
+++ src/usr.sbin/syslogd/tls.c Tue Jun 5 20:33:45 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: tls.c,v 1.9 2012/02/13 07:40:24 spz Exp $ */
+/* $NetBSD: tls.c,v 1.10 2012/06/06 00:33:45 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: tls.c,v 1.9 2012/02/13 07:40:24 spz Exp $");
+__RCSID("$NetBSD: tls.c,v 1.10 2012/06/06 00:33:45 christos Exp $");
#ifndef DISABLE_TLS
#include "syslogd.h"
@@ -143,7 +143,7 @@ getVerifySetting(const char *x509verifys
* calls die() on serious error.
*/
char*
-init_global_TLS_CTX()
+init_global_TLS_CTX(void)
{
const char *keyfilename = tls_opt.keyfile;
const char *certfilename = tls_opt.certfile;
