[Mesa-dev] [PATCH 1/4] program: remove unused function _mesa_find_line_column

Marek Olšák maraeo at gmail.com
Wed Oct 7 17:11:59 PDT 2015


From: Marek Olšák <marek.olsak at amd.com>

---
 src/mesa/program/program.c | 43 -------------------------------------------
 src/mesa/program/program.h |  5 -----
 2 files changed, 48 deletions(-)

diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c
index e94c102..23d8be8 100644
--- a/src/mesa/program/program.c
+++ b/src/mesa/program/program.c
@@ -173,49 +173,6 @@ _mesa_set_program_error(struct gl_context *ctx, GLint pos, const char *string)
 
 
 /**
- * Find the line number and column for 'pos' within 'string'.
- * Return a copy of the line which contains 'pos'.  Free the line with
- * free().
- * \param string  the program string
- * \param pos     the position within the string
- * \param line    returns the line number corresponding to 'pos'.
- * \param col     returns the column number corresponding to 'pos'.
- * \return copy of the line containing 'pos'.
- */
-const GLubyte *
-_mesa_find_line_column(const GLubyte *string, const GLubyte *pos,
-                       GLint *line, GLint *col)
-{
-   const GLubyte *lineStart = string;
-   const GLubyte *p = string;
-   GLubyte *s;
-   int len;
-
-   *line = 1;
-
-   while (p != pos) {
-      if (*p == (GLubyte) '\n') {
-         (*line)++;
-         lineStart = p + 1;
-      }
-      p++;
-   }
-
-   *col = (pos - lineStart) + 1;
-
-   /* return copy of this line */
-   while (*p != 0 && *p != '\n')
-      p++;
-   len = p - lineStart;
-   s = malloc(len + 1);
-   memcpy(s, lineStart, len);
-   s[len] = 0;
-
-   return s;
-}
-
-
-/**
  * Initialize a new gl_program object.
  */
 static void
diff --git a/src/mesa/program/program.h b/src/mesa/program/program.h
index a894147..aad81de 100644
--- a/src/mesa/program/program.h
+++ b/src/mesa/program/program.h
@@ -63,11 +63,6 @@ _mesa_update_default_objects_program(struct gl_context *ctx);
 extern void
 _mesa_set_program_error(struct gl_context *ctx, GLint pos, const char *string);
 
-extern const GLubyte *
-_mesa_find_line_column(const GLubyte *string, const GLubyte *pos,
-                       GLint *line, GLint *col);
-
-
 extern struct gl_program *
 _mesa_init_vertex_program(struct gl_context *ctx,
                           struct gl_vertex_program *prog,
-- 
2.1.4



More information about the mesa-dev mailing list