summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoachim Lingner <jl@openoffice.org>2001-03-12 13:03:39 +0000
committerJoachim Lingner <jl@openoffice.org>2001-03-12 13:03:39 +0000
commit2a47ffa12f33cba34e65c87b685a46fd998a91fa (patch)
tree70cb44c83e95448ff4f3831706eedf6745aa757b
parent561b29d7f4fc9871da210c2ef1189a63b8dcb952 (diff)
OSL_ENSHURE replaced by OSL_ENSURE
-rw-r--r--sal/rtl/source/byteseq.c8
-rw-r--r--sal/rtl/source/string.c6
-rw-r--r--sal/rtl/source/ustrbuf.c6
-rw-r--r--sal/rtl/source/ustring.c12
4 files changed, 16 insertions, 16 deletions
diff --git a/sal/rtl/source/byteseq.c b/sal/rtl/source/byteseq.c
index 27b1a49f8..5708d1e38 100644
--- a/sal/rtl/source/byteseq.c
+++ b/sal/rtl/source/byteseq.c
@@ -2,9 +2,9 @@
*
* $RCSfile: byteseq.c,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 15:17:24 $
+ * last change: $Author: jl $ $Date: 2001-03-12 14:03:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -83,7 +83,7 @@ void SAL_CALL rtl_byte_sequence_reference2One(
sal_Sequence * pSequence, * pNew;
sal_Int32 nElements;
- OSL_ENSHURE( ppSequence, "### null ptr!" );
+ OSL_ENSURE( ppSequence, "### null ptr!" );
pSequence = *ppSequence;
if (pSequence->nRefCount > 1)
@@ -116,7 +116,7 @@ void SAL_CALL rtl_byte_sequence_realloc(
sal_Sequence * pSequence, * pNew;
sal_Int32 nElements;
- OSL_ENSHURE( ppSequence, "### null ptr!" );
+ OSL_ENSURE( ppSequence, "### null ptr!" );
pSequence = *ppSequence;
nElements = pSequence->nElements;
diff --git a/sal/rtl/source/string.c b/sal/rtl/source/string.c
index 146e2632f..7aba894ac 100644
--- a/sal/rtl/source/string.c
+++ b/sal/rtl/source/string.c
@@ -2,9 +2,9 @@
*
* $RCSfile: string.c,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: jl $ $Date: 2000-11-21 15:30:56 $
+ * last change: $Author: jl $ $Date: 2001-03-12 14:03:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -718,7 +718,7 @@ void SAL_CALL rtl_string_release( rtl_String * value )
{
if( 0 == osl_decrementInterlockedCount(&value->refCount) )
{
- OSL_ENSHURE( value != &aEmpty_rtl_String, "static empty string: refCount==0");
+ OSL_ENSURE( value != &aEmpty_rtl_String, "static empty string: refCount==0");
rtl_freeMemory(value);
}
}
diff --git a/sal/rtl/source/ustrbuf.c b/sal/rtl/source/ustrbuf.c
index 7e31c50af..ce6a887e9 100644
--- a/sal/rtl/source/ustrbuf.c
+++ b/sal/rtl/source/ustrbuf.c
@@ -2,9 +2,9 @@
*
* $RCSfile: ustrbuf.c,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 15:17:24 $
+ * last change: $Author: jl $ $Date: 2001-03-12 14:03:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -221,7 +221,7 @@ void SAL_CALL rtl_uStringbuffer_insert_ascii( /*inout*/rtl_uString ** This,
for( n = 0; n < len; n++ )
{
/* Check ASCII range */
- OSL_ENSHURE( (*str & 0x80) == 0, "Found ASCII char > 127");
+ OSL_ENSURE( (*str & 0x80) == 0, "Found ASCII char > 127");
pBuf[offset + n] = (sal_Unicode)*(str++);
}
diff --git a/sal/rtl/source/ustring.c b/sal/rtl/source/ustring.c
index 8b4957c57..0980918d9 100644
--- a/sal/rtl/source/ustring.c
+++ b/sal/rtl/source/ustring.c
@@ -2,9 +2,9 @@
*
* $RCSfile: ustring.c,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: th $ $Date: 2000-11-28 13:59:57 $
+ * last change: $Author: jl $ $Date: 2001-03-12 14:03:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -286,13 +286,13 @@ sal_Int32 SAL_CALL rtl_ustr_ascii_shortenedCompare_WithLength( const sal_Unicode
&& (0 == (nResult = (sal_Int32)*first++ - (sal_Int32)*second++ ) ) )
{
/* Check ASCII range */
- OSL_ENSHURE( (*(second-1) & 0x80) == 0, "Found ASCII char > 127");
+ OSL_ENSURE( (*(second-1) & 0x80) == 0, "Found ASCII char > 127");
}
if( !nResult && (shortenedLength != -1) )
{
if( *second )
{
- OSL_ENSHURE( first == firstEnd, "first == firstEnd failed" );
+ OSL_ENSURE( first == firstEnd, "first == firstEnd failed" );
// first is a substring of the second string => less (negative value)
nResult = -1;
}
@@ -1145,7 +1145,7 @@ void SAL_CALL rtl_uString_release( rtl_uString * value )
{
if( 0 == osl_decrementInterlockedCount(&value->refCount) )
{
- OSL_ENSHURE( value != &aEmpty_rtl_wString, "static empty string: refCount==0");
+ OSL_ENSURE( value != &aEmpty_rtl_wString, "static empty string: refCount==0");
rtl_freeMemory(value);
}
}
@@ -1380,7 +1380,7 @@ void SAL_CALL rtl_uString_newFromAscii( rtl_uString ** newStr, const sal_Char *
while ( length )
{
/* Check ASCII range */
- OSL_ENSHURE( (*value & 0x80) == 0, "Found ASCII char > 127");
+ OSL_ENSURE( (*value & 0x80) == 0, "Found ASCII char > 127");
*p = (sal_Unicode)(*value);
p++;