From: Wolfgang (Blub) Bumiller <blub@speed.at>
Date: Mon, 17 Dec 2012 17:26:26 +0000 (+0100)
Subject: parsewarning and genwarning to use vcompile_warning
X-Git-Tag: 0.1.9~75
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b7117e08ce279d2378ba1fc803e44be683b1ad89;p=xonotic%2Fgmqcc.git

parsewarning and genwarning to use vcompile_warning
---

diff --git a/parser.c b/parser.c
index 8e5f8b0..ee47185 100644
--- a/parser.c
+++ b/parser.c
@@ -124,40 +124,22 @@ static void parseerror(parser_t *parser, const char *fmt, ...)
 /* returns true if it counts as an error */
 static bool GMQCC_WARN parsewarning(parser_t *parser, int warntype, const char *fmt, ...)
 {
+    bool    r;
 	va_list ap;
-	int lvl = LVL_WARNING;
-
-    if (!OPTS_WARN(warntype))
-        return false;
-
-    if (opts.werror) {
-	    parser->errors++;
-	    lvl = LVL_ERROR;
-	}
-
 	va_start(ap, fmt);
-    con_vprintmsg(lvl, parser->lex->tok.ctx.file, parser->lex->tok.ctx.line, (opts.werror ? "error" : "warning"), fmt, ap);
+	r = vcompile_warning(parser->lex->tok.ctx, warntype, fmt, ap);
 	va_end(ap);
-
-	return opts.werror;
+	return r;
 }
 
 static bool GMQCC_WARN genwarning(lex_ctx ctx, int warntype, const char *fmt, ...)
 {
+    bool    r;
 	va_list ap;
-	int lvl = LVL_WARNING;
-
-    if (!OPTS_WARN(warntype))
-        return false;
-
-    if (opts.werror)
-	    lvl = LVL_ERROR;
-
 	va_start(ap, fmt);
-    con_vprintmsg(lvl, ctx.file, ctx.line, (opts.werror ? "error" : "warning"), fmt, ap);
+	r = vcompile_warning(ctx, warntype, fmt, ap);
 	va_end(ap);
-
-	return opts.werror;
+	return r;
 }
 
 /**********************************************************************