sal/osl/unx/file.cxx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit d358c377718f981d615b5ba2c6c5137dd150d2f0
Author: Tor Lillqvist <t...@collabora.com>
Date: Sat Dec 21 20:42:07 2013 +0200
Print file and not pointer value in SAL_INFO
Change-Id: I96e7ac419f4300a1dd62a5c24611c1467ef3b19a
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 28bea88..3efa1a0 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -25,6 +25,8 @@
#include "osl/diagnose.h"
#include "rtl/alloc.h"
+#include <rtl/string.hxx>
+
#include <sal/log.hxx>
#include "system.h"
@@ -992,7 +994,7 @@ SAL_CALL osl_openFilePath( const char *cpFilePath,
oslFileHandle* pHandle, sal_u
pImpl->m_state |= FileHandle_Impl::STATE_WRITEABLE;
pImpl->m_size = sal::static_int_cast< sal_uInt64 >(aFileStat.st_size);
- SAL_INFO("sal.file", "osl_openFile(" << pImpl->m_strFilePath << ", " <<
(flags & O_RDWR ? "writeable":"readonly") << ") => " << pImpl->m_fd);
+ SAL_INFO("sal.file", "osl_openFile(" << cpFilePath << ", " << (flags &
O_RDWR ? "writeable":"readonly") << ") => " << pImpl->m_fd);
*pHandle = (oslFileHandle)(pImpl);
return osl_File_E_None;
@@ -1028,7 +1030,7 @@ SAL_CALL osl_closeFile( oslFileHandle Handle )
if (pImpl == 0)
return osl_File_E_INVAL;
- SAL_INFO("sal.file", "osl_closeFile(" << pImpl->m_strFilePath << ":" <<
pImpl->m_fd << ")");
+ SAL_INFO("sal.file", "osl_closeFile(" <<
rtl::OString(pImpl->m_strFilePath) << ":" << pImpl->m_fd << ")");
if (pImpl->m_kind == FileHandle_Impl::KIND_MEM)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
