svn commit: r263897 - user/marcel/mkimg

[Marcel Moolenaar]

Author: marcel
Date: Sat Mar 29 03:55:58 2014
New Revision: 263897
URL: http://svnweb.freebsd.org/changeset/base/263897

Log:
  Make this build on ia64 w/ gcc.

Modified:
  user/marcel/mkimg/gpt.c
  user/marcel/mkimg/mkimg.c

Modified: user/marcel/mkimg/gpt.c
==============================================================================
--- user/marcel/mkimg/gpt.c	Sat Mar 29 03:46:36 2014	(r263896)
+++ user/marcel/mkimg/gpt.c	Sat Mar 29 03:55:58 2014	(r263897)
@@ -124,7 +124,7 @@ crc32(const void *buf, size_t sz)
 }
 
 static u_int
-gpt_tblsz()
+gpt_tblsz(void)
 {
 	u_int ents;
 

Modified: user/marcel/mkimg/mkimg.c
==============================================================================
--- user/marcel/mkimg/mkimg.c	Sat Mar 29 03:46:36 2014	(r263896)
+++ user/marcel/mkimg/mkimg.c	Sat Mar 29 03:55:58 2014	(r263897)
@@ -239,7 +239,7 @@ sparse_write(int fd, const char *buf, si
 	wrsz = 0;
 	p = memchr(buf, 0, sz);
 	while (sz > 0) {
-		len = (p != NULL) ? p - buf : sz;
+		len = (p != NULL) ? (size_t)(p - buf) : sz;
 		if (len > 0) {
 			len = (len + secsz - 1) & ~(secsz - 1);
 			if (len > sz)
@@ -422,14 +422,14 @@ main(int argc, char *argv[])
 				errc(EX_DATAERR, error, "number of heads");
 			break;
 		case 'P':	/* GEOMETRY: PHYSICAL SECTOR SIZE */
-			error = parse_number(&blksz, 512, INT_MAX + 1, optarg);
+			error = parse_number(&blksz, 512, INT_MAX+1U, optarg);
 			if (error == 0 && !pwr_of_two(blksz))
 				error = EINVAL;
 			if (error)
 				errc(EX_DATAERR, error, "physical sector size");
 			break;
 		case 'S':	/* GEOMETRY: LOGICAL SECTOR SIZE */
-			error = parse_number(&secsz, 512, INT_MAX + 1, optarg);
+			error = parse_number(&secsz, 512, INT_MAX+1U, optarg);
 			if (error == 0 && !pwr_of_two(secsz))
 				error = EINVAL;
 			if (error)