Module Name: src
Committed By: mlelstv
Date: Sun Mar 12 21:02:48 UTC 2017
Modified Files:
src/sys/arch/amiga/amiga: disksubr.c
Log Message:
use printf format macros for fixed-sized integers.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/amiga/amiga/disksubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/amiga/disksubr.c
diff -u src/sys/arch/amiga/amiga/disksubr.c:1.66 src/sys/arch/amiga/amiga/disksubr.c:1.67
--- src/sys/arch/amiga/amiga/disksubr.c:1.66 Mon Feb 27 15:59:36 2017
+++ src/sys/arch/amiga/amiga/disksubr.c Sun Mar 12 21:02:47 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.66 2017/02/27 15:59:36 rin Exp $ */
+/* $NetBSD: disksubr.c,v 1.67 2017/03/12 21:02:47 mlelstv Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.66 2017/02/27 15:59:36 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.67 2017/03/12 21:02:47 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -262,13 +262,13 @@ readdisklabel(dev_t dev, void (*strat)(s
lp->d_secpercyl = lp->d_nsectors * lp->d_ntracks;
#ifdef DIAGNOSTIC
if (lp->d_ncylinders != rbp->ncylinders)
- printf("warning found rdb->ncylinders(%ld) != "
- "rdb->highcyl(%ld) + 1\n", rbp->ncylinders,
+ printf("warning found rdb->ncylinders(%" PRIu32 ") != "
+ "rdb->highcyl(%" PRIu32 ") + 1\n", rbp->ncylinders,
rbp->highcyl);
if (lp->d_nsectors * lp->d_ntracks != rbp->secpercyl)
- printf("warning found rdb->secpercyl(%ld) != "
- "rdb->nsectors(%ld) * rdb->nheads(%ld)\n", rbp->secpercyl,
- rbp->nsectors, rbp->nheads);
+ printf("warning found rdb->secpercyl(%" PRIu32 ") != "
+ "rdb->nsectors(%" PRIu32 ") * rdb->nheads(%" PRIu32 ")\n",
+ rbp->secpercyl, rbp->nsectors, rbp->nheads);
#endif
lp->d_sparespercyl =
max(rbp->secpercyl, lp->d_nsectors * lp->d_ntracks)
@@ -386,7 +386,8 @@ readdisklabel(dev_t dev, void (*strat)(s
pbp->partname[pbp->partname[0] + 1] = 0;
else
pbp->partname[sizeof(pbp->partname) - 1] = 0;
- printf("Partition '%s' geometry %ld/%ld differs",
+ printf("Partition '%s' geometry %" PRIu32 "/%" PRIu32
+ " differs",
pbp->partname + 1, pbp->e.numheads,
pbp->e.secpertrk);
printf(" from RDB %d/%d=%d\n", lp->d_ntracks,
