diff options
Diffstat (limited to 'src/libstrongswan/printf_hook.c')
| -rw-r--r-- | src/libstrongswan/printf_hook.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/libstrongswan/printf_hook.c b/src/libstrongswan/printf_hook.c index 1f57ffcce..7e7045d69 100644 --- a/src/libstrongswan/printf_hook.c +++ b/src/libstrongswan/printf_hook.c @@ -377,15 +377,8 @@ 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; @@ -444,15 +437,8 @@ METHOD(printf_hook_t, add_handler, void, } } -<<<<<<< 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 @@ -487,12 +473,6 @@ METHOD(printf_hook_t, destroy, void, */ 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, @@ -501,7 +481,6 @@ printf_hook_t *printf_hook_create() .destroy = _destroy, }, ); ->>>>>>> upstream/4.5.1 memset(printf_hooks, 0, sizeof(printf_hooks)); |