diff options
author | Michael Stahl <mstahl@redhat.com> | 2015-02-05 22:07:28 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-02-05 23:33:07 +0100 |
commit | b0ef5cf258f3a84054c052f0a09a208dbc17fdf3 (patch) | |
tree | 3e5d524d9acf1fce1a67862497ccbeb5492e9703 /include | |
parent | 30f6ec7cfdf63cea265148bbe3a07d8df34e96d5 (diff) |
sal: add some argument checking assertions for strings and buffers
Also remove some now redundant asserts from headers.
Some of these actually trigger on unit tests so are commented out.
Change-Id: I07c6b2b2bd175361691a141f22eec584e3ab8f0b
Diffstat (limited to 'include')
-rw-r--r-- | include/rtl/strbuf.hxx | 8 | ||||
-rw-r--r-- | include/rtl/ustrbuf.hxx | 11 |
2 files changed, 0 insertions, 19 deletions
diff --git a/include/rtl/strbuf.hxx b/include/rtl/strbuf.hxx index f0fd1f11b013..43d0eaf817a3 100644 --- a/include/rtl/strbuf.hxx +++ b/include/rtl/strbuf.hxx @@ -473,8 +473,6 @@ public: */ OStringBuffer & append( const sal_Char * str, sal_Int32 len) { - assert( len >= 0 ); - assert( len == 0 || str != 0 ); rtl_stringbuffer_insert( &pData, &nCapacity, getLength(), str, len ); return *this; } @@ -645,7 +643,6 @@ public: @since LibreOffice 4.4 */ char * appendUninitialized(sal_Int32 length) { - assert(length >= 0); sal_Int32 n = getLength(); rtl_stringbuffer_insert(&pData, &nCapacity, n, 0, length); return pData->buffer + n; @@ -734,9 +731,6 @@ public: */ OStringBuffer & insert( sal_Int32 offset, const sal_Char * str, sal_Int32 len) { - assert( offset >= 0 && offset <= pData->length ); - assert( len >= 0 ); - assert( len == 0 || str != 0 ); rtl_stringbuffer_insert( &pData, &nCapacity, offset, str, len ); return *this; } @@ -918,8 +912,6 @@ public: */ OStringBuffer & remove( sal_Int32 start, sal_Int32 len ) { - assert( start >= 0 && start <= pData->length ); - assert( len >= 0 ); rtl_stringbuffer_remove( &pData, start, len ); return *this; } diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx index fdec924613fe..5ae2334ae1a3 100644 --- a/include/rtl/ustrbuf.hxx +++ b/include/rtl/ustrbuf.hxx @@ -457,8 +457,6 @@ public: */ OUStringBuffer & append( const sal_Unicode * str, sal_Int32 len) { - assert( len >= 0 ); - assert( len == 0 || str != 0 ); rtl_uStringbuffer_insert( &pData, &nCapacity, getLength(), str, len ); return *this; } @@ -537,7 +535,6 @@ public: */ OUStringBuffer & appendAscii( const sal_Char * str, sal_Int32 len) { - assert( len >= 0 ); rtl_uStringbuffer_insert_ascii( &pData, &nCapacity, getLength(), str, len ); return *this; } @@ -734,7 +731,6 @@ public: @since LibreOffice 4.4 */ sal_Unicode * appendUninitialized(sal_Int32 length) { - assert(length >= 0); sal_Int32 n = getLength(); rtl_uStringbuffer_insert(&pData, &nCapacity, n, 0, length); return pData->buffer + n; @@ -802,9 +798,6 @@ public: */ OUStringBuffer & insert( sal_Int32 offset, const sal_Unicode * str, sal_Int32 len) { - assert( offset >= 0 && offset <= pData->length ); - assert( len >= 0 ); - assert( len == 0 || str != 0 ); rtl_uStringbuffer_insert( &pData, &nCapacity, offset, str, len ); return *this; } @@ -1048,8 +1041,6 @@ public: */ OUStringBuffer & remove( sal_Int32 start, sal_Int32 len ) { - assert( start >= 0 && start <= pData->length ); - assert( len >= 0 ); rtl_uStringbuffer_remove( &pData, start, len ); return *this; } @@ -1066,7 +1057,6 @@ public: */ OUStringBuffer & truncate( sal_Int32 start = 0 ) { - assert( start >= 0 && start <= pData->length ); rtl_uStringbuffer_remove( &pData, start, getLength() - start ); return *this; } @@ -1353,7 +1343,6 @@ public: */ OUStringBuffer copy( sal_Int32 beginIndex ) const { - assert(beginIndex >= 0 && beginIndex <= getLength()); return copy( beginIndex, getLength() - beginIndex ); } |