summaryrefslogtreecommitdiff
path: root/glcpp/pp.c
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2010-06-18 19:52:36 -0700
committerKenneth Graunke <kenneth@whitecape.org>2010-06-21 12:38:39 -0700
commit33eaa3e0b3a8f94c2abb23ac3c9cbe571f170fb6 (patch)
tree10e52bcbd713a687e7d16618d82befaf6acd7782 /glcpp/pp.c
parent03ee33809f2e5c6ecff827188ec33be5a9397c16 (diff)
glcpp: Rename "errors" to "info_log."
Eventually, we'll want to be be able to print out warnings as well.
Diffstat (limited to 'glcpp/pp.c')
-rw-r--r--glcpp/pp.c24
1 files changed, 13 insertions, 11 deletions
diff --git a/glcpp/pp.c b/glcpp/pp.c
index 5d1ff8c682..f8a7c2ea4d 100644
--- a/glcpp/pp.c
+++ b/glcpp/pp.c
@@ -26,15 +26,17 @@
void
glcpp_error (YYLTYPE *locp, glcpp_parser_t *parser, const char *fmt, ...)
{
- parser->errors = talloc_asprintf_append(parser->errors, "%u:%u(%u): "
- "preprocessor error: ",
- locp->source, locp->first_line,
- locp->first_column);
- va_list ap;
- va_start(ap, fmt);
- parser->errors = talloc_vasprintf_append(parser->errors, fmt, ap);
- va_end(ap);
- parser->errors = talloc_strdup_append(parser->errors, "\n");
+ parser->info_log = talloc_asprintf_append(parser->info_log,
+ "%u:%u(%u): "
+ "preprocessor error: ",
+ locp->source,
+ locp->first_line,
+ locp->first_column);
+ va_list ap;
+ va_start(ap, fmt);
+ parser->info_log = talloc_vasprintf_append(parser->info_log, fmt, ap);
+ va_end(ap);
+ parser->info_log = talloc_strdup_append(parser->info_log, "\n");
}
extern int
@@ -46,8 +48,8 @@ preprocess(void *talloc_ctx, const char **shader, size_t *shader_len)
glcpp_parser_parse (parser);
- errors = parser->errors[0] != '\0';
- printf("%s", parser->errors);
+ errors = parser->info_log[0] != '\0';
+ printf("%s", parser->info_log);
talloc_steal(talloc_ctx, parser->output);
*shader = parser->output;