aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2018-12-10 22:11:24 -0800
committerH. Peter Anvin (Intel) <hpa@zytor.com>2018-12-12 17:00:19 -0800
commitdea7f4733fb5316681db0e22b1143bb40254b330 (patch)
tree2bda52eea2867912c408aafead0289e24cd92f0a
parent950dee9edc475ae37d80e88b7048b8ff01d49a5f (diff)
downloadnasm-dea7f4733fb5316681db0e22b1143bb40254b330.tar.gz
nasm-dea7f4733fb5316681db0e22b1143bb40254b330.tar.xz
nasm-dea7f4733fb5316681db0e22b1143bb40254b330.zip
error: remove unused ERR_TOPFILE
The flag ERR_TOPFILE was not used anywhere, remove it. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--asm/nasm.c6
-rw-r--r--include/error.h1
2 files changed, 4 insertions, 3 deletions
diff --git a/asm/nasm.c b/asm/nasm.c
index ac3cd1c2..939ed204 100644
--- a/asm/nasm.c
+++ b/asm/nasm.c
@@ -1810,8 +1810,10 @@ static void nasm_verror_gnu(int severity, const char *fmt, va_list ap)
if (!(severity & ERR_NOFILE)) {
src_get(&lineno, &currentfile);
- if (!currentfile || (severity & ERR_TOPFILE)) {
- currentfile = inname[0] ? inname : outname[0] ? outname : NULL;
+ if (!currentfile) {
+ currentfile = inname && inname[0] ?
+ inname : outname && outname[0] ?
+ outname : NULL;
lineno = 0;
}
}
diff --git a/include/error.h b/include/error.h
index 3d2b7a1a..d2f04f4c 100644
--- a/include/error.h
+++ b/include/error.h
@@ -72,7 +72,6 @@ static inline vefunc nasm_set_verror(vefunc ve)
* and dump core for reference */
#define ERR_MASK 0x00000007 /* mask off the above codes */
#define ERR_NOFILE 0x00000010 /* don't give source file name/line */
-#define ERR_TOPFILE 0x00000020 /* give the top input file name only */
#define ERR_USAGE 0x00000040 /* print a usage message */
#define ERR_PASS1 0x00000080 /* only print this error on pass 1 */
#define ERR_PASS2 0x00000100 /* only print this error on pass 2 */