commit 33eaa3e0b3a8f94c2abb23ac3c9cbe571f170fb6
author Kenneth Graunke <kenneth@whitecape.org> Fri Jun 18 19:52:36 2010 -0700
committer Kenneth Graunke <kenneth@whitecape.org> Mon Jun 21 12:38:39 2010 -0700
tree 10e52bcbd713a687e7d16618d82befaf6acd7782
parent 03ee33809f2e5c6ecff827188ec33be5a9397c16

glcpp: Rename "errors" to "info_log."

Eventually, we'll want to be be able to print out warnings as well.

glcpp/glcpp-parse.y

diff --git a/glcpp/glcpp-parse.y b/glcpp/glcpp-parse.y
index 984a476..c70370a 100644
--- a/glcpp/glcpp-parse.y
+++ b/glcpp/glcpp-parse.y
@@ -859,11 +859,11 @@
 	}
 
 	glcpp_error (&token->location, parser, "");
-	glcpp_print (parser->errors, "Pasting \"");
-	_token_print (&parser->errors, token);
-	glcpp_print (parser->errors, "\" and \"");
-	_token_print (&parser->errors, other);
-	glcpp_print (parser->errors, "\" does not give a valid preprocessing token.\n");
+	glcpp_print (parser->info_log, "Pasting \"");
+	_token_print (&parser->info_log, token);
+	glcpp_print (parser->info_log, "\" and \"");
+	_token_print (&parser->info_log, other);
+	glcpp_print (parser->info_log, "\" does not give a valid preprocessing token.\n");
 
 	return token;
 }
@@ -909,7 +909,7 @@
 	parser->lex_from_node = NULL;
 
 	parser->output = talloc_strdup(parser, "");
-	parser->errors = talloc_strdup(parser, "");
+	parser->info_log = talloc_strdup(parser, "");
 
 	return parser;
 }

glcpp/glcpp.c

diff --git a/glcpp/glcpp.c b/glcpp/glcpp.c
index d204eee..8ba4661 100644
--- a/glcpp/glcpp.c
+++ b/glcpp/glcpp.c
@@ -36,7 +36,7 @@
 	ret = glcpp_parser_parse (parser);
 
 	printf("%s", parser->output);
-	fprintf(stderr, "%s", parser->errors);
+	fprintf(stderr, "%s", parser->info_log);
 
 	glcpp_parser_destroy (parser);
 

glcpp/glcpp.h

diff --git a/glcpp/glcpp.h b/glcpp/glcpp.h
index 4a2489a..e67469b 100644
--- a/glcpp/glcpp.h
+++ b/glcpp/glcpp.h
@@ -154,7 +154,7 @@
 	token_list_t *lex_from_list;
 	token_node_t *lex_from_node;
 	char *output;
-	char *errors;
+	char *info_log;
 };
 
 glcpp_parser_t *

glcpp/pp.c

diff --git a/glcpp/pp.c b/glcpp/pp.c
index 5d1ff8c..f8a7c2e 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 @@
 
 	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;