Some hopefully good changes to get IOs off of halloc

1 files changed, 9 insertions, 8 deletions

diff --git a/common.cpp b/common.cpp
index 0cab244d..40c07404 100644
--- a/common.cpp
+++ b/common.cpp
@@ -113,11 +113,6 @@ int debug_level=1;
 */
 static struct winsize termsize;
 
-/**
-   String buffer used by the wsetlocale function
-*/
-static string_buffer_t *setlocale_buff=0;
-
 
 void show_stackframe() 
 {
@@ -485,20 +480,26 @@ wchar_t **strv2wcsv( const char **in )
 	return res;
 
 }
-
 wcstring format_string(const wchar_t *format, ...)
 {
 	va_list va;
 	va_start( va, format );
+    wcstring result = vformat_string(format, va);
+	va_end( va );
+    return result;
+}
+
+wcstring vformat_string(const wchar_t *format, va_list va_orig)
+{
     string_buffer_t buffer;
     sb_init(&buffer);
-    sb_vprintf(&buffer, format, va);
+    sb_vprintf(&buffer, format, va_orig);
     wcstring result = (wchar_t *)buffer.buff;
     sb_destroy(&buffer);
-	va_end( va );
     return result;
 }
 
+
 wchar_t *wcsvarname( const wchar_t *str )
 {
 	while( *str )