util: use standard name for snprintf()

Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>

2 files changed, 9 insertions, 9 deletions

diff --git a/src/gallium/drivers/svga/svga_pipe_flush.c b/src/gallium/drivers/svga/svga_pipe_flush.c
index 1f4eebc124a..7e809d0cda8 100644
--- a/src/gallium/drivers/svga/svga_pipe_flush.c
+++ b/src/gallium/drivers/svga/svga_pipe_flush.c
@@ -60,12 +60,12 @@ static void svga_flush( struct pipe_context *pipe,
       unsigned i;
 
       for (i = 0; i < fb->nr_cbufs; i++) {
-         util_snprintf(filename, sizeof(filename), "cbuf%u_%04u.bmp", i, frame_no);
+         snprintf(filename, sizeof(filename), "cbuf%u_%04u.bmp", i, frame_no);
          debug_dump_surface_bmp(&svga->pipe, filename, fb->cbufs[i]);
       }
 
       if (0 && fb->zsbuf) {
-         util_snprintf(filename, sizeof(filename), "zsbuf_%04u.bmp", frame_no);
+         snprintf(filename, sizeof(filename), "zsbuf_%04u.bmp", frame_no);
          debug_dump_surface_bmp(&svga->pipe, filename, fb->zsbuf);
       }
 
diff --git a/src/gallium/drivers/svga/svga_screen.c b/src/gallium/drivers/svga/svga_screen.c
index cf90c759198..9a13e68f17c 100644
--- a/src/gallium/drivers/svga/svga_screen.c
+++ b/src/gallium/drivers/svga/svga_screen.c
@@ -98,7 +98,7 @@ svga_get_name( struct pipe_screen *pscreen )
    llvm = "LLVM;";
 #endif
 
-   util_snprintf(name, sizeof(name), "SVGA3D; %s %s %s", build, mutex, llvm);
+   snprintf(name, sizeof(name), "SVGA3D; %s %s %s", build, mutex, llvm);
    return name;
 }
 
@@ -900,12 +900,12 @@ init_logging(struct pipe_screen *screen)
    char host_log[1000];
 
    /* Log Version to Host */
-   util_snprintf(host_log, sizeof(host_log) - strlen(log_prefix),
-                 "%s%s\n", log_prefix, svga_get_name(screen));
+   snprintf(host_log, sizeof(host_log) - strlen(log_prefix),
+            "%s%s\n", log_prefix, svga_get_name(screen));
    svgascreen->sws->host_log(svgascreen->sws, host_log);
 
-   util_snprintf(host_log, sizeof(host_log) - strlen(log_prefix),
-                 "%s" PACKAGE_VERSION MESA_GIT_SHA1, log_prefix);
+   snprintf(host_log, sizeof(host_log) - strlen(log_prefix),
+            "%s" PACKAGE_VERSION MESA_GIT_SHA1, log_prefix);
    svgascreen->sws->host_log(svgascreen->sws, host_log);
 
    /* If the SVGA_EXTRA_LOGGING env var is set, log the process's command
@@ -914,8 +914,8 @@ init_logging(struct pipe_screen *screen)
    if (debug_get_bool_option("SVGA_EXTRA_LOGGING", FALSE)) {
       char cmdline[1000];
       if (os_get_command_line(cmdline, sizeof(cmdline))) {
-         util_snprintf(host_log, sizeof(host_log) - strlen(log_prefix),
-                       "%s%s\n", log_prefix, cmdline);
+         snprintf(host_log, sizeof(host_log) - strlen(log_prefix),
+                  "%s%s\n", log_prefix, cmdline);
          svgascreen->sws->host_log(svgascreen->sws, host_log);
       }
    }