summaryrefslogtreecommitdiff
path: root/glsl_parser_extras.cpp
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2010-06-17 15:15:35 -0700
committerKenneth Graunke <kenneth@whitecape.org>2010-06-19 11:44:21 -0700
commitb2ba6fac09df1f06161a7ea1ef1f25bb9fbe8a5a (patch)
tree084e10e2fd8bba3b9824a14f5facc03c327c4315 /glsl_parser_extras.cpp
parentca97bd395f476ad2b5a009f92edef4656aab3650 (diff)
Change error/warning functions to print to the info log.
Diffstat (limited to 'glsl_parser_extras.cpp')
-rw-r--r--glsl_parser_extras.cpp44
1 files changed, 20 insertions, 24 deletions
diff --git a/glsl_parser_extras.cpp b/glsl_parser_extras.cpp
index 8cf765f95d..7bd30de7c2 100644
--- a/glsl_parser_extras.cpp
+++ b/glsl_parser_extras.cpp
@@ -25,6 +25,10 @@
#include <string.h>
#include <assert.h>
+extern "C" {
+#include <talloc.h>
+}
+
#include "ast.h"
#include "glsl_parser_extras.h"
#include "glsl_parser.h"
@@ -47,24 +51,20 @@ void
_mesa_glsl_error(YYLTYPE *locp, _mesa_glsl_parse_state *state,
const char *fmt, ...)
{
- char buf[1024];
- int len;
va_list ap;
state->error = true;
- len = snprintf(buf, sizeof(buf), "%u:%u(%u): error: ",
- locp->source, locp->first_line, locp->first_column);
-
+ assert(state->info_log != NULL);
+ state->info_log = talloc_asprintf_append(state->info_log,
+ "%u:%u(%u): error: ",
+ locp->source,
+ locp->first_line,
+ locp->first_column);
va_start(ap, fmt);
- vsnprintf(buf + len, sizeof(buf) - len, fmt, ap);
+ state->info_log = talloc_vasprintf_append(state->info_log, fmt, ap);
va_end(ap);
-
- printf("%s\n", buf);
-
- if (state->info_log)
- free(state->info_log);
- state->info_log = strdup(buf);
+ state->info_log = talloc_strdup_append(state->info_log, "\n");
}
@@ -72,22 +72,18 @@ void
_mesa_glsl_warning(const YYLTYPE *locp, _mesa_glsl_parse_state *state,
const char *fmt, ...)
{
- char buf[1024];
- int len;
va_list ap;
- len = snprintf(buf, sizeof(buf), "%u:%u(%u): warning: ",
- locp->source, locp->first_line, locp->first_column);
-
+ assert(state->info_log != NULL);
+ state->info_log = talloc_asprintf_append(state->info_log,
+ "%u:%u(%u): warning: ",
+ locp->source,
+ locp->first_line,
+ locp->first_column);
va_start(ap, fmt);
- vsnprintf(buf + len, sizeof(buf) - len, fmt, ap);
+ state->info_log = talloc_vasprintf_append(state->info_log, fmt, ap);
va_end(ap);
-
- printf("%s\n", buf);
-
- if (!state->info_log) {
- state->info_log = strdup(buf);
- }
+ state->info_log = talloc_strdup_append(state->info_log, "\n");
}