aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2018-12-10 21:56:26 -0800
committerH. Peter Anvin <hpa@zytor.com>2018-12-10 22:46:24 -0800
commita7bc437eab03cfa502d782527488edaf508cd917 (patch)
treecae10379ef412a88460ebcc54f89bb7cc84ddc40
parentd351efc97d83b1733ba1a11d1d661dcf3a14124b (diff)
downloadnasm-a7bc437eab03cfa502d782527488edaf508cd917.tar.gz
nasm-a7bc437eab03cfa502d782527488edaf508cd917.tar.xz
nasm-a7bc437eab03cfa502d782527488edaf508cd917.zip
asm/labels.c: use error helpers
Replace explicit calls to nasm_error() with error helpers. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--asm/labels.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/asm/labels.c b/asm/labels.c
index cffe1027..795a7b7e 100644
--- a/asm/labels.c
+++ b/asm/labels.c
@@ -501,14 +501,13 @@ void define_label(const char *label, int32_t segment,
/*
* Defined elsewhere in the program, seen in this pass.
*/
- nasm_error(ERR_NONFATAL,
- "label `%s' inconsistently redefined",
- lptr->defn.label);
+ nasm_nonfatal("label `%s' inconsistently redefined",
+ lptr->defn.label);
src_get(&saved_line, &saved_fname);
src_set(lptr->defn.def_line, lptr->defn.def_file);
- nasm_error(ERR_NOTE, "label `%s' originally defined here",
- lptr->defn.label);
+ nasm_note("label `%s' originally defined here",
+ lptr->defn.label);
src_set(saved_line, saved_fname);
} else if (pass0 > 1 && lptr->defn.type != LBL_SPECIAL) {
/*