Replace the _mesa_*printf() wrappers with the plain libc versions

3 files changed, 57 insertions, 57 deletions

diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index f097d93a71..33a3ff6d5f 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -53,7 +53,7 @@
 #include "xmesaP.h"
 
 #ifdef __VMS
-#define _mesa_sprintf sprintf
+#define sprintf sprintf
 #endif
 
 /* This indicates the client-side GLX API and GLX encoder version. */
@@ -2032,8 +2032,8 @@ static const char *
 Fake_glXQueryServerString( Display *dpy, int screen, int name )
 {
    static char version[1000];
-   _mesa_sprintf(version, "%d.%d %s",
-                 SERVER_MAJOR_VERSION, SERVER_MINOR_VERSION, MESA_GLX_VERSION);
+   sprintf(version, "%d.%d %s",
+	   SERVER_MAJOR_VERSION, SERVER_MINOR_VERSION, MESA_GLX_VERSION);
 
    (void) dpy;
    (void) screen;
@@ -2057,8 +2057,8 @@ static const char *
 Fake_glXGetClientString( Display *dpy, int name )
 {
    static char version[1000];
-   _mesa_sprintf(version, "%d.%d %s", CLIENT_MAJOR_VERSION,
-                 CLIENT_MINOR_VERSION, MESA_GLX_VERSION);
+   sprintf(version, "%d.%d %s", CLIENT_MAJOR_VERSION,
+	   CLIENT_MINOR_VERSION, MESA_GLX_VERSION);
 
    (void) dpy;
 
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index ed945023cf..3711c88148 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -1110,12 +1110,12 @@ initialize_visual_and_buffer(XMesaVisual v, XMesaBuffer b,
     * reports bugs.
     */
    if (_mesa_getenv("MESA_INFO")) {
-      _mesa_printf("X/Mesa visual = %p\n", (void *) v);
-      _mesa_printf("X/Mesa dithered pf = %u\n", v->dithered_pf);
-      _mesa_printf("X/Mesa undithered pf = %u\n", v->undithered_pf);
-      _mesa_printf("X/Mesa level = %d\n", v->mesa_visual.level);
-      _mesa_printf("X/Mesa depth = %d\n", GET_VISUAL_DEPTH(v));
-      _mesa_printf("X/Mesa bits per pixel = %d\n", v->BitsPerPixel);
+      printf("X/Mesa visual = %p\n", (void *) v);
+      printf("X/Mesa dithered pf = %u\n", v->dithered_pf);
+      printf("X/Mesa undithered pf = %u\n", v->undithered_pf);
+      printf("X/Mesa level = %d\n", v->mesa_visual.level);
+      printf("X/Mesa depth = %d\n", GET_VISUAL_DEPTH(v));
+      printf("X/Mesa bits per pixel = %d\n", v->BitsPerPixel);
    }
 
    if (b && window) {
diff --git a/src/mesa/drivers/x11/xm_tri.c b/src/mesa/drivers/x11/xm_tri.c
index 3a0cf80139..a6efb35e3c 100644
--- a/src/mesa/drivers/x11/xm_tri.c
+++ b/src/mesa/drivers/x11/xm_tri.c
@@ -1330,97 +1330,97 @@
 extern void _xmesa_print_triangle_func( swrast_tri_func triFunc );
 void _xmesa_print_triangle_func( swrast_tri_func triFunc )
 {
-   _mesa_printf("XMesa tri func = ");
+   printf("XMesa tri func = ");
    if (triFunc ==smooth_TRUECOLOR_z_triangle)
-      _mesa_printf("smooth_TRUECOLOR_z_triangle\n");
+      printf("smooth_TRUECOLOR_z_triangle\n");
    else if (triFunc ==smooth_8A8B8G8R_z_triangle)
-      _mesa_printf("smooth_8A8B8G8R_z_triangle\n");
+      printf("smooth_8A8B8G8R_z_triangle\n");
    else if (triFunc ==smooth_8A8R8G8B_z_triangle)
-      _mesa_printf("smooth_8A8R8G8B_z_triangle\n");
+      printf("smooth_8A8R8G8B_z_triangle\n");
    else if (triFunc ==smooth_8R8G8B_z_triangle)
-      _mesa_printf("smooth_8R8G8B_z_triangle\n");
+      printf("smooth_8R8G8B_z_triangle\n");
    else if (triFunc ==smooth_8R8G8B24_z_triangle)
-      _mesa_printf("smooth_8R8G8B24_z_triangle\n");
+      printf("smooth_8R8G8B24_z_triangle\n");
    else if (triFunc ==smooth_TRUEDITHER_z_triangle)
-      _mesa_printf("smooth_TRUEDITHER_z_triangle\n");
+      printf("smooth_TRUEDITHER_z_triangle\n");
    else if (triFunc ==smooth_5R6G5B_z_triangle)
-      _mesa_printf("smooth_5R6G5B_z_triangle\n");
+      printf("smooth_5R6G5B_z_triangle\n");
    else if (triFunc ==smooth_DITHER_5R6G5B_z_triangle)
-      _mesa_printf("smooth_DITHER_5R6G5B_z_triangle\n");
+      printf("smooth_DITHER_5R6G5B_z_triangle\n");
    else if (triFunc ==smooth_HPCR_z_triangle)
-      _mesa_printf("smooth_HPCR_z_triangle\n");
+      printf("smooth_HPCR_z_triangle\n");
    else if (triFunc ==smooth_DITHER8_z_triangle)
-      _mesa_printf("smooth_DITHER8_z_triangle\n");
+      printf("smooth_DITHER8_z_triangle\n");
    else if (triFunc ==smooth_LOOKUP8_z_triangle)
-      _mesa_printf("smooth_LOOKUP8_z_triangle\n");
+      printf("smooth_LOOKUP8_z_triangle\n");
    else if (triFunc ==flat_TRUECOLOR_z_triangle)
-      _mesa_printf("flat_TRUECOLOR_z_triangle\n");
+      printf("flat_TRUECOLOR_z_triangle\n");
    else if (triFunc ==flat_8A8B8G8R_z_triangle)
-      _mesa_printf("flat_8A8B8G8R_z_triangle\n");
+      printf("flat_8A8B8G8R_z_triangle\n");
    else if (triFunc ==flat_8A8R8G8B_z_triangle)
-      _mesa_printf("flat_8A8R8G8B_z_triangle\n");
+      printf("flat_8A8R8G8B_z_triangle\n");
    else if (triFunc ==flat_8R8G8B_z_triangle)
-      _mesa_printf("flat_8R8G8B_z_triangle\n");
+      printf("flat_8R8G8B_z_triangle\n");
    else if (triFunc ==flat_8R8G8B24_z_triangle)
-      _mesa_printf("flat_8R8G8B24_z_triangle\n");
+      printf("flat_8R8G8B24_z_triangle\n");
    else if (triFunc ==flat_TRUEDITHER_z_triangle)
-      _mesa_printf("flat_TRUEDITHER_z_triangle\n");
+      printf("flat_TRUEDITHER_z_triangle\n");
    else if (triFunc ==flat_5R6G5B_z_triangle)
-      _mesa_printf("flat_5R6G5B_z_triangle\n");
+      printf("flat_5R6G5B_z_triangle\n");
    else if (triFunc ==flat_DITHER_5R6G5B_z_triangle)
-      _mesa_printf("flat_DITHER_5R6G5B_z_triangle\n");
+      printf("flat_DITHER_5R6G5B_z_triangle\n");
    else if (triFunc ==flat_HPCR_z_triangle)
-      _mesa_printf("flat_HPCR_z_triangle\n");
+      printf("flat_HPCR_z_triangle\n");
    else if (triFunc ==flat_DITHER8_z_triangle)
-      _mesa_printf("flat_DITHER8_z_triangle\n");
+      printf("flat_DITHER8_z_triangle\n");
    else if (triFunc ==flat_LOOKUP8_z_triangle)
-      _mesa_printf("flat_LOOKUP8_z_triangle\n");
+      printf("flat_LOOKUP8_z_triangle\n");
    else if (triFunc ==smooth_TRUECOLOR_triangle)
-      _mesa_printf("smooth_TRUECOLOR_triangle\n");
+      printf("smooth_TRUECOLOR_triangle\n");
    else if (triFunc ==smooth_8A8B8G8R_triangle)
-      _mesa_printf("smooth_8A8B8G8R_triangle\n");
+      printf("smooth_8A8B8G8R_triangle\n");
    else if (triFunc ==smooth_8A8R8G8B_triangle)
-      _mesa_printf("smooth_8A8R8G8B_triangle\n");
+      printf("smooth_8A8R8G8B_triangle\n");
    else if (triFunc ==smooth_8R8G8B_triangle)
-      _mesa_printf("smooth_8R8G8B_triangle\n");
+      printf("smooth_8R8G8B_triangle\n");
    else if (triFunc ==smooth_8R8G8B24_triangle)
-      _mesa_printf("smooth_8R8G8B24_triangle\n");
+      printf("smooth_8R8G8B24_triangle\n");
    else if (triFunc ==smooth_TRUEDITHER_triangle)
-      _mesa_printf("smooth_TRUEDITHER_triangle\n");
+      printf("smooth_TRUEDITHER_triangle\n");
    else if (triFunc ==smooth_5R6G5B_triangle)
-      _mesa_printf("smooth_5R6G5B_triangle\n");
+      printf("smooth_5R6G5B_triangle\n");
    else if (triFunc ==smooth_DITHER_5R6G5B_triangle)
-      _mesa_printf("smooth_DITHER_5R6G5B_triangle\n");
+      printf("smooth_DITHER_5R6G5B_triangle\n");
    else if (triFunc ==smooth_HPCR_triangle)
-      _mesa_printf("smooth_HPCR_triangle\n");
+      printf("smooth_HPCR_triangle\n");
    else if (triFunc ==smooth_DITHER8_triangle)
-      _mesa_printf("smooth_DITHER8_triangle\n");
+      printf("smooth_DITHER8_triangle\n");
    else if (triFunc ==smooth_LOOKUP8_triangle)
-      _mesa_printf("smooth_LOOKUP8_triangle\n");
+      printf("smooth_LOOKUP8_triangle\n");
    else if (triFunc ==flat_TRUECOLOR_triangle)
-      _mesa_printf("flat_TRUECOLOR_triangle\n");
+      printf("flat_TRUECOLOR_triangle\n");
    else if (triFunc ==flat_TRUEDITHER_triangle)
-      _mesa_printf("flat_TRUEDITHER_triangle\n");
+      printf("flat_TRUEDITHER_triangle\n");
    else if (triFunc ==flat_8A8B8G8R_triangle)
-      _mesa_printf("flat_8A8B8G8R_triangle\n");
+      printf("flat_8A8B8G8R_triangle\n");
    else if (triFunc ==flat_8A8R8G8B_triangle)
-      _mesa_printf("flat_8A8R8G8B_triangle\n");
+      printf("flat_8A8R8G8B_triangle\n");
    else if (triFunc ==flat_8R8G8B_triangle)
-      _mesa_printf("flat_8R8G8B_triangle\n");
+      printf("flat_8R8G8B_triangle\n");
    else if (triFunc ==flat_8R8G8B24_triangle)
-      _mesa_printf("flat_8R8G8B24_triangle\n");
+      printf("flat_8R8G8B24_triangle\n");
    else if (triFunc ==flat_5R6G5B_triangle)
-      _mesa_printf("flat_5R6G5B_triangle\n");
+      printf("flat_5R6G5B_triangle\n");
    else if (triFunc ==flat_DITHER_5R6G5B_triangle)
-      _mesa_printf("flat_DITHER_5R6G5B_triangle\n");
+      printf("flat_DITHER_5R6G5B_triangle\n");
    else if (triFunc ==flat_HPCR_triangle)
-      _mesa_printf("flat_HPCR_triangle\n");
+      printf("flat_HPCR_triangle\n");
    else if (triFunc ==flat_DITHER8_triangle)
-      _mesa_printf("flat_DITHER8_triangle\n");
+      printf("flat_DITHER8_triangle\n");
    else if (triFunc ==flat_LOOKUP8_triangle)
-      _mesa_printf("flat_LOOKUP8_triangle\n");
+      printf("flat_LOOKUP8_triangle\n");
    else
-      _mesa_printf("???\n");
+      printf("???\n");
 }
 #endif