]> git.pld-linux.org Git - packages/acpica.git/blame - int-format.patch
projects / packages / acpica.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- updated to 20181031
[packages/acpica.git] / int-format.patch
CommitLineData
77760c90
JB		 1Use proper integer formatting
2
3From: Al Stone <ahs3@redhat.com>
4
5
6---
7 source/compiler/aslcompile.c | 2 +-
8 source/compiler/aslerror.c | 4 ++--
9 source/compiler/aslopt.c | 2 +-
10 source/compiler/aslpredef.c | 2 +-
11 source/compiler/aslprepkg.c | 2 +-
12 source/components/debugger/dbexec.c | 2 +-
13 source/components/dispatcher/dsmthdat.c | 4 ++--
14 source/components/dispatcher/dsutils.c | 2 +-
15 source/components/dispatcher/dswscope.c | 4 ++--
16 source/components/events/evgpe.c | 4 ++--
17 source/components/executer/exdump.c | 2 +-
18 source/components/executer/exfldio.c | 4 ++--
19 source/components/executer/exnames.c | 4 ++--
20 source/components/hardware/hwregs.c | 2 +-
21 source/components/tables/tbfadt.c | 6 +++---
22 source/components/tables/tbxfroot.c | 6 +++---
23 source/components/utilities/utownerid.c | 2 +-
24 source/tools/acpiexec/aemain.c | 2 +-
25 18 files changed, 28 insertions(+), 28 deletions(-)
26
25d7dd99 27Index: acpica-unix2-20181003/source/compiler/aslerror.c
77760c90 28===================================================================
25d7dd99
JB		 29--- acpica-unix2-20181003.orig/source/compiler/aslerror.c
30+++ acpica-unix2-20181003/source/compiler/aslerror.c
31@@ -880,7 +880,7 @@ AslLogNewError (
32 AslGbl_ExceptionCount[Level]++;
33 if (AslGbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
77760c90
JB		 34 {
35- printf ("\nMaximum error count (%u) exceeded\n", ASL_MAX_ERROR_COUNT);
36+ printf ("\nMaximum error count (%d) exceeded\n", ASL_MAX_ERROR_COUNT);
37
25d7dd99
JB		 38 AslGbl_SourceLine = 0;
39 AslGbl_NextError = AslGbl_ErrorLog;
40Index: acpica-unix2-20181003/source/compiler/aslopt.c
77760c90 41===================================================================
25d7dd99
JB		 42--- acpica-unix2-20181003.orig/source/compiler/aslopt.c
43+++ acpica-unix2-20181003/source/compiler/aslopt.c
44@@ -583,7 +583,7 @@ OptOptimizeNamePath (
77760c90
JB		 45 }
46
47 ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OPTIMIZATIONS,
48- "PATH OPTIMIZE: Line %5d ParentOp [%12.12s] ThisOp [%12.12s] ",
49+ "PATH OPTIMIZE: Line %5u ParentOp [%12.12s] ThisOp [%12.12s] ",
50 Op->Asl.LogicalLineNumber,
51 AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode),
52 AcpiPsGetOpcodeName (Op->Common.AmlOpcode)));
25d7dd99 53Index: acpica-unix2-20181003/source/components/debugger/dbexec.c
77760c90 54===================================================================
25d7dd99
JB		 55--- acpica-unix2-20181003.orig/source/components/debugger/dbexec.c
56+++ acpica-unix2-20181003/source/components/debugger/dbexec.c
57@@ -230,7 +230,7 @@ AcpiDbExecuteMethod (
77760c90
JB		 58 ACPI_ERROR ((AE_INFO,
59 "Possible overflow of internal debugger "
60 "buffer (size 0x%X needed 0x%X)",
61- ACPI_DEBUG_BUFFER_SIZE, (UINT32) ReturnObj->Length));
62+ (UINT32) ACPI_DEBUG_BUFFER_SIZE, (UINT32) ReturnObj->Length));
63 }
64 }
65
25d7dd99 66Index: acpica-unix2-20181003/source/components/dispatcher/dsmthdat.c
77760c90 67===================================================================
25d7dd99
JB		 68--- acpica-unix2-20181003.orig/source/components/dispatcher/dsmthdat.c
69+++ acpica-unix2-20181003/source/components/dispatcher/dsmthdat.c
77760c90
JB		 70@@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode (
71 if (Index > ACPI_METHOD_MAX_LOCAL)
72 {
73 ACPI_ERROR ((AE_INFO,
74- "Local index %u is invalid (max %u)",
75+ "Local index %u is invalid (max %d)",
76 Index, ACPI_METHOD_MAX_LOCAL));
77 return_ACPI_STATUS (AE_AML_INVALID_INDEX);
78 }
79@@ -306,7 +306,7 @@ AcpiDsMethodDataGetNode (
80 if (Index > ACPI_METHOD_MAX_ARG)
81 {
82 ACPI_ERROR ((AE_INFO,
83- "Arg index %u is invalid (max %u)",
84+ "Arg index %u is invalid (max %d)",
85 Index, ACPI_METHOD_MAX_ARG));
86 return_ACPI_STATUS (AE_AML_INVALID_INDEX);
87 }
25d7dd99 88Index: acpica-unix2-20181003/source/components/dispatcher/dsutils.c
77760c90 89===================================================================
25d7dd99
JB		 90--- acpica-unix2-20181003.orig/source/components/dispatcher/dsutils.c
91+++ acpica-unix2-20181003/source/components/dispatcher/dsutils.c
92@@ -788,7 +788,7 @@ AcpiDsCreateOperands (
77760c90
JB		 93 }
94
95 ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
96- "NumOperands %d, ArgCount %d, Index %d\n",
97+ "NumOperands %d, ArgCount %u, Index %u\n",
98 WalkState->NumOperands, ArgCount, Index));
99
100 /* Create the interpreter arguments, in reverse order */
25d7dd99 101Index: acpica-unix2-20181003/source/components/dispatcher/dswscope.c
77760c90 102===================================================================
25d7dd99
JB		 103--- acpica-unix2-20181003.orig/source/components/dispatcher/dswscope.c
104+++ acpica-unix2-20181003/source/components/dispatcher/dswscope.c
77760c90
JB		 105@@ -149,7 +149,7 @@ AcpiDsScopeStackPush (
106 WalkState->ScopeDepth++;
107
108 ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
109- "[%.2d] Pushed scope ", (UINT32) WalkState->ScopeDepth));
110+ "[%.2d] Pushed scope ", WalkState->ScopeDepth));
111
112 OldScopeInfo = WalkState->ScopeInfo;
113 if (OldScopeInfo)
25d7dd99 114@@ -211,7 +211,7 @@ AcpiDsScopeStackPop (
77760c90
JB		 115 WalkState->ScopeDepth--;
116
117 ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
118- "[%.2d] Popped scope [%4.4s] (%s), New scope -> ",
119+ "[%.2u] Popped scope [%4.4s] (%s), New scope -> ",
120 (UINT32) WalkState->ScopeDepth,
121 AcpiUtGetNodeName (ScopeInfo->Scope.Node),
122 AcpiUtGetTypeName (ScopeInfo->Common.Value)));
25d7dd99 123Index: acpica-unix2-20181003/source/components/events/evgpe.c
77760c90 124===================================================================
25d7dd99
JB		 125--- acpica-unix2-20181003.orig/source/components/events/evgpe.c
126+++ acpica-unix2-20181003/source/components/events/evgpe.c
127@@ -481,7 +481,7 @@ AcpiEvGpeDetect (
77760c90
JB		 128 "Ignore disabled registers for GPE %02X-%02X: "
129 "RunEnable=%02X, WakeEnable=%02X\n",
130 GpeRegisterInfo->BaseGpeNumber,
131- GpeRegisterInfo->BaseGpeNumber + (ACPI_GPE_REGISTER_WIDTH - 1),
132+ (unsigned int) (GpeRegisterInfo->BaseGpeNumber + (ACPI_GPE_REGISTER_WIDTH - 1)),
133 GpeRegisterInfo->EnableForRun,
134 GpeRegisterInfo->EnableForWake));
135 continue;
25d7dd99 136Index: acpica-unix2-20181003/source/components/executer/exdump.c
77760c90 137===================================================================
25d7dd99
JB		 138--- acpica-unix2-20181003.orig/source/components/executer/exdump.c
139+++ acpica-unix2-20181003/source/components/executer/exdump.c
140@@ -678,7 +678,7 @@ AcpiExDumpOperand (
77760c90
JB		 141 if (Depth > 0)
142 {
25d7dd99
JB		 143 ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%*s[%u] %p Refs=%u ",
144- Depth, " ", Depth, ObjDesc, ObjDesc->Common.ReferenceCount));
145+ (int) Depth, " ", Depth, ObjDesc, ObjDesc->Common.ReferenceCount));
77760c90
JB		 146 }
147 else
148 {
25d7dd99 149Index: acpica-unix2-20181003/source/components/executer/exfldio.c
77760c90 150===================================================================
25d7dd99
JB		 151--- acpica-unix2-20181003.orig/source/components/executer/exfldio.c
152+++ acpica-unix2-20181003/source/components/executer/exfldio.c
77760c90
JB		 153@@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule (
154
155 ACPI_ERROR ((AE_INFO,
156 "Unknown UpdateRule value: 0x%X",
157- (ObjDesc->CommonField.FieldFlags &
158- AML_FIELD_UPDATE_RULE_MASK)));
159+ (unsigned int) (ObjDesc->CommonField.FieldFlags &
160+ AML_FIELD_UPDATE_RULE_MASK)));
161 return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
162 }
163 }
25d7dd99 164Index: acpica-unix2-20181003/source/components/executer/exnames.c
77760c90 165===================================================================
25d7dd99
JB		 166--- acpica-unix2-20181003.orig/source/components/executer/exnames.c
167+++ acpica-unix2-20181003/source/components/executer/exnames.c
168@@ -237,7 +237,7 @@ AcpiExNameSegment (
77760c90
JB		 169 */
170 ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
171 "Leading character is not alpha: %02Xh (not a name)\n",
172- CharBuf[0]));
173+ (unsigned int) CharBuf[0]));
174 Status = AE_CTRL_PENDING;
175 }
176 else
25d7dd99 177@@ -249,7 +249,7 @@ AcpiExNameSegment (
77760c90
JB		 178 Status = AE_AML_BAD_NAME;
179 ACPI_ERROR ((AE_INFO,
180 "Bad character 0x%02x in name, at %p",
181- *AmlAddress, AmlAddress));
182+ (unsigned int) (*AmlAddress), AmlAddress));
183 }
184
185 *InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress);
25d7dd99 186Index: acpica-unix2-20181003/source/components/hardware/hwregs.c
77760c90 187===================================================================
25d7dd99
JB		 188--- acpica-unix2-20181003.orig/source/components/hardware/hwregs.c
189+++ acpica-unix2-20181003/source/components/hardware/hwregs.c
190@@ -460,7 +460,7 @@ AcpiHwClearAcpiStatus (
77760c90
JB		 191
192
193 ACPI_DEBUG_PRINT ((ACPI_DB_IO, "About to write %04X to %8.8X%8.8X\n",
194- ACPI_BITMASK_ALL_FIXED_STATUS,
195+ (UINT32) ACPI_BITMASK_ALL_FIXED_STATUS,
196 ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address)));
197
198 LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock);
25d7dd99 199Index: acpica-unix2-20181003/source/components/tables/tbfadt.c
77760c90 200===================================================================
25d7dd99
JB		 201--- acpica-unix2-20181003.orig/source/components/tables/tbfadt.c
202+++ acpica-unix2-20181003/source/components/tables/tbfadt.c
77760c90
JB		 203@@ -233,7 +233,7 @@ AcpiTbInitGenericAddress (
204 if (!(Flags & ACPI_FADT_GPE_REGISTER))
205 {
206 ACPI_ERROR ((AE_INFO,
207- "%s - 32-bit FADT register is too long (%u bytes, %u bits) "
208+ "%s - 32-bit FADT register is too long (%u bytes, %d bits) "
209 "to convert to GAS struct - 255 bits max, truncating",
210 RegisterName, ByteWidth, (ByteWidth * 8)));
211 }
212@@ -304,7 +304,7 @@ AcpiTbSelectAddress (
213
214 ACPI_BIOS_WARNING ((AE_INFO,
215 "32/64X %s address mismatch in FADT: "
216- "0x%8.8X/0x%8.8X%8.8X, using %u-bit address",
217+ "0x%8.8X/0x%8.8X%8.8X, using %d-bit address",
218 RegisterName, Address32, ACPI_FORMAT_UINT64 (Address64),
219 AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
220
25d7dd99 221@@ -628,7 +628,7 @@ AcpiTbConvertFadt (
77760c90
JB		 222
223 ACPI_BIOS_WARNING ((AE_INFO,
224 "32/64X address mismatch in FADT/%s: "
225- "0x%8.8X/0x%8.8X%8.8X, using %u-bit address",
226+ "0x%8.8X/0x%8.8X%8.8X, using %d-bit address",
227 Name, Address32,
228 ACPI_FORMAT_UINT64 (Address64->Address),
229 AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
25d7dd99 230Index: acpica-unix2-20181003/source/components/tables/tbxfroot.c
77760c90 231===================================================================
25d7dd99
JB		 232--- acpica-unix2-20181003.orig/source/components/tables/tbxfroot.c
233+++ acpica-unix2-20181003/source/components/tables/tbxfroot.c
77760c90
JB		 234@@ -177,7 +177,7 @@ AcpiFindRootPointer (
235 {
236 ACPI_ERROR ((AE_INFO,
237 "Could not map memory at 0x%8.8X for length %u",
238- ACPI_EBDA_PTR_LOCATION, ACPI_EBDA_PTR_LENGTH));
239+ (UINT32) ACPI_EBDA_PTR_LOCATION, (UINT32) ACPI_EBDA_PTR_LENGTH));
240
241 return_ACPI_STATUS (AE_NO_MEMORY);
242 }
243@@ -204,7 +204,7 @@ AcpiFindRootPointer (
244 {
245 ACPI_ERROR ((AE_INFO,
246 "Could not map memory at 0x%8.8X for length %u",
247- PhysicalAddress, ACPI_EBDA_WINDOW_SIZE));
248+ PhysicalAddress, (UINT32) ACPI_EBDA_WINDOW_SIZE));
249
250 return_ACPI_STATUS (AE_NO_MEMORY);
251 }
252@@ -236,7 +236,7 @@ AcpiFindRootPointer (
253 {
254 ACPI_ERROR ((AE_INFO,
255 "Could not map memory at 0x%8.8X for length %u",
256- ACPI_HI_RSDP_WINDOW_BASE, ACPI_HI_RSDP_WINDOW_SIZE));
257+ (UINT32) ACPI_HI_RSDP_WINDOW_BASE, (UINT32) ACPI_HI_RSDP_WINDOW_SIZE));
258
259 return_ACPI_STATUS (AE_NO_MEMORY);
260 }
25d7dd99 261Index: acpica-unix2-20181003/source/components/utilities/utownerid.c
77760c90 262===================================================================
25d7dd99
JB		 263--- acpica-unix2-20181003.orig/source/components/utilities/utownerid.c
264+++ acpica-unix2-20181003/source/components/utilities/utownerid.c
265@@ -237,7 +237,7 @@ AcpiUtReleaseOwnerId (
77760c90
JB		 266 else
267 {
268 ACPI_ERROR ((AE_INFO,
269- "Release of non-allocated OwnerId: 0x%2.2X", OwnerId + 1));
270+ "Release of non-allocated OwnerId: 0x%2.2X", (UINT32) OwnerId + 1));
271 }
272
273 (void) AcpiUtReleaseMutex (ACPI_MTX_CACHES);
ACPI Component Architecture - an assembler and disassembler for DSDT tables
This page took 0.053854 seconds and 4 git commands to generate.