From: Marek Olšák Date: Mon, 5 Oct 2015 19:39:17 +0000 (+0200) Subject: program: remove unused function _mesa_find_line_column X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c947a3a4c4fbd210fd19a78d7b07ccfdd6f03812;p=mesa.git program: remove unused function _mesa_find_line_column Reviewed-by: Emil Velikov Reviewed-by: Brian Paul --- diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c index e94c1021258..23d8be821f8 100644 --- a/src/mesa/program/program.c +++ b/src/mesa/program/program.c @@ -172,49 +172,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. */ diff --git a/src/mesa/program/program.h b/src/mesa/program/program.h index a894147cafd..aad81de0f35 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,