let _mesa_problem() take variable arguments

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index fc94183e41b68527b6832dae3978c11b705528a3..b64bb3cc3301c3eb06e577c64dd12c1282c6493e 100644 (file)
--- 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 35c06d21538df9284b0915d7db0b9ce2d77cf1c8..85493651923ebf8b50fc829d702fea45de65784b 100644 (file)
--- 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, ... );