[nasm:master] labels: Use nasm_error helpers

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  46c37b377219fc21e4b3037acbd935d7a3d41e51
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=46c37b377219fc21e4b3037acbd935d7a3d41e51
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sat, 1 Dec 2018 20:03:55 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sat, 1 Dec 2018 20:03:55 +0300

labels: Use nasm_error helpers

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 asm/labels.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/asm/labels.c b/asm/labels.c
index c00d6e5..4e69d99 100644
--- a/asm/labels.c
+++ b/asm/labels.c
@@ -387,9 +387,8 @@ static bool declare_label_lptr(union label *lptr,
             if (!lptr->defn.special)
                 lptr->defn.special = perm_copy(special);
             else if (nasm_stricmp(lptr->defn.special, special))
-                nasm_error(ERR_NONFATAL,
-                           "symbol `%s' has inconsistent attributes `%s' and `%s'",
-                           lptr->defn.label, lptr->defn.special, special);
+                nasm_nonfatal("symbol `%s' has inconsistent attributes `%s' and `%s'",
+                              lptr->defn.label, lptr->defn.special, special);
         }
         return true;
     }
@@ -412,8 +411,8 @@ static bool declare_label_lptr(union label *lptr,
         return false;           /* Don't call define_label() after this! */
     }
 
-    nasm_error(ERR_NONFATAL, "symbol `%s' declared both as %s and %s",
-               lptr->defn.label, types[lptr->defn.type], types[type]);
+    nasm_nonfatal("symbol `%s' declared both as %s and %s",
+                  lptr->defn.label, types[lptr->defn.type], types[type]);
 
     return false;
 }
@@ -481,9 +480,8 @@ void define_label(const char *label, int32_t segment,
      * even during the last pass.
      */
     if (changed && pass0 > 1 && lptr->defn.type != LBL_SPECIAL) {
-        nasm_error(ERR_WARNING, "label `%s' %s during code generation",
-                   lptr->defn.label,
-                   created ? "defined" : "changed");
+        nasm_warn("label `%s' %s during code generation",
+                  lptr->defn.label, created ? "defined" : "changed");
     }
 
     lptr->defn.segment = segment;