diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2002-12-06 03:10:59 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2002-12-06 03:10:59 +0000 |
| commit | 6f458650bf27fc7a86e90338cf583bd44fc630c2 (patch) | |
| tree | 957e2b125599272a244748cdd227912f641f8c23 | |
| parent | 46b99c9016860af0cf4c4b19329fa82bddecb8ee (diff) | |
let _mesa_problem() take variable arguments
| -rw-r--r-- | src/mesa/main/imports.c | 17 | ||||
| -rw-r--r-- | src/mesa/main/imports.h | 6 |
2 files changed, 15 insertions, 8 deletions
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c index fc94183e41..b64bb3cc33 100644 --- a/src/mesa/main/imports.c +++ b/src/mesa/main/imports.c @@ -1,8 +1,8 @@ -/* $Id: imports.c,v 1.26 2002/12/01 13:59:11 brianp Exp $ */ +/* $Id: imports.c,v 1.27 2002/12/06 03:10:59 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 5.0.1 + * Version: 5.1 * * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. * @@ -429,14 +429,21 @@ _mesa_warning( GLcontext *ctx, const char *fmtString, ... ) * path which may not be implemented fully or correctly. */ void -_mesa_problem( const GLcontext *ctx, const char *s ) +_mesa_problem( const GLcontext *ctx, const char *fmtString, ... ) { + va_list args; + char str[MAXSTRING]; (void) ctx; + + va_start( args, fmtString ); + vsnprintf( str, MAXSTRING, fmtString, args ); + va_end( args ); + #if defined(XFree86LOADER) && defined(IN_MODULE) - xf86fprintf(stderr, "Mesa implementation error: %s\n", s); + xf86fprintf(stderr, "Mesa implementation error: %s\n", str); xf86fprintf(stderr, "Please report to the DRI project at dri.sourceforge.net\n"); #else - fprintf(stderr, "Mesa implementation error: %s\n", s); + fprintf(stderr, "Mesa implementation error: %s\n", str); fprintf(stderr, "Please report to the Mesa bug database at www.mesa3d.org\n" ); #endif } diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h index 35c06d2153..8549365192 100644 --- a/src/mesa/main/imports.h +++ b/src/mesa/main/imports.h @@ -1,8 +1,8 @@ -/* $Id: imports.h,v 1.8 2002/10/30 19:49:29 brianp Exp $ */ +/* $Id: imports.h,v 1.9 2002/12/06 03:10:59 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 5.0 + * Version: 5.1 * * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. * @@ -177,7 +177,7 @@ extern void _mesa_warning( __GLcontext *gc, const char *fmtString, ... ); extern void -_mesa_problem( const __GLcontext *ctx, const char *s ); +_mesa_problem( const __GLcontext *ctx, const char *fmtString, ... ); extern void _mesa_error( __GLcontext *ctx, GLenum error, const char *fmtString, ... ); |