ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cosmetic cr/lfs on debug, 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2634 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2008-09-29 08:15:50 +00:00
parent 7e26b15eb5
commit d15e05e016
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/zm_signal.cpp
View File

@ -68,13 +68,13 @@ RETSIGTYPE zm_die_handler( int signal )
int trace_size = 0; int trace_size = 0;
#if HAVE_STRUCT_SIGCONTEXT_EIP #if HAVE_STRUCT_SIGCONTEXT_EIP
Error( "Signal address is %p, from %p\n", (void *)context.cr2, (void *)context.eip ); Error( "Signal address is %p, from %p", (void *)context.cr2, (void *)context.eip );
trace_size = backtrace( trace, 16 ); trace_size = backtrace( trace, 16 );
// overwrite sigaction with caller's address // overwrite sigaction with caller's address
trace[1] = (void *)context.eip; trace[1] = (void *)context.eip;
#elif HAVE_STRUCT_SIGCONTEXT #elif HAVE_STRUCT_SIGCONTEXT
Error( "Signal address is %p, no eip\n", context.cr2 ); Error( "Signal address is %p, no eip", context.cr2 );
trace_size = backtrace( trace, 16 ); trace_size = backtrace( trace, 16 );
#else // HAVE_STRUCT_SIGCONTEXT #else // HAVE_STRUCT_SIGCONTEXT
@ -82,7 +82,7 @@ RETSIGTYPE zm_die_handler( int signal )
{ {
ucontext_t *uc = (ucontext_t *)context; ucontext_t *uc = (ucontext_t *)context;
Error( "Signal address is %p, from %p\n", info->si_addr, uc->uc_mcontext.gregs[REG_EIP] ); Error( "Signal address is %p, from %p", info->si_addr, uc->uc_mcontext.gregs[REG_EIP] );
trace_size = backtrace( trace, 16 ); trace_size = backtrace( trace, 16 );
// overwrite sigaction with caller's address // overwrite sigaction with caller's address