[src/trunk]: src/usr.sbin/syslogd WARNS=4

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/93c1c1e3ad03
branches:  trunk
changeset: 779627:93c1c1e3ad03
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Jun 06 00:33:45 2012 +0000

description:
WARNS=4

diffstat:

 usr.sbin/syslogd/Makefile  |   3 ++-
 usr.sbin/syslogd/sign.c    |  12 ++++++------
 usr.sbin/syslogd/syslogd.c |   8 ++++----
 usr.sbin/syslogd/tls.c     |   6 +++---
 4 files changed, 15 insertions(+), 14 deletions(-)

diffs (124 lines):

diff -r 60587e117369 -r 93c1c1e3ad03 usr.sbin/syslogd/Makefile
--- a/usr.sbin/syslogd/Makefile Wed Jun 06 00:28:02 2012 +0000
+++ b/usr.sbin/syslogd/Makefile Wed Jun 06 00:33:45 2012 +0000
@@ -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
diff -r 60587e117369 -r 93c1c1e3ad03 usr.sbin/syslogd/sign.c
--- a/usr.sbin/syslogd/sign.c   Wed Jun 06 00:28:02 2012 +0000
+++ b/usr.sbin/syslogd/sign.c   Wed Jun 06 00:33:45 2012 +0000
@@ -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 @@
  * 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 @@
  * 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 @@
 }
 
 void
-sign_new_reboot_session()
+sign_new_reboot_session(void)
 {
        struct signature_group_t *sg;
 
@@ -930,7 +930,7 @@
 
 /* increment gbc, check overflow */
 void
-sign_inc_gbc()
+sign_inc_gbc(void)
 {
        if (++GlobalSign.gbc > SIGN_MAX_COUNT)
                sign_new_reboot_session();
diff -r 60587e117369 -r 93c1c1e3ad03 usr.sbin/syslogd/syslogd.c
--- a/usr.sbin/syslogd/syslogd.c        Wed Jun 06 00:28:02 2012 +0000
+++ b/usr.sbin/syslogd/syslogd.c        Wed Jun 06 00:33:45 2012 +0000
@@ -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 @@
 #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 @@
                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)
diff -r 60587e117369 -r 93c1c1e3ad03 usr.sbin/syslogd/tls.c
--- a/usr.sbin/syslogd/tls.c    Wed Jun 06 00:28:02 2012 +0000
+++ b/usr.sbin/syslogd/tls.c    Wed Jun 06 00:33:45 2012 +0000
@@ -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 @@
  * 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;