From 15e9b583179e63c6528b345fa51663b0dab8d809 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 1 Dec 2014 21:40:43 +0000 Subject: [PATCH] Linux fixes for switch to UTF-8 strings. --- renderdoc/hooks/linux_libentry.cpp | 2 +- renderdoc/os/linux/linux_stringio.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/renderdoc/hooks/linux_libentry.cpp b/renderdoc/hooks/linux_libentry.cpp index 7a0ba5b61..3ce771f7e 100644 --- a/renderdoc/hooks/linux_libentry.cpp +++ b/renderdoc/hooks/linux_libentry.cpp @@ -48,7 +48,7 @@ void library_loaded() { RenderDoc::Inst().Initialise(); - RDCLOG("Loading into %S", curfile.c_str()); + RDCLOG("Loading into %s", curfile.c_str()); LibraryHooks::GetInstance().CreateHooks(); } diff --git a/renderdoc/os/linux/linux_stringio.cpp b/renderdoc/os/linux/linux_stringio.cpp index 0feddaffd..b93fb44a8 100644 --- a/renderdoc/os/linux/linux_stringio.cpp +++ b/renderdoc/os/linux/linux_stringio.cpp @@ -216,10 +216,9 @@ namespace StringFormat int size = StringFormat::vsnprintf(NULL, 0, format, args2); char *buf = new char[size+1]; + StringFormat::vsnprintf(buf, size+1, format, args); buf[size] = 0; - StringFormat::vsnprintf(buf, size, format, args); - va_end(args); va_end(args2);