|
 |
8c2ae8 |
Index: acpica-unix2-20180209/source/compiler/aslanalyze.c
|
|
|
8c2ae8 |
===================================================================
|
|
|
8c2ae8 |
--- acpica-unix2-20180209.orig/source/compiler/aslanalyze.c
|
|
|
8c2ae8 |
+++ acpica-unix2-20180209/source/compiler/aslanalyze.c
|
|
|
8c2ae8 |
@@ -355,11 +355,16 @@ AnCheckMethodReturnValue (
|
|
|
8c2ae8 |
*/
|
|
|
8c2ae8 |
if (ThisNodeBtype != 0)
|
|
|
8c2ae8 |
{
|
|
|
8c2ae8 |
- sprintf (MsgBuffer,
|
|
|
8c2ae8 |
+ int cnt;
|
|
|
8c2ae8 |
+ char *strp;
|
|
|
8c2ae8 |
+
|
|
|
8c2ae8 |
+ cnt = asprintf (&strp,
|
|
|
8c2ae8 |
"Method returns [%s], %s operator requires [%s]",
|
|
|
8c2ae8 |
StringBuffer, OpInfo->Name, StringBuffer2);
|
|
|
8c2ae8 |
|
|
|
8c2ae8 |
- AslError (ASL_ERROR, ASL_MSG_INVALID_TYPE, ArgOp, MsgBuffer);
|
|
|
8c2ae8 |
+ AslError (ASL_ERROR, ASL_MSG_INVALID_TYPE, ArgOp, strp);
|
|
|
8c2ae8 |
+ if (cnt > 0)
|
|
|
8c2ae8 |
+ free(strp);
|
|
|
8c2ae8 |
}
|
|
|
8c2ae8 |
}
|
|
|
8c2ae8 |
}
|
|
|
8c2ae8 |
Index: acpica-unix2-20180209/source/compiler/aslpredef.c
|
|
|
8c2ae8 |
===================================================================
|
|
|
8c2ae8 |
--- acpica-unix2-20180209.orig/source/compiler/aslpredef.c
|
|
|
8c2ae8 |
+++ acpica-unix2-20180209/source/compiler/aslpredef.c
|
|
|
8c2ae8 |
@@ -159,14 +159,19 @@ ApCheckForPredefinedMethod (
|
|
|
8c2ae8 |
if (MethodInfo->NumReturnNoValue &&
|
|
|
8c2ae8 |
ThisName->Info.ExpectedBtypes)
|
|
|
8c2ae8 |
{
|
|
|
8c2ae8 |
+ int cnt;
|
|
|
8c2ae8 |
+ char *strp;
|
|
|
8c2ae8 |
+
|
|
|
8c2ae8 |
AcpiUtGetExpectedReturnTypes (StringBuffer,
|
|
|
8c2ae8 |
ThisName->Info.ExpectedBtypes);
|
|
|
8c2ae8 |
|
|
|
8c2ae8 |
- sprintf (MsgBuffer, "%s required for %4.4s",
|
|
|
8c2ae8 |
- StringBuffer, ThisName->Info.Name);
|
|
|
8c2ae8 |
+ cnt = asprintf (&strp, "%s required for %4.4s",
|
|
|
8c2ae8 |
+ StringBuffer, ThisName->Info.Name);
|
|
|
8c2ae8 |
|
|
|
8c2ae8 |
AslError (ASL_WARNING, ASL_MSG_RESERVED_RETURN_VALUE, Op,
|
|
|
8c2ae8 |
- MsgBuffer);
|
|
|
8c2ae8 |
+ strp);
|
|
|
8c2ae8 |
+ if (cnt > 0)
|
|
|
8c2ae8 |
+ free(strp);
|
|
|
8c2ae8 |
}
|
|
|
8c2ae8 |
break;
|
|
|
8c2ae8 |
}
|
|
|
8c2ae8 |
@@ -698,18 +703,26 @@ TypeErrorExit:
|
|
|
8c2ae8 |
|
|
|
8c2ae8 |
AcpiUtGetExpectedReturnTypes (StringBuffer, ExpectedBtypes);
|
|
|
8c2ae8 |
|
|
|
8c2ae8 |
- if (PackageIndex == ACPI_NOT_PACKAGE_ELEMENT)
|
|
|
8c2ae8 |
- {
|
|
|
8c2ae8 |
- sprintf (MsgBuffer, "%4.4s: found %s, %s required",
|
|
|
8c2ae8 |
- PredefinedName, TypeName, StringBuffer);
|
|
|
8c2ae8 |
- }
|
|
|
8c2ae8 |
- else
|
|
|
8c2ae8 |
{
|
|
|
8c2ae8 |
- sprintf (MsgBuffer, "%4.4s: found %s at index %u, %s required",
|
|
|
8c2ae8 |
- PredefinedName, TypeName, PackageIndex, StringBuffer);
|
|
|
8c2ae8 |
+ int cnt;
|
|
|
8c2ae8 |
+ char *strp;
|
|
|
8c2ae8 |
+
|
|
|
8c2ae8 |
+ if (PackageIndex == ACPI_NOT_PACKAGE_ELEMENT)
|
|
|
8c2ae8 |
+ {
|
|
|
8c2ae8 |
+ cnt = asprintf (&strp, "%4.4s: found %s, %s required",
|
|
|
8c2ae8 |
+ PredefinedName, TypeName, StringBuffer);
|
|
|
8c2ae8 |
+ }
|
|
|
8c2ae8 |
+ else
|
|
|
8c2ae8 |
+ {
|
|
|
8c2ae8 |
+ cnt = asprintf (&strp, "%4.4s: found %s at index %u, %s required",
|
|
|
8c2ae8 |
+ PredefinedName, TypeName, PackageIndex, StringBuffer);
|
|
|
8c2ae8 |
+ }
|
|
|
8c2ae8 |
+
|
|
|
8c2ae8 |
+ AslError (ASL_ERROR, ASL_MSG_RESERVED_OPERAND_TYPE, Op, strp);
|
|
|
8c2ae8 |
+ if (cnt > 0)
|
|
|
8c2ae8 |
+ free(strp);
|
|
|
8c2ae8 |
}
|
|
|
8c2ae8 |
|
|
|
8c2ae8 |
- AslError (ASL_ERROR, ASL_MSG_RESERVED_OPERAND_TYPE, Op, MsgBuffer);
|
|
|
8c2ae8 |
return (AE_TYPE);
|
|
|
8c2ae8 |
}
|
|
|
8c2ae8 |
|
|
|
8c2ae8 |
Index: acpica-unix2-20180209/source/compiler/aslwalks.c
|
|
|
8c2ae8 |
===================================================================
|
|
|
8c2ae8 |
--- acpica-unix2-20180209.orig/source/compiler/aslwalks.c
|
|
|
8c2ae8 |
+++ acpica-unix2-20180209/source/compiler/aslwalks.c
|
|
|
8c2ae8 |
@@ -507,15 +507,19 @@ AnOperandTypecheckWalkEnd (
|
|
|
8c2ae8 |
else if (!CommonBtypes)
|
|
|
8c2ae8 |
{
|
|
|
8c2ae8 |
/* No match -- this is a type mismatch error */
|
|
|
8c2ae8 |
+ int cnt;
|
|
|
8c2ae8 |
+ char *strp;
|
|
|
8c2ae8 |
|
|
|
8c2ae8 |
AnFormatBtype (StringBuffer, ThisNodeBtype);
|
|
|
8c2ae8 |
AnFormatBtype (StringBuffer2, RequiredBtypes);
|
|
|
8c2ae8 |
|
|
|
8c2ae8 |
- sprintf (MsgBuffer, "[%s] found, %s operator requires [%s]",
|
|
|
8c2ae8 |
+ cnt = asprintf (&strp, "[%s] found, %s operator requires [%s]",
|
|
|
8c2ae8 |
StringBuffer, OpInfo->Name, StringBuffer2);
|
|
|
8c2ae8 |
|
|
|
8c2ae8 |
AslError (ASL_ERROR, ASL_MSG_INVALID_TYPE,
|
|
|
8c2ae8 |
- ArgOp, MsgBuffer);
|
|
|
8c2ae8 |
+ ArgOp, strp);
|
|
|
8c2ae8 |
+ if (cnt > 0)
|
|
|
8c2ae8 |
+ free(strp);
|
|
|
8c2ae8 |
}
|
|
|
8c2ae8 |
|
|
|
8c2ae8 |
NextArgument:
|