[src/netbsd-1-4]: src/usr.sbin/rbootd Pull up revision 1.12 (requested by he):

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

details:   https://anonhg.NetBSD.org/src/rev/f415b1c88917
branches:  netbsd-1-4
changeset: 471138:f415b1c88917
user:      he <he%NetBSD.org@localhost>
date:      Thu Oct 19 17:05:47 2000 +0000

description:
Pull up revision 1.12 (requested by he):
  Format string cleanup.

diffstat:

 usr.sbin/rbootd/utils.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (65 lines):

diff -r bfc3f13d066a -r f415b1c88917 usr.sbin/rbootd/utils.c
--- a/usr.sbin/rbootd/utils.c   Thu Oct 19 17:05:45 2000 +0000
+++ b/usr.sbin/rbootd/utils.c   Thu Oct 19 17:05:47 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: utils.c,v 1.10 1998/12/09 03:41:42 mrg Exp $   */
+/*     $NetBSD: utils.c,v 1.10.2.1 2000/10/19 17:05:47 he Exp $        */
 
 /*
  * Copyright (c) 1988, 1992 The University of Utah and the Center
@@ -51,7 +51,7 @@
 #if 0
 static char sccsid[] = "@(#)utils.c    8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: utils.c,v 1.10 1998/12/09 03:41:42 mrg Exp $");
+__RCSID("$NetBSD: utils.c,v 1.10.2.1 2000/10/19 17:05:47 he Exp $");
 #endif
 #endif /* not lint */
 
@@ -85,8 +85,8 @@
        RMPCONN *rconn;
        int direct;
 {
-       static char BootFmt[] = "\t\tRetCode:%u SeqNo:%lx SessID:%x Vers:%u";
-       static char ReadFmt[] = "\t\tRetCode:%u Offset:%lx SessID:%x\n";
+       static const char BootFmt[] = "\t\tRetCode:%u SeqNo:%lx SessID:%x Vers:%u";
+       static const char ReadFmt[] = "\t\tRetCode:%u Offset:%lx SessID:%x\n";
 
        struct tm *tmp;
        struct rmp_packet *rmp;
@@ -141,7 +141,7 @@
                        }
                        (void) fputc('\n', DbgFp);
                        (void) fprintf(DbgFp, BootFmt, rmp->r_brq.rmp_retcode,
-                               t, ntohs(rmp->r_brq.rmp_session),
+                               (unsigned long)t, ntohs(rmp->r_brq.rmp_session),
                                ntohs(rmp->r_brq.rmp_version));
                        (void) fprintf(DbgFp, "\n\t\tMachine Type: ");
                        for (i = 0; i < RMP_MACHLEN; i++)
@@ -152,7 +152,7 @@
                        fprintf(DbgFp, "\tBoot Reply:\n");
                        GETWORD(rmp->r_brpl.rmp_seqno, t);
                        (void) fprintf(DbgFp, BootFmt, rmp->r_brpl.rmp_retcode,
-                               t, ntohs(rmp->r_brpl.rmp_session),
+                               (unsigned long)t, ntohs(rmp->r_brpl.rmp_session),
                                ntohs(rmp->r_brpl.rmp_version));
                        DspFlnm(rmp->r_brpl.rmp_flnmsize,&rmp->r_brpl.rmp_flnm);
                        break;
@@ -160,7 +160,7 @@
                        (void) fprintf(DbgFp, "\tRead Request:\n");
                        GETWORD(rmp->r_rrq.rmp_offset, t);
                        (void) fprintf(DbgFp, ReadFmt, rmp->r_rrq.rmp_retcode,
-                               t, ntohs(rmp->r_rrq.rmp_session));
+                               (unsigned long)t, ntohs(rmp->r_rrq.rmp_session));
                        (void) fprintf(DbgFp, "\t\tNoOfBytes: %u\n",
                                ntohs(rmp->r_rrq.rmp_size));
                        break;
@@ -168,7 +168,7 @@
                        (void) fprintf(DbgFp, "\tRead Reply:\n");
                        GETWORD(rmp->r_rrpl.rmp_offset, t);
                        (void) fprintf(DbgFp, ReadFmt, rmp->r_rrpl.rmp_retcode,
-                               t, ntohs(rmp->r_rrpl.rmp_session));
+                               (unsigned long)t, ntohs(rmp->r_rrpl.rmp_session));
                        (void) fprintf(DbgFp, "\t\tNoOfBytesSent: %ld\n",
                                (long)(rconn->rmplen - RMPREADSIZE(0)));
                        break;