diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-09-04 08:08:58 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-04 09:18:57 +0100 |
| commit | 91c0bdf0816a5e62f4fa6cad7587ce8db975425f (patch) | |
| tree | 6a7f28dd4cd028099bd72e97ddaa6ec7e44c97a2 | |
| parent | ed3261a33a8dbc5bcc022c3ecc374bd2d899c300 (diff) | |
coverity#706611 Uncaught exception
Change-Id: I42bff46998b3d516161068af3d53bf92ee2f2b15
| -rw-r--r-- | include/rtl/bootstrap.h | 7 | ||||
| -rw-r--r-- | sal/rtl/bootstrap.cxx | 9 |
2 files changed, 6 insertions, 10 deletions
diff --git a/include/rtl/bootstrap.h b/include/rtl/bootstrap.h index 850aa7bd1c06..a4e109f9fc43 100644 --- a/include/rtl/bootstrap.h +++ b/include/rtl/bootstrap.h @@ -200,15 +200,14 @@ SAL_DLLPUBLIC void SAL_CALL rtl_bootstrap_get_iniName_from_handle( @param macro [inout] The macro to be expanded */ SAL_DLLPUBLIC void SAL_CALL rtl_bootstrap_expandMacros_from_handle( - rtlBootstrapHandle handle, rtl_uString ** macro ) - SAL_THROW_EXTERN_C(); + rtlBootstrapHandle handle, rtl_uString ** macro ); + /** Expands a macro using default bootstrap variables. @param macro [inout] The macro to be expanded */ SAL_DLLPUBLIC void SAL_CALL rtl_bootstrap_expandMacros( - rtl_uString ** macro ) - SAL_THROW_EXTERN_C(); + rtl_uString ** macro); /** Escapes special characters ("$" and "\"). diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index cf5b9caf4e09..2e9933280dfe 100644 --- a/sal/rtl/bootstrap.cxx +++ b/sal/rtl/bootstrap.cxx @@ -811,10 +811,9 @@ void SAL_CALL rtl_bootstrap_set ( r_rtl_bootstrap_set_list.push_back( rtl_bootstrap_NameValue( name, value ) ); } -void SAL_CALL rtl_bootstrap_expandMacros_from_handle ( +void SAL_CALL rtl_bootstrap_expandMacros_from_handle( rtlBootstrapHandle handle, - rtl_uString ** macro -) SAL_THROW_EXTERN_C() + rtl_uString ** macro) { if (handle == NULL) { handle = get_static_bootstrap_handle(); @@ -825,9 +824,7 @@ void SAL_CALL rtl_bootstrap_expandMacros_from_handle ( rtl_uString_assign( macro, expanded.pData ); } -void SAL_CALL rtl_bootstrap_expandMacros( - rtl_uString ** macro ) - SAL_THROW_EXTERN_C() +void SAL_CALL rtl_bootstrap_expandMacros(rtl_uString ** macro) { rtl_bootstrap_expandMacros_from_handle(NULL, macro); } |