You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pf...@apache.org on 2015/11/25 23:08:04 UTC
svn commit: r1716553 - /openoffice/trunk/main/sal/osl/unx/backtrace.c
Author: pfg
Date: Wed Nov 25 22:08:04 2015
New Revision: 1716553
URL: http://svn.apache.org/viewvc?rev=1716553&view=rev
Log:
i66807 - Fix GCC warning in backtrace.c
The Bugzilla issue has another fix for sparc but I have no way ot test it.
Modified:
openoffice/trunk/main/sal/osl/unx/backtrace.c
Modified: openoffice/trunk/main/sal/osl/unx/backtrace.c
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/osl/unx/backtrace.c?rev=1716553&r1=1716552&r2=1716553&view=diff
==============================================================================
--- openoffice/trunk/main/sal/osl/unx/backtrace.c (original)
+++ openoffice/trunk/main/sal/osl/unx/backtrace.c Wed Nov 25 22:08:04 2015
@@ -184,15 +184,23 @@ void backtrace_symbols_fd( void **buffer
if ( dli.dli_fname && dli.dli_fbase )
{
offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase;
+#if defined X86_64
+ fprintf( fp, "%s+0x%lx", dli.dli_fname, offset );
+#else
fprintf( fp, "%s+0x%x", dli.dli_fname, offset );
+#endif
}
if ( dli.dli_sname && dli.dli_saddr )
{
offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr;
+#if defined X86_64
+ fprintf( fp, "(%s+0x%lx)", dli.dli_sname, offset );
+#else
fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
+#endif
}
}
- fprintf( fp, "[0x%x]\n", *pFramePtr );
+ fprintf( fp, "[0x%p]\n", *pFramePtr );
}
fflush( fp );
fclose( fp );