diff options
Diffstat (limited to 'src/libstrongswan/printf_hook.c')
| -rw-r--r-- | src/libstrongswan/printf_hook.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/libstrongswan/printf_hook.c b/src/libstrongswan/printf_hook.c index 4d4cef829..1f57ffcce 100644 --- a/src/libstrongswan/printf_hook.c +++ b/src/libstrongswan/printf_hook.c @@ -377,10 +377,15 @@ int vstr_wrapper_vasprintf(char **str, const char *format, va_list args) } #endif +<<<<<<< HEAD /** * Implementation of printf_hook_t.add_handler. */ static void add_handler(private_printf_hook_t *this, char spec, +======= +METHOD(printf_hook_t, add_handler, void, + private_printf_hook_t *this, char spec, +>>>>>>> upstream/4.5.1 printf_hook_function_t hook, ...) { int i = -1; @@ -439,10 +444,15 @@ static void add_handler(private_printf_hook_t *this, char spec, } } +<<<<<<< HEAD /** * Implementation of printf_hook_t.destroy */ static void destroy(private_printf_hook_t *this) +======= +METHOD(printf_hook_t, destroy, void, + private_printf_hook_t *this) +>>>>>>> upstream/4.5.1 { int i; #ifdef USE_VSTR @@ -477,10 +487,21 @@ static void destroy(private_printf_hook_t *this) */ printf_hook_t *printf_hook_create() { +<<<<<<< HEAD private_printf_hook_t *this = malloc_thing(private_printf_hook_t); this->public.add_handler = (void(*)(printf_hook_t*, char, printf_hook_function_t, ...))add_handler; this->public.destroy = (void(*)(printf_hook_t*))destroy; +======= + private_printf_hook_t *this; + + INIT(this, + .public = { + .add_handler = _add_handler, + .destroy = _destroy, + }, + ); +>>>>>>> upstream/4.5.1 memset(printf_hooks, 0, sizeof(printf_hooks)); |