diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:30:39 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:30:39 +0000 |
| commit | 2384a42a5daad1b39ae45a31a4c0b79bf6e07c09 (patch) | |
| tree | 65df69d6c5d77d6e20faf335ce8d4baa690c1ee5 | |
| parent | 8987d1f3b504fdb8d298f3bf8b32b90c4bb8d01e (diff) | |
INTEGRATION: CWS warnings01 (1.19.112); FILE MERGED
2006/05/24 00:23:11 sb 1.19.112.4: RESYNC: (1.20-1.21); FILE MERGED
2005/11/07 12:11:29 sb 1.19.112.3: #i53898# Made code warning-free (additional -W switches for GCC).
2005/09/23 01:31:05 sb 1.19.112.2: RESYNC: (1.19-1.20); FILE MERGED
2005/09/20 12:57:22 sb 1.19.112.1: #i53898# Globally disable problematic warnings.
| -rw-r--r-- | sal/rtl/source/strtmpl.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sal/rtl/source/strtmpl.c b/sal/rtl/source/strtmpl.c index 1693adb8ad0c..00367626a43c 100644 --- a/sal/rtl/source/strtmpl.c +++ b/sal/rtl/source/strtmpl.c @@ -4,9 +4,9 @@ * * $RCSfile: strtmpl.c,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: rt $ $Date: 2006-05-04 15:14:57 $ + * last change: $Author: hr $ $Date: 2006-06-20 04:30:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -980,8 +980,9 @@ sal_Int64 SAL_CALL IMPL_RTL_STRNAME( toInt64 )( const IMPL_RTL_STRCODE* pStr, static IMPL_RTL_STRINGDATA* IMPL_RTL_STRINGNAME( ImplAlloc )( sal_Int32 nLen ) { IMPL_RTL_STRINGDATA * pData - = (nLen <= (SAL_MAX_UINT32 - sizeof (IMPL_RTL_STRINGDATA)) - / sizeof (IMPL_RTL_STRCODE)) + = (SAL_INT_CAST(sal_uInt32, nLen) + <= ((SAL_MAX_UINT32 - sizeof (IMPL_RTL_STRINGDATA)) + / sizeof (IMPL_RTL_STRCODE))) ? (IMPL_RTL_STRINGDATA *) rtl_allocateMemory( sizeof (IMPL_RTL_STRINGDATA) + nLen * sizeof (IMPL_RTL_STRCODE)) : NULL; @@ -1204,7 +1205,7 @@ sal_Int32 SAL_CALL IMPL_RTL_STRINGNAME( getLength )( const IMPL_RTL_STRINGDATA* /* ----------------------------------------------------------------------- */ -IMPL_RTL_STRCODE* SAL_CALL IMPL_RTL_STRINGNAME( getStr )( IMPL_RTL_STRINGDATA* pThis ) +IMPL_RTL_STRCODE* SAL_CALL IMPL_RTL_STRINGNAME( getStr )( IMPL_RTL_STRINGDATA * pThis ) { return pThis->buffer; } |