[src/netbsd-1-5]: src/usr.sbin/rtsold Pullup 1.9 [itojun]:

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

details:   https://anonhg.NetBSD.org/src/rev/8fdd19ebb359
branches:  netbsd-1-5
changeset: 489874:8fdd19ebb359
user:      tv <tv%NetBSD.org@localhost>
date:      Wed Oct 18 02:22:45 2000 +0000

description:
Pullup 1.9 [itojun]:
printf-format audit.  from sommrfeld%netbsd.org@localhost.  sync with kame.

diffstat:

 usr.sbin/rtsold/rtsold.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r bdf4b0a4ccb7 -r 8fdd19ebb359 usr.sbin/rtsold/rtsold.c
--- a/usr.sbin/rtsold/rtsold.c  Wed Oct 18 02:22:30 2000 +0000
+++ b/usr.sbin/rtsold/rtsold.c  Wed Oct 18 02:22:45 2000 +0000
@@ -1,4 +1,5 @@
-/*     $NetBSD: rtsold.c,v 1.6 2000/02/25 09:19:08 itojun Exp $        */
+/*     $NetBSD: rtsold.c,v 1.6.4.1 2000/10/18 02:22:45 tv Exp $        */
+/*     $KAME: rtsold.c,v 1.27 2000/10/05 22:20:39 itojun Exp $ */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -210,7 +211,7 @@
 
                if ((fp = fopen(pidfilename, "w")) == NULL)
                        warnmsg(LOG_ERR, __FUNCTION__,
-                               "failed to open a log file(%s)",
+                               "failed to open a log file(%s): %s",
                                pidfilename, strerror(errno));
                else {
                        fprintf(fp, "%d\n", pid);
@@ -510,8 +511,8 @@
                TIMEVAL_SUB(&rtsol_timer, &now, &returnval);
 
        if (dflag > 1)
-               warnmsg(LOG_DEBUG, __FUNCTION__, "New timer is %d:%08d",
-                      returnval.tv_sec, returnval.tv_usec);
+               warnmsg(LOG_DEBUG, __FUNCTION__, "New timer is %ld:%08ld",
+                       (long)returnval.tv_sec, (long)returnval.tv_usec);
 
        return(&returnval);
 }
@@ -659,7 +660,8 @@
                }
        } else {
                snprintf(buf, sizeof(buf), "<%s> %s", func, msg);
-               vsyslog(priority, buf, ap);
+               msg = buf;
+               vsyslog(priority, msg, ap);
        }
        va_end(ap);
 }