--- src/mesa/main/errors.c | 13 +++++++------ src/mesa/main/imports.c | 8 -------- src/mesa/main/imports.h | 3 --- 3 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/src/mesa/main/errors.c b/src/mesa/main/errors.c index a9687913627..18dff1ce3cc 100644 --- a/src/mesa/main/errors.c +++ b/src/mesa/main/errors.c @@ -35,6 +35,7 @@ #include "imports.h" #include "context.h" #include "debug_output.h" +#include "util/u_string.h" static FILE *LogFile = NULL; @@ -140,7 +141,7 @@ _mesa_warning( struct gl_context *ctx, const char *fmtString, ... ) char str[MAX_DEBUG_MESSAGE_LENGTH]; va_list args; va_start( args, fmtString ); - (void) _mesa_vsnprintf( str, MAX_DEBUG_MESSAGE_LENGTH, fmtString, args ); + (void) util_vsnprintf( str, MAX_DEBUG_MESSAGE_LENGTH, fmtString, args ); va_end( args ); if (ctx) @@ -170,7 +171,7 @@ _mesa_problem( const struct gl_context *ctx, const char *fmtString, ... ) numCalls++; va_start( args, fmtString ); - _mesa_vsnprintf( str, MAX_DEBUG_MESSAGE_LENGTH, fmtString, args ); + util_vsnprintf( str, MAX_DEBUG_MESSAGE_LENGTH, fmtString, args ); va_end( args ); fprintf(stderr, "Mesa " PACKAGE_VERSION " implementation error: %s\n", str); @@ -230,7 +231,7 @@ _mesa_gl_vdebug(struct gl_context *ctx, _mesa_debug_get_id(id); - len = _mesa_vsnprintf(s, MAX_DEBUG_MESSAGE_LENGTH, fmtString, args); + len = util_vsnprintf(s, MAX_DEBUG_MESSAGE_LENGTH, fmtString, args); _mesa_log_msg(ctx, source, type, *id, severity, len, s); } @@ -295,7 +296,7 @@ _mesa_error( struct gl_context *ctx, GLenum error, const char *fmtString, ... ) va_list args; va_start(args, fmtString); - len = _mesa_vsnprintf(s, MAX_DEBUG_MESSAGE_LENGTH, fmtString, args); + len = util_vsnprintf(s, MAX_DEBUG_MESSAGE_LENGTH, fmtString, args); va_end(args); if (len >= MAX_DEBUG_MESSAGE_LENGTH) { @@ -352,7 +353,7 @@ _mesa_debug( const struct gl_context *ctx, const char *fmtString, ... ) char s[MAX_DEBUG_MESSAGE_LENGTH]; va_list args; va_start(args, fmtString); - _mesa_vsnprintf(s, MAX_DEBUG_MESSAGE_LENGTH, fmtString, args); + util_vsnprintf(s, MAX_DEBUG_MESSAGE_LENGTH, fmtString, args); va_end(args); output_if_debug("Mesa", s, GL_FALSE); #endif /* DEBUG */ @@ -367,7 +368,7 @@ _mesa_log(const char *fmtString, ...) char s[MAX_DEBUG_MESSAGE_LENGTH]; va_list args; va_start(args, fmtString); - _mesa_vsnprintf(s, MAX_DEBUG_MESSAGE_LENGTH, fmtString, args); + util_vsnprintf(s, MAX_DEBUG_MESSAGE_LENGTH, fmtString, args); va_end(args); output_if_debug("", s, GL_FALSE); } diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c index 566aac1d385..edb5f8fde4e 100644 --- a/src/mesa/main/imports.c +++ b/src/mesa/main/imports.c @@ -212,14 +212,6 @@ _mesa_align_realloc(void *oldBuffer, size_t oldSize, size_t newSize, /*@}*/ - -/** Needed due to #ifdef's, above. */ -int -_mesa_vsnprintf(char *str, size_t size, const char *fmt, va_list args) -{ - return vsnprintf( str, size, fmt, args); -} - /** Wrapper around vsnprintf() */ int _mesa_snprintf( char *str, size_t size, const char *fmt, ... ) diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h index 59fffd5aa1d..2535dd23ba8 100644 --- a/src/mesa/main/imports.h +++ b/src/mesa/main/imports.h @@ -166,9 +166,6 @@ _mesa_align_realloc(void *oldBuffer, size_t oldSize, size_t newSize, extern int _mesa_snprintf( char *str, size_t size, const char *fmt, ... ) PRINTFLIKE(3, 4); -extern int -_mesa_vsnprintf(char *str, size_t size, const char *fmt, va_list arg); - #if defined(_WIN32) && !defined(strtok_r) #define strtok_r strtok_s -- 2.19.1 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev