Module Name: src
Committed By: apb
Date: Sun Aug 17 07:05:44 UTC 2014
Modified Files:
src/sbin/ccdconfig: ccdconfig.c
Log Message:
Don't print ccd_size with %zu; it no longer has type size_t.
Instead, cast to uintmax_t and print with %ju.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sbin/ccdconfig/ccdconfig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ccdconfig/ccdconfig.c
diff -u src/sbin/ccdconfig/ccdconfig.c:1.54 src/sbin/ccdconfig/ccdconfig.c:1.55
--- src/sbin/ccdconfig/ccdconfig.c:1.54 Sat Aug 16 19:27:27 2014
+++ src/sbin/ccdconfig/ccdconfig.c Sun Aug 17 07:05:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ccdconfig.c,v 1.54 2014/08/16 19:27:27 sborrill Exp $ */
+/* $NetBSD: ccdconfig.c,v 1.55 2014/08/17 07:05:44 apb Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1996, 1997\
The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: ccdconfig.c,v 1.54 2014/08/16 19:27:27 sborrill Exp $");
+__RCSID("$NetBSD: ccdconfig.c,v 1.55 2014/08/17 07:05:44 apb Exp $");
#endif
#include <sys/param.h>
@@ -445,8 +445,9 @@ print_ccd_info(int u, struct ccddiskinfo
}
/* Dump out softc information. */
- printf("ccd%d\t\t%d\t0x%x\t%zu\t", u, ccd->ccd_ileave,
- ccd->ccd_flags & CCDF_USERMASK, ccd->ccd_size * DEV_BSIZE);
+ printf("ccd%d\t\t%d\t0x%x\t%ju\t", u, ccd->ccd_ileave,
+ ccd->ccd_flags & CCDF_USERMASK,
+ (uintmax_t)ccd->ccd_size * DEV_BSIZE);
/* Read component pathname and display component info. */
for (size_t i = 0; i < ccd->ccd_ndisks; ++i) {
