sal/osl/unx/backtrace.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
New commits: commit 7d41b0a9559a388fe558cf7e8d81e4909a785af3 Author: Damjan Jovanovic <dam...@apache.org> Date: Sun Dec 13 23:55:35 2015 +0000 Use %tx to print ptrdiff_t. Patch by: me diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c index b8a2726..fadd07b 100644 --- a/sal/osl/unx/backtrace.c +++ b/sal/osl/unx/backtrace.c @@ -116,12 +116,12 @@ void backtrace_symbols_fd( void **buffer, int size, int fd ) if ( dli.dli_fname && dli.dli_fbase ) { offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase; - fprintf( fp, "%s+0x%x", dli.dli_fname, offset ); + fprintf( fp, "%s+0x%" SAL_PRI_PTRDIFFT "x", dli.dli_fname, offset ); } if ( dli.dli_sname && dli.dli_saddr ) { offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr; - fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset ); + fprintf( fp, "(%s+0x%" SAL_PRI_PTRDIFFT "x)", dli.dli_sname, offset ); } } fprintf( fp, "[%p]\n", *pFramePtr ); @@ -270,12 +270,12 @@ void backtrace_symbols_fd( void **buffer, int size, int fd ) if ( dli.dli_fname && dli.dli_fbase ) { offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase; - fprintf( fp, "%s+0x%x", dli.dli_fname, offset ); + fprintf( fp, "%s+0x%" SAL_PRI_PTRDIFFT "x", dli.dli_fname, offset ); } if ( dli.dli_sname && dli.dli_saddr ) { offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr; - fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset ); + fprintf( fp, "(%s+0x%" SAL_PRI_PTRDIFFT "x)", dli.dli_sname, offset ); } } fprintf( fp, "[%p]\n", *pFramePtr ); @@ -336,12 +336,12 @@ void backtrace_symbols_fd( void **buffer, int size, int fd ) if ( dli.dli_fname && dli.dli_fbase ) { offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase; - fprintf( fp, "%s+0x%x", dli.dli_fname, offset ); + fprintf( fp, "%s+0x%" SAL_PRI_PTRDIFFT "x", dli.dli_fname, offset ); } if ( dli.dli_sname && dli.dli_saddr ) { offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr; - fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset ); + fprintf( fp, "(%s+0x%" SAL_PRI_PTRDIFFT "x)", dli.dli_sname, offset ); } } fprintf( fp, "[%p]\n", *pFramePtr ); commit 25f185144085ebe06405a5d8f19a11544ed7f794 Author: Damjan Jovanovic <dam...@apache.org> Date: Sun Dec 13 23:35:09 2015 +0000 Use %p to print pointers in sal backtraces instead of 0x%x + conversion to integer. Patch by: me diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c index 4ba05cc..b8a2726 100644 --- a/sal/osl/unx/backtrace.c +++ b/sal/osl/unx/backtrace.c @@ -124,7 +124,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd ) fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset ); } } - fprintf( fp, "[0x%x]\n", *pFramePtr ); + fprintf( fp, "[%p]\n", *pFramePtr ); } fflush( fp ); @@ -192,7 +192,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd ) fprintf( fp, "(%s+0x%" SAL_PRI_PTRDIFFT "x)", dli.dli_sname, offset ); } } - fprintf( fp, "[0x%p]\n", *pFramePtr ); + fprintf( fp, "[%p]\n", *pFramePtr ); } fflush( fp ); fclose( fp ); @@ -278,7 +278,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd ) fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset ); } } - fprintf( fp, "[0x%x]\n", *pFramePtr ); + fprintf( fp, "[%p]\n", *pFramePtr ); } fflush( fp ); @@ -344,7 +344,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd ) fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset ); } } - fprintf( fp, "[0x%x]\n", (unsigned int)*pFramePtr ); + fprintf( fp, "[%p]\n", *pFramePtr ); } fflush( fp ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits