svn commit: r272382 - head/usr.bin/mkimg

Marcel Moolenaar marcel at FreeBSD.org
Wed Oct 1 20:37:16 UTC 2014


Author: marcel
Date: Wed Oct  1 20:37:15 2014
New Revision: 272382
URL: https://svnweb.freebsd.org/changeset/base/272382

Log:
  Suffix the cookie constants with ULL to silence warnings from compilers
  that try to treat them as 32-bit values.

Modified:
  head/usr.bin/mkimg/vhd.c

Modified: head/usr.bin/mkimg/vhd.c
==============================================================================
--- head/usr.bin/mkimg/vhd.c	Wed Oct  1 19:25:02 2014	(r272381)
+++ head/usr.bin/mkimg/vhd.c	Wed Oct  1 20:37:15 2014	(r272382)
@@ -64,7 +64,7 @@ __FBSDID("$FreeBSD$");
 
 struct vhd_footer {
 	uint64_t	cookie;
-#define	VHD_FOOTER_COOKIE	0x636f6e6563746978
+#define	VHD_FOOTER_COOKIE	0x636f6e6563746978ULL
 	uint32_t	features;
 #define	VHD_FEATURES_TEMPORARY	0x01
 #define	VHD_FEATURES_RESERVED	0x02
@@ -236,7 +236,7 @@ vhd_resize(lba_t imgsz)
 
 struct vhd_dyn_header {
 	uint64_t	cookie;
-#define	VHD_HEADER_COOKIE	0x6378737061727365
+#define	VHD_HEADER_COOKIE	0x6378737061727365ULL
 	uint64_t	data_offset;
 	uint64_t	table_offset;
 	uint32_t	version;


More information about the svn-src-all mailing list