[Piglit] [PATCH 2/3] piglit: rename FindLine() to piglit_find_line()

Brian Paul brianp at vmware.com
Wed Oct 3 07:27:39 PDT 2012


---
 tests/util/piglit-util-gl.c |    2 +-
 tests/util/piglit-util.c    |    2 +-
 tests/util/piglit-util.h    |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/util/piglit-util-gl.c b/tests/util/piglit-util-gl.c
index 96f6258..cb697d8 100644
--- a/tests/util/piglit-util-gl.c
+++ b/tests/util/piglit-util-gl.c
@@ -762,7 +762,7 @@ GLuint piglit_compile_program(GLenum target, const char* text)
 			(const GLubyte *)text);
 	glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errorPos);
 	if (glGetError() != GL_NO_ERROR || errorPos != -1) {
-		int l = FindLine(text, errorPos);
+		int l = piglit_find_line(text, errorPos);
 		int a;
 
 		fprintf(stderr, "Compiler Error (pos=%d line=%d): %s\n",
diff --git a/tests/util/piglit-util.c b/tests/util/piglit-util.c
index 411d69c..f412cb0 100644
--- a/tests/util/piglit-util.c
+++ b/tests/util/piglit-util.c
@@ -146,7 +146,7 @@ bool piglit_is_extension_in_string(const char *haystack, const char *needle)
 }
 
 /** Returns the line in the program string given the character position. */
-int FindLine(const char *program, int position)
+int piglit_find_line(const char *program, int position)
 {
 	int i, line = 1;
 	for (i = 0; i < position; i++) {
diff --git a/tests/util/piglit-util.h b/tests/util/piglit-util.h
index 30ab78c..e22246a 100644
--- a/tests/util/piglit-util.h
+++ b/tests/util/piglit-util.h
@@ -131,7 +131,7 @@ bool piglit_is_extension_in_string(const char *haystack, const char *needle);
  */
 bool piglit_is_extension_in_array(const char **haystack, const char *needle);
 
-int FindLine(const char *program, int position);
+int piglit_find_line(const char *program, int position);
 void piglit_merge_result(enum piglit_result *all, enum piglit_result subtest);
 void piglit_report_result(enum piglit_result result);
 
-- 
1.7.3.4



More information about the Piglit mailing list