diff options
Diffstat (limited to 'src/libstrongswan/utils/backtrace.c')
| -rw-r--r-- | src/libstrongswan/utils/backtrace.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/libstrongswan/utils/backtrace.c b/src/libstrongswan/utils/backtrace.c index 5f1318b9a..5744439f8 100644 --- a/src/libstrongswan/utils/backtrace.c +++ b/src/libstrongswan/utils/backtrace.c @@ -80,7 +80,7 @@ static void log_(private_backtrace_t *this, FILE *file, bool detailed) } if (info.dli_sname) { - fprintf(file, " \e[33m%s\e[0m @ %p (\e[31m%s\e[0m+0x%x) [%p]\n", + fprintf(file, " \e[33m%s\e[0m @ %p (\e[31m%s\e[0m+0x%tx) [%p]\n", info.dli_fname, info.dli_fbase, info.dli_sname, this->frames[i] - info.dli_saddr, this->frames[i]); } @@ -132,18 +132,11 @@ static void log_(private_backtrace_t *this, FILE *file, bool detailed) /** * Implementation of backtrace_t.contains_function */ -<<<<<<< HEAD -static bool contains_function(private_backtrace_t *this, char *function) -{ -#ifdef HAVE_DLADDR - int i; -======= static bool contains_function(private_backtrace_t *this, char *function[], int count) { #ifdef HAVE_DLADDR int i, j; ->>>>>>> upstream/4.5.1 for (i = 0; i< this->frame_count; i++) { @@ -151,18 +144,12 @@ static bool contains_function(private_backtrace_t *this, if (dladdr(this->frames[i], &info) && info.dli_sname) { -<<<<<<< HEAD - if (streq(info.dli_sname, function)) - { - return TRUE; -======= for (j = 0; j < count; j++) { if (streq(info.dli_sname, function[j])) { return TRUE; } ->>>>>>> upstream/4.5.1 } } } @@ -196,11 +183,7 @@ backtrace_t *backtrace_create(int skip) this->frame_count = frame_count; this->public.log = (void(*)(backtrace_t*,FILE*,bool))log_; -<<<<<<< HEAD - this->public.contains_function = (bool(*)(backtrace_t*, char *function))contains_function; -======= this->public.contains_function = (bool(*)(backtrace_t*, char *function[], int count))contains_function; ->>>>>>> upstream/4.5.1 this->public.destroy = (void(*)(backtrace_t*))destroy; return &this->public; |