Added missing Vstr wrappers for asprintf.
[strongswan.git] / src / libstrongswan / printf_hook.c
index df3c7c8..9c1757b 100644 (file)
@@ -16,8 +16,8 @@
 
 #include "printf_hook.h"
 
-#include <utils.h>
-#include <debug.h>
+#include "utils.h"
+#include "debug.h"
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -191,15 +191,9 @@ static void vstr_fmt_add_handler(Vstr_conf *conf, printf_hook_handler_t *handler
 /**
  * Management of thread-specific Vstr_conf objects
  */
-#include <pthread.h>
+#include <threading/thread_value.h>
 
-static pthread_key_t vstr_conf_key;
-static pthread_once_t vstr_conf_key_once = PTHREAD_ONCE_INIT;
-
-static void init_vstr_conf_key(void)
-{
-       pthread_key_create(&vstr_conf_key, (void*)vstr_free_conf);
-}
+static thread_value_t *vstr_conf;
 
 static Vstr_conf *create_vstr_conf()
 {
@@ -223,12 +217,11 @@ static Vstr_conf *create_vstr_conf()
 static inline Vstr_conf *get_vstr_conf()
 {
        Vstr_conf *conf;
-       pthread_once(&vstr_conf_key_once, init_vstr_conf_key);
-       conf = (Vstr_conf*)pthread_getspecific(vstr_conf_key);
+       conf = (Vstr_conf*)vstr_conf->get(vstr_conf);
        if (!conf)
        {
                conf = create_vstr_conf();
-               pthread_setspecific(vstr_conf_key, conf);
+               vstr_conf->set(vstr_conf, conf);
        }
        return conf;
 }
@@ -272,6 +265,15 @@ int vstr_wrapper_snprintf(char *str, size_t size, const char *format, ...)
        va_end(args);
        return written;
 }
+int vstr_wrapper_asprintf(char **str, const char *format, ...)
+{
+       int written;
+       va_list args;
+       va_start(args, format);
+       written = vstr_wrapper_vasprintf(str, format, args);
+       va_end(args);
+       return written;
+}
 static inline int vstr_wrapper_vprintf_internal(int fd, const char *format,
                                                                                                va_list args)
 {
@@ -324,6 +326,26 @@ int vstr_wrapper_vsnprintf(char *str, size_t size, const char *format,
 {
        return (size > 0) ? vstr_wrapper_vsnprintf_internal(str, size, format, args) : 0;
 }
+int vstr_wrapper_vasprintf(char **str, const char *format, va_list args)
+{
+       size_t len = 100;
+       int written;
+       *str = malloc(len);
+       while (TRUE)
+       {
+               va_list ac;
+               va_copy(ac, args);
+               written = vstr_wrapper_vsnprintf_internal(*str, len, format, ac);
+               va_end(ac);
+               if (written < len)
+               {
+                       break;
+               }
+               len = written + 1;
+               *str = realloc(*str, len);
+       }
+       return written;
+}
 
 #endif
 
@@ -340,7 +362,8 @@ static void add_handler(private_printf_hook_t *this, char spec,
 
        if (!IS_VALID_SPEC(spec))
        {
-               DBG1("'%c' is not a valid printf hook specifier, not registered!", spec);
+               DBG1(DBG_LIB, "'%c' is not a valid printf hook specifier, "
+                        "not registered!", spec);
                return;
        }
 
@@ -352,7 +375,8 @@ static void add_handler(private_printf_hook_t *this, char spec,
        {
                if (++i >= ARGS_MAX)
                {
-                       DBG1("Too many arguments for printf hook with specifier '%c', not registered!", spec);
+                       DBG1(DBG_LIB, "Too many arguments for printf hook with "
+                                "specifier '%c', not registered!", spec);
                        va_end(args);
                        free(handler);
                        return;
@@ -412,7 +436,7 @@ static void destroy(private_printf_hook_t *this)
 
 #ifdef USE_VSTR
        /* freeing the Vstr_conf of the main thread */
-       pthread_key_delete(vstr_conf_key);
+       vstr_conf->destroy(vstr_conf);
        vstr_free_conf(conf);
        vstr_exit();
 #endif
@@ -434,10 +458,11 @@ printf_hook_t *printf_hook_create()
 #ifdef USE_VSTR
        if (!vstr_init())
        {
-               DBG1("failed to initialize Vstr library!");
+               DBG1(DBG_LIB, "failed to initialize Vstr library!");
                free(this);
                return NULL;
        }
+       vstr_conf = thread_value_create((thread_cleanup_t)vstr_free_conf);
 #endif
 
        return &this->public;