Deleted Added
full compact
aslerror.c (234623) aslerror.c (235945)
1
2/******************************************************************************
3 *
4 * Module Name: aslerror - Error handling and statistics
5 *
6 *****************************************************************************/
7
8/*

--- 301 unchanged lines hidden (view full) ---

310 }
311
312 fprintf (OutputFile, "\n");
313 }
314 }
315 }
316 else
317 {
1
2/******************************************************************************
3 *
4 * Module Name: aslerror - Error handling and statistics
5 *
6 *****************************************************************************/
7
8/*

--- 301 unchanged lines hidden (view full) ---

310 }
311
312 fprintf (OutputFile, "\n");
313 }
314 }
315 }
316 else
317 {
318 /*
319 * Less verbose version of the error message, enabled via the
320 * -vi switch. The format is compatible with MS Visual Studio.
321 */
318 fprintf (OutputFile, "%s", Enode->Filename);
319
320 if (Enode->LineNumber)
321 {
322 fprintf (OutputFile, "%s", Enode->Filename);
323
324 if (Enode->LineNumber)
325 {
322 fprintf (OutputFile, "(%u) i:%6u : ",
323 Enode->LineNumber, Enode->LineNumber);
326 fprintf (OutputFile, "(%u) : ",
327 Enode->LineNumber);
324 }
325 }
326 }
327
328 /* NULL message ID, just print the raw message */
329
330 if (Enode->MessageId == 0)
331 {
332 fprintf (OutputFile, "%s\n", Enode->Message);
333 }
334 else
335 {
336 /* Decode the message ID */
337
328 }
329 }
330 }
331
332 /* NULL message ID, just print the raw message */
333
334 if (Enode->MessageId == 0)
335 {
336 fprintf (OutputFile, "%s\n", Enode->Message);
337 }
338 else
339 {
340 /* Decode the message ID */
341
338 fprintf (OutputFile, "%s %4.4d - ",
339 AslErrorLevel[Enode->Level],
340 Enode->MessageId + ((Enode->Level+1) * 1000));
342 if (Gbl_VerboseErrors)
343 {
344 fprintf (OutputFile, "%s %4.4d - ",
345 AslErrorLevel[Enode->Level],
346 Enode->MessageId + ((Enode->Level+1) * 1000));
347 }
348 else /* IDE case */
349 {
350 fprintf (OutputFile, "%s %4.4d:",
351 AslErrorLevelIde[Enode->Level],
352 Enode->MessageId + ((Enode->Level+1) * 1000));
353 }
341
342 MainMessage = AslMessages[Enode->MessageId];
343 ExtraMessage = Enode->Message;
344
345 if (Enode->LineNumber)
346 {
347 /* Main message: try to use string from AslMessages first */
348

--- 407 unchanged lines hidden ---
354
355 MainMessage = AslMessages[Enode->MessageId];
356 ExtraMessage = Enode->Message;
357
358 if (Enode->LineNumber)
359 {
360 /* Main message: try to use string from AslMessages first */
361

--- 407 unchanged lines hidden ---