diff options
author | jkim <jkim@FreeBSD.org> | 2012-05-24 23:12:30 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2012-05-24 23:12:30 +0000 |
commit | 5e29a3bfbb9c8830043811a67749c68d62419dcb (patch) | |
tree | 9dd2174199f7139519d2253a1b845832de100537 /sys/contrib/dev/acpica/compiler/aslerror.c | |
parent | 9efa72fd429a41fc46f151a4d5f03c1198c2a4da (diff) | |
download | FreeBSD-src-5e29a3bfbb9c8830043811a67749c68d62419dcb.zip FreeBSD-src-5e29a3bfbb9c8830043811a67749c68d62419dcb.tar.gz |
Merge ACPICA 20120518.
Diffstat (limited to 'sys/contrib/dev/acpica/compiler/aslerror.c')
-rw-r--r-- | sys/contrib/dev/acpica/compiler/aslerror.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/sys/contrib/dev/acpica/compiler/aslerror.c b/sys/contrib/dev/acpica/compiler/aslerror.c index 9173d46..a11cf5c 100644 --- a/sys/contrib/dev/acpica/compiler/aslerror.c +++ b/sys/contrib/dev/acpica/compiler/aslerror.c @@ -315,12 +315,16 @@ AePrintException ( } else { + /* + * Less verbose version of the error message, enabled via the + * -vi switch. The format is compatible with MS Visual Studio. + */ fprintf (OutputFile, "%s", Enode->Filename); if (Enode->LineNumber) { - fprintf (OutputFile, "(%u) i:%6u : ", - Enode->LineNumber, Enode->LineNumber); + fprintf (OutputFile, "(%u) : ", + Enode->LineNumber); } } } @@ -335,9 +339,18 @@ AePrintException ( { /* Decode the message ID */ - fprintf (OutputFile, "%s %4.4d - ", - AslErrorLevel[Enode->Level], - Enode->MessageId + ((Enode->Level+1) * 1000)); + if (Gbl_VerboseErrors) + { + fprintf (OutputFile, "%s %4.4d - ", + AslErrorLevel[Enode->Level], + Enode->MessageId + ((Enode->Level+1) * 1000)); + } + else /* IDE case */ + { + fprintf (OutputFile, "%s %4.4d:", + AslErrorLevelIde[Enode->Level], + Enode->MessageId + ((Enode->Level+1) * 1000)); + } MainMessage = AslMessages[Enode->MessageId]; ExtraMessage = Enode->Message; |