[nasm:nasm-2.15.xx] Fix missing "here" from error messages

nasm-bot for H. Peter Anvin (Intel) hpa at zytor.com
Fri Jun 5 13:24:04 PDT 2020


Commit-ID:  f7fadcd24567094fd140500e9590a79853e37ece
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=f7fadcd24567094fd140500e9590a79853e37ece
Author:     H. Peter Anvin (Intel) <hpa at zytor.com>
AuthorDate: Fri, 5 Jun 2020 13:19:45 -0700
Committer:  H. Peter Anvin (Intel) <hpa at zytor.com>
CommitDate: Fri, 5 Jun 2020 13:19:45 -0700

Fix missing "here" from error messages

The "here" or "in an unknown location" suffix was inadvertently
dropped.

Signed-off-by: H. Peter Anvin (Intel) <hpa at zytor.com>


---
 asm/nasm.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/asm/nasm.c b/asm/nasm.c
index 2f6634ef..51a74dfc 100644
--- a/asm/nasm.c
+++ b/asm/nasm.c
@@ -2061,6 +2061,10 @@ static void nasm_issue_error(struct nasm_errtext *et)
         const char *file = currentfile ? currentfile : no_file_name;
         const char *here = "";
 
+        if (severity & ERR_HERE) {
+            here = currentfile ? " here" : " in an unknown location";
+        }
+
         if (warn_list && true_type < ERR_NONFATAL &&
             !(pass_first() && (severity & ERR_PASS1))) {
             /*


More information about the Nasm-commits mailing list