Mesa (glsl2): glsl2: move declarations before code

Brian Paul brianp at kemper.freedesktop.org
Wed Aug 11 21:06:41 UTC 2010


Module: Mesa
Branch: glsl2
Commit: d1dda951c85f65612ed6fe080728f67fdc93d232
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d1dda951c85f65612ed6fe080728f67fdc93d232

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Aug 11 13:59:45 2010 -0600

glsl2: move declarations before code

---

 src/glsl/glcpp/pp.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/glsl/glcpp/pp.c b/src/glsl/glcpp/pp.c
index 7aa1a96..3adccf7 100644
--- a/src/glsl/glcpp/pp.c
+++ b/src/glsl/glcpp/pp.c
@@ -28,6 +28,8 @@
 void
 glcpp_error (YYLTYPE *locp, glcpp_parser_t *parser, const char *fmt, ...)
 {
+	va_list ap;
+
 	parser->error = 1;
 	parser->info_log = talloc_asprintf_append(parser->info_log,
 						  "%u:%u(%u): "
@@ -35,7 +37,6 @@ glcpp_error (YYLTYPE *locp, glcpp_parser_t *parser, const char *fmt, ...)
 						  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);
@@ -45,13 +46,14 @@ glcpp_error (YYLTYPE *locp, glcpp_parser_t *parser, const char *fmt, ...)
 void
 glcpp_warning (YYLTYPE *locp, glcpp_parser_t *parser, const char *fmt, ...)
 {
+	va_list ap;
+
 	parser->info_log = talloc_asprintf_append(parser->info_log,
 						  "%u:%u(%u): "
 						  "preprocessor warning: ",
 						  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);




More information about the mesa-commit mailing list