summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Gomez <agomez@igalia.com>2018-08-01 16:26:48 +0300
committerDylan Baker <dylan@pnwbakers.com>2018-08-02 11:01:54 -0700
commit7574119e046fcbbc5f9481b30fbb6ef000a5d33f (patch)
tree15d3348d7b04c7408cd0a206a4b4c2921e229db8
parentdbcc6decdcda97412ee5656b5b9971c2676486d4 (diff)
ddebug: use util_snprintf() in dd_get_debug_filename_and_mkdir
Instead of plain snprintf(). To fix the MSVC 2013 build: Compiling src\gallium\auxiliary\driver_ddebug\dd_draw.c ... dd_draw.c c:\projects\mesa\src\gallium\auxiliary\driver_ddebug\dd_util.h(60) : warning C4013: 'snprintf' undefined; assuming extern returning int ... gallium.lib(dd_draw.obj) : error LNK2001: unresolved external symbol _snprintf build\windows-x86-debug\gallium\targets\graw-gdi\graw.dll : fatal error LNK1120: 1 unresolved externals scons: *** [build\windows-x86-debug\gallium\targets\graw-gdi\graw.dll] Error 1120 scons: building terminated because of errors. Fixes: 6ff0c6f4ebc ("gallium: move ddebug, noop, rbug, trace to auxiliary to improve build times") Cc: Marek Olšák <marek.olsak@amd.com> Cc: Brian Paul <brianp@vmware.com> Cc: Roland Scheidegger <sroland@vmware.com> Cc: Nicolai Hähnle <nicolai.haehnle@amd.com> Signed-off-by: Andres Gomez <agomez@igalia.com> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com> (cherry picked from commit 1090e97e77fcde03552320b8262f14e3f0367391)
-rw-r--r--src/gallium/auxiliary/driver_ddebug/dd_util.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/driver_ddebug/dd_util.h b/src/gallium/auxiliary/driver_ddebug/dd_util.h
index 8953e34d588..7720e9af9ca 100644
--- a/src/gallium/auxiliary/driver_ddebug/dd_util.h
+++ b/src/gallium/auxiliary/driver_ddebug/dd_util.h
@@ -35,6 +35,7 @@
#include "os/os_process.h"
#include "util/u_atomic.h"
#include "util/u_debug.h"
+#include "util/u_string.h"
#include "pipe/p_config.h"
#ifdef PIPE_OS_UNIX
@@ -57,13 +58,13 @@ dd_get_debug_filename_and_mkdir(char *buf, size_t buflen, bool verbose)
strcpy(proc_name, "unknown");
}
- snprintf(dir, sizeof(dir), "%s/"DD_DIR, debug_get_option("HOME", "."));
+ util_snprintf(dir, sizeof(dir), "%s/"DD_DIR, debug_get_option("HOME", "."));
if (mkdir(dir, 0774) && errno != EEXIST)
fprintf(stderr, "dd: can't create a directory (%i)\n", errno);
- snprintf(buf, buflen, "%s/%s_%u_%08u", dir, proc_name, getpid(),
- p_atomic_inc_return(&index) - 1);
+ util_snprintf(buf, buflen, "%s/%s_%u_%08u", dir, proc_name, getpid(),
+ p_atomic_inc_return(&index) - 1);
if (verbose)
fprintf(stderr, "dd: dumping to file %s\n", buf);