From owner-svn-src-user@FreeBSD.ORG Sat Mar 29 03:55:59 2014 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 659317A9; Sat, 29 Mar 2014 03:55:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 52AECE14; Sat, 29 Mar 2014 03:55:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2T3txdv050680; Sat, 29 Mar 2014 03:55:59 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2T3twEe050677; Sat, 29 Mar 2014 03:55:58 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201403290355.s2T3twEe050677@svn.freebsd.org> From: Marcel Moolenaar Date: Sat, 29 Mar 2014 03:55:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r263897 - user/marcel/mkimg X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Mar 2014 03:55:59 -0000 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)