errors: unify nasm_verror_{gnu,vc} and remove some ERR_NOFILE

The differences between nasm_verror_{gnu,vc} are a short handful of
strings, so unify them. Remove some additional ERR_NOFILE that are not
necessary.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

1 files changed, 47 insertions, 101 deletions

diff --git a/asm/nasm.c b/asm/nasm.c
index 939ed204..100e4b9c 100644
--- a/asm/nasm.c
+++ b/asm/nasm.c
@@ -77,12 +77,20 @@ struct forwrefinfo {            /* info held on forward refs. */
 static void parse_cmdline(int, char **, int);
 static void assemble_file(const char *, StrList **);
 static bool skip_this_pass(int severity);
-static void nasm_verror_gnu(int severity, const char *fmt, va_list args);
-static void nasm_verror_vc(int severity, const char *fmt, va_list args);
-static void nasm_verror_common(int severity, const char *fmt, va_list args);
+static void nasm_verror_asm(int severity, const char *fmt, va_list args);
 static void usage(void);
 static void help(char xopt);
 
+struct error_format {
+    const char *beforeline;     /* Before line number, if present */
+    const char *afterline;      /* After line number, if present */
+    const char *beforemsg;      /* Before actual message */
+};
+
+static const struct error_format errfmt_gnu  = { ":", "",  ": "  };
+static const struct error_format errfmt_msvc = { "(", ")", " : " };
+static const struct error_format *errfmt = &errfmt_gnu;
+
 static bool using_debug_info, opt_verbose_info;
 static const char *debug_format;
 
@@ -452,7 +460,7 @@ int main(int argc, char **argv)
 
     pass0 = 0;
     want_usage = terminate_after_phase = false;
-    nasm_set_verror(nasm_verror_gnu);
+    nasm_set_verror(nasm_verror_asm);
 
     error_file = stderr;
 
@@ -489,7 +497,7 @@ int main(int argc, char **argv)
     } else {
         dfmt = dfmt_find(ofmt, debug_format);
         if (!dfmt) {
-            nasm_fatal(ERR_NOFILE | ERR_USAGE,
+            nasm_fatal(ERR_USAGE,
                        "unrecognized debug format `%s' for"
                        " output format `%s'",
                        debug_format, ofmt->shortname);
@@ -556,9 +564,7 @@ int main(int argc, char **argv)
             if (outname) {
                 ofile = nasm_open_write(outname, NF_TEXT);
                 if (!ofile)
-                    nasm_fatal(ERR_NOFILE,
-                                 "unable to open output file `%s'",
-                                 outname);
+                    nasm_fatal(0, "unable to open output file `%s'", outname);
             } else
                 ofile = NULL;
 
@@ -898,9 +904,7 @@ static bool process_arg(char *p, char *q, int pass)
             if (pass == 1) {
                 ofmt = ofmt_find(param, &ofmt_alias);
                 if (!ofmt) {
-                    nasm_fatal(ERR_NOFILE | ERR_USAGE,
-                               "unrecognised output format `%s' - "
-                               "use -hf for a list", param);
+                    nasm_fatal(ERR_USAGE, "unrecognised output format `%s' - use -hf for a list", param);
                 }
             }
             break;
@@ -994,14 +998,12 @@ static bool process_arg(char *p, char *q, int pass)
 
         case 'X':       /* specify error reporting format */
             if (pass == 1) {
-                if (nasm_stricmp("vc", param) == 0)
-                    nasm_set_verror(nasm_verror_vc);
-                else if (nasm_stricmp("gnu", param) == 0)
-                    nasm_set_verror(nasm_verror_gnu);
+                if (!nasm_stricmp("vc", param) || !nasm_stricmp("msvc", param) || !nasm_stricmp("ms", param))
+                    errfmt = &errfmt_msvc;
+                else if (!nasm_stricmp("gnu", param) || !nasm_stricmp("gcc", param))
+                    errfmt = &errfmt_gnu;
                 else
-                    nasm_fatal(ERR_NOFILE | ERR_USAGE,
-                               "unrecognized error reporting format `%s'",
-                               param);
+                    nasm_fatal(ERR_USAGE, "unrecognized error reporting format `%s'", param);
             }
             break;
 
@@ -1401,8 +1403,7 @@ static void parse_cmdline(int argc, char **argv, int pass)
         return;
 
     if (!inname)
-        nasm_fatal(ERR_NOFILE | ERR_USAGE, "no input file specified");
-
+        nasm_fatal(ERR_USAGE, "no input file specified");
     else if ((errname && !strcmp(inname, errname)) ||
              (outname && !strcmp(inname, outname)) ||
              (listname &&  !strcmp(inname, listname))  ||
@@ -1413,9 +1414,7 @@ static void parse_cmdline(int argc, char **argv, int pass)
         error_file = nasm_open_write(errname, NF_TEXT);
         if (!error_file) {
             error_file = stderr;        /* Revert to default! */
-            nasm_fatal(ERR_NOFILE | ERR_USAGE,
-                       "cannot open file `%s' for error messages",
-                       errname);
+            nasm_fatal(ERR_USAGE, "cannot open file `%s' for error messages", errname);
         }
     }
 }
@@ -1787,21 +1786,20 @@ static bool warning_is_error(int severity)
 }
 
 /**
- * gnu style error reporting
- * This function prints an error message to error_file in the
- * style used by GNU. An example would be:
- * file.asm:50: error: blah blah blah
- * where file.asm is the name of the file, 50 is the line number on
- * which the error occurs (or is detected) and "error:" is one of
- * the possible optional diagnostics -- it can be "error" or "warning"
- * or something else.  Finally the line terminates with the actual
- * error message.
+ * common error reporting
+ * This is the common back end of the error reporting schemes currently
+ * implemented.  It prints the nature of the warning and then the
+ * specific error message to error_file and may or may not return.  It
+ * doesn't return if the error severity is a "panic" or "debug" type.
  *
  * @param severity the severity of the warning or error
  * @param fmt the printf style format string
  */
-static void nasm_verror_gnu(int severity, const char *fmt, va_list ap)
+static void nasm_verror_asm(int severity, const char *fmt, va_list args)
 {
+    char msg[1024];
+    const char *pfx;
+    bool warn_is_err = warning_is_error(severity);
     const char *currentfile = NULL;
     int32_t lineno = 0;
 
@@ -1811,75 +1809,15 @@ static void nasm_verror_gnu(int severity, const char *fmt, va_list ap)
     if (!(severity & ERR_NOFILE)) {
 	src_get(&lineno, &currentfile);
         if (!currentfile) {
-            currentfile = inname && inname[0] ?
-		    inname : outname && outname[0] ?
-		    outname : NULL;
+            currentfile = currentfile ? currentfile :
+                inname && inname[0] ? inname :
+                outname && outname[0] ? outname :
+                NULL;
             lineno = 0;
         }
     }
-
-    if (!skip_this_pass(severity)) {
-        if (!lineno)
-            fprintf(error_file, "%s: ", currentfile ? currentfile : "nasm");
-        else
-            fprintf(error_file, "%s:%"PRId32": ", currentfile, lineno);
-    }
-
-    nasm_verror_common(severity, fmt, ap);
-}
-
-/**
- * MS style error reporting
- * This function prints an error message to error_file in the
- * style used by Visual C and some other Microsoft tools. An example
- * would be:
- * file.asm(50) : error: blah blah blah
- * where file.asm is the name of the file, 50 is the line number on
- * which the error occurs (or is detected) and "error:" is one of
- * the possible optional diagnostics -- it can be "error" or "warning"
- * or something else.  Finally the line terminates with the actual
- * error message.
- *
- * @param severity the severity of the warning or error
- * @param fmt the printf style format string
- */
-static void nasm_verror_vc(int severity, const char *fmt, va_list ap)
-{
-    const char *currentfile = NULL;
-    int32_t lineno = 0;
-
-    if (is_suppressed(severity))
-        return;
-
-    if (!(severity & ERR_NOFILE))
-        src_get(&lineno, &currentfile);
-
-    if (!skip_this_pass(severity)) {
-        if (lineno) {
-	    fprintf(error_file, "%s(%"PRId32") : ", currentfile, lineno);
-	} else {
-            fprintf(error_file , "%s : ", currentfile ? currentfile : "nasm");
-	}
-    }
-
-    nasm_verror_common(severity, fmt, ap);
-}
-
-/**
- * common error reporting
- * This is the common back end of the error reporting schemes currently
- * implemented.  It prints the nature of the warning and then the
- * specific error message to error_file and may or may not return.  It
- * doesn't return if the error severity is a "panic" or "debug" type.
- *
- * @param severity the severity of the warning or error
- * @param fmt the printf style format string
- */
-static void nasm_verror_common(int severity, const char *fmt, va_list args)
-{
-    char msg[1024];
-    const char *pfx;
-    bool warn_is_err = warning_is_error(severity);
+    if (!currentfile)
+        currentfile = "nasm";
 
     switch (severity & (ERR_MASK|ERR_NO_SEVERITY)) {
     case ERR_NOTE:
@@ -1916,8 +1854,16 @@ static void nasm_verror_common(int severity, const char *fmt, va_list args)
                  warnings[warn_index(severity)].name);
     }
 
-    if (!skip_this_pass(severity))
-	fprintf(error_file, "%s%s\n", pfx, msg);
+    if (!skip_this_pass(severity)) {
+        if (!lineno) {
+            fprintf(error_file, "%s%s%s%s\n",
+                    currentfile, errfmt->beforemsg, pfx, msg);
+        } else {
+            fprintf(error_file, "%s%s%"PRId32"%s%s%s%s\n",
+                    currentfile, errfmt->beforeline, lineno,
+                    errfmt->afterline, errfmt->beforemsg, pfx, msg);
+        }
+    }
 
     /* Are we recursing from error_list_macros? */
     if (severity & ERR_PP_LISTMACRO)