From owner-svn-src-user@FreeBSD.ORG Sun Aug 22 22:36:34 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 24D7D1065695;
Sun, 22 Aug 2010 22:36:34 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 14C028FC12;
Sun, 22 Aug 2010 22:36:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7MMaXxN018983;
Sun, 22 Aug 2010 22:36:33 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7MMaXCk018981;
Sun, 22 Aug 2010 22:36:33 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201008222236.o7MMaXCk018981@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 22 Aug 2010 22:36:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r211664 - user/imp/tbemd/sys/contrib/dev/acpica/compiler
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Aug 2010 22:36:34 -0000
Author: imp
Date: Sun Aug 22 22:36:33 2010
New Revision: 211664
URL: http://svn.freebsd.org/changeset/base/211664
Log:
Merge this last bit by hand...
Modified:
user/imp/tbemd/sys/contrib/dev/acpica/compiler/aslpredef.c
Modified: user/imp/tbemd/sys/contrib/dev/acpica/compiler/aslpredef.c
==============================================================================
--- user/imp/tbemd/sys/contrib/dev/acpica/compiler/aslpredef.c Sun Aug 22 22:32:39 2010 (r211663)
+++ user/imp/tbemd/sys/contrib/dev/acpica/compiler/aslpredef.c Sun Aug 22 22:36:33 2010 (r211664)
@@ -251,7 +251,7 @@ ApCheckForPredefinedMethod (
if (MethodInfo->NumArguments != 0)
{
- sprintf (MsgBuffer, "%s requires %d", Op->Asl.ExternalName, 0);
+ sprintf (MsgBuffer, "%s requires %u", Op->Asl.ExternalName, 0);
AslError (ASL_WARNING, ASL_MSG_RESERVED_ARG_COUNT_HI, Op,
MsgBuffer);
@@ -274,7 +274,7 @@ ApCheckForPredefinedMethod (
if ((MethodInfo->NumArguments != RequiredArgsCurrent) &&
(MethodInfo->NumArguments != RequiredArgsOld))
{
- sprintf (MsgBuffer, "%4.4s requires %d",
+ sprintf (MsgBuffer, "%4.4s requires %u",
PredefinedNames[Index].Info.Name, RequiredArgsCurrent);
if (MethodInfo->NumArguments > RequiredArgsCurrent)
@@ -731,7 +731,7 @@ ApDisplayReservedNames (
ThisName = PredefinedNames;
while (ThisName->Info.Name[0])
{
- printf ("%4.4s Requires %d arguments, ",
+ printf ("%4.4s Requires %u arguments, ",
ThisName->Info.Name, ThisName->Info.ParamCount & 0x0F);
if (ThisName->Info.ExpectedBtypes)