Module Name: src
Committed By: sborrill
Date: Tue May 26 20:29:04 UTC 2009
Modified Files:
src/distrib/utils/sysinst/arch/mac68k: md.c
Log Message:
Fix build by explicitly narrowing dlsize to an unsigned 32-bit quantity as
supported by disklabel.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/distrib/utils/sysinst/arch/mac68k/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/mac68k/md.c
diff -u src/distrib/utils/sysinst/arch/mac68k/md.c:1.53 src/distrib/utils/sysinst/arch/mac68k/md.c:1.54
--- src/distrib/utils/sysinst/arch/mac68k/md.c:1.53 Tue Oct 7 09:58:15 2008
+++ src/distrib/utils/sysinst/arch/mac68k/md.c Tue May 26 20:29:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.53 2008/10/07 09:58:15 abs Exp $ */
+/* $NetBSD: md.c,v 1.54 2009/05/26 20:29:04 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -44,6 +44,7 @@
#include <fcntl.h>
#include <sys/ioctl.h>
#include <sys/utsname.h>
+#include <machine/int_fmtio.h>
#include "defs.h"
#include "md.h"
#include "msg_defs.h"
@@ -1083,7 +1084,7 @@
(void)fprintf (f, "%s|NetBSD installation generated:\\\n", bsddiskname);
(void)fprintf (f, "\t:dt=%s:ty=winchester:\\\n", disktype);
(void)fprintf (f, "\t:nc#%d:nt#%d:ns#%d:\\\n", dlcyl, dlhead, dlsec);
- (void)fprintf (f, "\t:sc#%d:su#%d:\\\n", dlhead*dlsec, dlsize);
+ (void)fprintf (f, "\t:sc#%d:su#%" PRIu32 ":\\\n", dlhead*dlsec, (uint32_t)dlsize);
(void)fprintf (f, "\t:se#%d:%s\\\n", blk_size, doessf);
for (i=0; i<8; i++) {
if (bsdlabel[i].pi_fstype == FS_HFS)
