summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2004-06-17 12:28:10 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2004-06-17 12:28:10 +0000
commitdcb887b342dfb3d58d84220bbbe9e28834ff9b73 (patch)
tree945e4faf1117858dfdfe0f8346891043cfd349ff /sal
parentda644e587e5c5b2fc98c5e2a792da15066b9ee6e (diff)
INTEGRATION: CWS ooo64bit01 (1.5.232); FILE MERGED
2004/03/15 23:18:29 fa 1.5.232.1: First bits of 64-bitness. #i25651# & more
Diffstat (limited to 'sal')
-rw-r--r--sal/rtl/source/logfile.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sal/rtl/source/logfile.cxx b/sal/rtl/source/logfile.cxx
index 75a3c27df164..f41189ad028f 100644
--- a/sal/rtl/source/logfile.cxx
+++ b/sal/rtl/source/logfile.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: logfile.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: jbu $ $Date: 2002-11-19 08:56:31 $
+ * last change: $Author: rt $ $Date: 2004-06-17 13:28:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -236,7 +236,7 @@ extern "C" void SAL_CALL rtl_logfile_trace ( const char *pszFormat, ... )
sal_Int64 nConverted, nWritten;
MutexGuard guard( getLogMutex() );
nConverted = vsnprintf( g_buffer , g_BUFFERSIZE, pszFormat, args );
- nConverted = (nConverted > g_BUFFERSIZE, g_BUFFERSIZE, nConverted );
+ nConverted = (nConverted > g_BUFFERSIZE ? g_BUFFERSIZE : nConverted );
if( nConverted > 0 )
osl_writeFile( g_aFile, g_buffer, nConverted, (sal_uInt64*)&nWritten );
}