From 873ceee29f3acd15fd9b38296b4a86d747fde187 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin (Intel)" Date: Tue, 6 Aug 2019 19:18:36 -0700 Subject: Replace nasm_error(ERR_WARNING|...) with nasm_warn() Remove a few remaining instances of nasm_error(ERR_WARNING). Signed-off-by: H. Peter Anvin (Intel) --- output/outdbg.c | 2 +- output/outmacho.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'output') diff --git a/output/outdbg.c b/output/outdbg.c index 3c1f42f2..2304992f 100644 --- a/output/outdbg.c +++ b/output/outdbg.c @@ -371,7 +371,7 @@ dbg_pragma(const struct pragma *pragma) errno = 0; arg = strtoul(pragma->tail, &ep, 0); if (errno || *nasm_skip_spaces(ep)) { - nasm_error(ERR_WARNING | WARN_PRAGMA_BAD | ERR_PASS2, + nasm_warn(WARN_PRAGMA_BAD | ERR_PASS2, "invalid %%pragma dbg maxdump argument"); return DIRR_ERROR; } else { diff --git a/output/outmacho.c b/output/outmacho.c index 8d730bf5..cff4affa 100644 --- a/output/outmacho.c +++ b/output/outmacho.c @@ -469,7 +469,7 @@ static int64_t add_reloc(struct section *sect, int32_t section, break; case RL_SUB: /* obsolete */ - nasm_error(ERR_WARNING|WARN_OTHER, "relcation with subtraction" + nasm_warn(WARN_OTHER, "relcation with subtraction" "becomes to be obsolete"); r->ext = 0; r->type = X86_64_RELOC_SUBTRACTOR; @@ -556,7 +556,7 @@ static void macho_output(int32_t secto, const void *data, s = get_section_by_index(secto); if (!s) { - nasm_error(ERR_WARNING|WARN_OTHER, "attempt to assemble code in" + nasm_warn(WARN_OTHER, "attempt to assemble code in" " section %d: defaulting to `.text'", secto); s = get_section_by_name("__TEXT", "__text"); @@ -578,10 +578,10 @@ static void macho_output(int32_t secto, const void *data, is_bss = (s->flags & SECTION_TYPE) == S_ZEROFILL; if (is_bss && type != OUT_RESERVE) { - nasm_error(ERR_WARNING|WARN_OTHER, "attempt to initialize memory in " + nasm_warn(WARN_OTHER, "attempt to initialize memory in " "BSS section: ignored"); /* FIXME */ - nasm_error(ERR_WARNING|WARN_OTHER, "section size may be negative" + nasm_warn(WARN_OTHER, "section size may be negative" "with address symbols"); s->size += realsize(type, size); return; @@ -592,7 +592,7 @@ static void macho_output(int32_t secto, const void *data, switch (type) { case OUT_RESERVE: if (!is_bss) { - nasm_error(ERR_WARNING|WARN_OTHER, "uninitialized space declared in" + nasm_warn(WARN_OTHER, "uninitialized space declared in" " %s,%s section: zeroing", s->segname, s->sectname); sect_write(s, NULL, size); @@ -1651,7 +1651,7 @@ static void macho_write (void) if (seg_nsects > 0) offset = macho_write_segment (offset); else - nasm_error(ERR_WARNING|WARN_OTHER, "no sections?"); + nasm_warn(WARN_OTHER, "no sections?"); if (nsyms > 0) { /* write out symbol command */ -- cgit v1.2.1