Module Name: src Committed By: riz Date: Wed Nov 24 19:12:44 UTC 2010
Modified Files: src/sbin/gpt [netbsd-5]: gpt.c Log Message: Pull up following revision(s) (requested by christos in ticket #1464): sbin/gpt/gpt.c: revision 1.11 sbin/gpt/gpt.c: revision 1.12 PR/43105: Peter Kerwien: Destroying a GPT partition with dd will cause gpt destroy / create to fail. When reading the GPT label from the end of the disk ignore errors if the GPT label at the beginning of the disk was not found. fix printf format. To generate a diff of this commit: cvs rdiff -u -r1.8.6.1 -r1.8.6.2 src/sbin/gpt/gpt.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/gpt/gpt.c diff -u src/sbin/gpt/gpt.c:1.8.6.1 src/sbin/gpt/gpt.c:1.8.6.2 --- src/sbin/gpt/gpt.c:1.8.6.1 Sun Nov 21 21:59:38 2010 +++ src/sbin/gpt/gpt.c Wed Nov 24 19:12:44 2010 @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $"); #endif #ifdef __RCSID -__RCSID("$NetBSD: gpt.c,v 1.8.6.1 2010/11/21 21:59:38 riz Exp $"); +__RCSID("$NetBSD: gpt.c,v 1.8.6.2 2010/11/24 19:12:44 riz Exp $"); #endif #include <sys/param.h> @@ -597,7 +597,8 @@ if (found) { if (verbose) warn("%s: Cannot read LBA table at sector %llu", - device_name, le64toh(hdr->hdr_lba_table)); + device_name, (unsigned long long) + le64toh(hdr->hdr_lba_table)); return (-1); } goto fail_hdr;