diff options
| author | jkim <jkim@FreeBSD.org> | 2012-04-23 23:05:14 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2012-04-23 23:05:14 +0000 |
| commit | 6ad6e5ad458430028d7210712b32b42a6a5bd27f (patch) | |
| tree | 56922987e2cfefbddd9a8298beb2dce0ea965339 /sys/contrib/dev/acpica/compiler/aslerror.c | |
| parent | 22fae261d4ee03ee88b67242e0842711fe24b0f3 (diff) | |
| parent | eb364ef2c90291c41e896d265d93fe21e48d02a7 (diff) | |
| download | FreeBSD-src-6ad6e5ad458430028d7210712b32b42a6a5bd27f.zip FreeBSD-src-6ad6e5ad458430028d7210712b32b42a6a5bd27f.tar.gz | |
Merge ACPICA 20120420.
Diffstat (limited to 'sys/contrib/dev/acpica/compiler/aslerror.c')
| -rw-r--r-- | sys/contrib/dev/acpica/compiler/aslerror.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/sys/contrib/dev/acpica/compiler/aslerror.c b/sys/contrib/dev/acpica/compiler/aslerror.c index 16b52dc..9173d46 100644 --- a/sys/contrib/dev/acpica/compiler/aslerror.c +++ b/sys/contrib/dev/acpica/compiler/aslerror.c @@ -259,7 +259,7 @@ AePrintException ( { if (Gbl_VerboseErrors) { - fprintf (OutputFile, "%6s", Enode->Filename); + fprintf (OutputFile, "%-8s", Enode->Filename); if (Enode->LineNumber) { @@ -270,12 +270,7 @@ AePrintException ( } else { - if (Gbl_FileType == ASL_INPUT_TYPE_ASCII_ASL) - fprintf (OutputFile, " %6u: ", - PrGetLineNumber (Enode->LineNumber)); - else - fprintf (OutputFile, " %6u: ", - Enode->LineNumber); + fprintf (OutputFile, " %6u: ", Enode->LineNumber); /* * If not at EOF, get the corresponding source code line and @@ -324,16 +319,8 @@ AePrintException ( if (Enode->LineNumber) { - if (Gbl_FileType == ASL_INPUT_TYPE_ASCII_ASL) - { - fprintf (OutputFile, "(%u) i:%6u : ", - PrGetLineNumber (Enode->LineNumber), Enode->LineNumber); - } - else - { - fprintf (OutputFile, "(%u) i:%6u : ", - Enode->LineNumber, Enode->LineNumber); - } + fprintf (OutputFile, "(%u) i:%6u : ", + Enode->LineNumber, Enode->LineNumber); } } } |
