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