From owner-svn-src-head@FreeBSD.ORG  Tue Apr  8 18:02:33 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 81055B16;
 Tue,  8 Apr 2014 18:02:33 +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 61D2E1FA2;
 Tue,  8 Apr 2014 18:02:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s38I2X47040255;
 Tue, 8 Apr 2014 18:02:33 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s38I2XMh040254;
 Tue, 8 Apr 2014 18:02:33 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201404081802.s38I2XMh040254@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 8 Apr 2014 18:02:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r264262 - head/sys/boot/ficl
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Apr 2014 18:02:33 -0000

Author: emaste
Date: Tue Apr  8 18:02:32 2014
New Revision: 264262
URL: http://svnweb.freebsd.org/changeset/base/264262

Log:
  Fix printf args for 64-bit archs
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/boot/ficl/tools.c

Modified: head/sys/boot/ficl/tools.c
==============================================================================
--- head/sys/boot/ficl/tools.c	Tue Apr  8 17:50:27 2014	(r264261)
+++ head/sys/boot/ficl/tools.c	Tue Apr  8 18:02:32 2014	(r264262)
@@ -201,7 +201,7 @@ static void seeColon(FICL_VM *pVM, CELL 
 			*cp++ = '>';
 		else
 			*cp++ = ' ';
-        cp += sprintf(cp, "%3d   ", pc-param0);
+        cp += sprintf(cp, "%3d   ", (int)(pc-param0));
         
         if (isAFiclWord(pd, pFW))
         {
@@ -239,40 +239,40 @@ static void seeColon(FICL_VM *pVM, CELL 
             case IF:
                 c = *++pc;
                 if (c.i > 0)
-                    sprintf(cp, "if / while (branch %d)", pc+c.i-param0);
+                    sprintf(cp, "if / while (branch %d)", (int)(pc+c.i-param0));
                 else
-                    sprintf(cp, "until (branch %d)",      pc+c.i-param0);
+                    sprintf(cp, "until (branch %d)",      (int)(pc+c.i-param0));
                 break;                                                           
             case BRANCH:
                 c = *++pc;
                 if (c.i == 0)
-                    sprintf(cp, "repeat (branch %d)",     pc+c.i-param0);
+                    sprintf(cp, "repeat (branch %d)",     (int)(pc+c.i-param0));
                 else if (c.i == 1)
-                    sprintf(cp, "else (branch %d)",       pc+c.i-param0);
+                    sprintf(cp, "else (branch %d)",       (int)(pc+c.i-param0));
                 else
-                    sprintf(cp, "endof (branch %d)",       pc+c.i-param0);
+                    sprintf(cp, "endof (branch %d)",      (int)(pc+c.i-param0));
                 break;
 
             case OF:
                 c = *++pc;
-                sprintf(cp, "of (branch %d)",       pc+c.i-param0);
+                sprintf(cp, "of (branch %d)",       (int)(pc+c.i-param0));
                 break;
 
             case QDO:
                 c = *++pc;
-                sprintf(cp, "?do (leave %d)",  (CELL *)c.p-param0);
+                sprintf(cp, "?do (leave %d)",  (int)((CELL *)c.p-param0));
                 break;
             case DO:
                 c = *++pc;
-                sprintf(cp, "do (leave %d)", (CELL *)c.p-param0);
+                sprintf(cp, "do (leave %d)", (int)((CELL *)c.p-param0));
                 break;
             case LOOP:
                 c = *++pc;
-                sprintf(cp, "loop (branch %d)", pc+c.i-param0);
+                sprintf(cp, "loop (branch %d)", (int)(pc+c.i-param0));
                 break;
             case PLOOP:
                 c = *++pc;
-                sprintf(cp, "+loop (branch %d)", pc+c.i-param0);
+                sprintf(cp, "+loop (branch %d)", (int)(pc+c.i-param0));
                 break;
             default:
                 sprintf(cp, "%.*s", pFW->nName, pFW->name);