Attachment 62750 Details for Bug 39440 – Patch to avoid unreachable code errors reported

[patch] Patch to avoid unreachable code errors reported

0001-Avoid-unreachable-code-warnings-with-cppcheck.patch (text/plain), 6.03 KB, created by Martyn Russell on 2012-06-07 10:41:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martyn Russell

Created: 2012-06-07 10:41:40 UTC

Size: 6.03 KB

patch

obsolete

>From 0391d465f01b22d0ff8b48b8e8ffc28f71651b97 Mon Sep 17 00:00:00 2001
>From: Martyn Russell <martyn@lanedo.com>
>Date: Thu, 7 Jun 2012 18:35:07 +0100
>Subject: [PATCH] Avoid unreachable code warnings with cppcheck
>
>Part of Bug 39440
>
>Change-Id: I1d126eb10bfebc747d4bb6d153b80abe73a1e81e
>---
> embeddedobj/source/msole/xdialogcreator.cxx  |   14 ++++++--------
> extensions/source/nsplugin/source/so_env.cxx |   11 +++++------
> framework/source/services/autorecovery.cxx   |   17 +++++++++--------
> 3 files changed, 20 insertions(+), 22 deletions(-)
>
>diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx
>index 935aa29..c5e8a5f 100644
>--- a/embeddedobj/source/msole/xdialogcreator.cxx
>+++ b/embeddedobj/source/msole/xdialogcreator.cxx
>@@ -288,15 +288,14 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia
>     else
>         throw ucb::CommandAbortedException();
> 
>-#else
>-    throw lang::NoSupportException(); // TODO:
>-#endif
>-
>     OSL_ENSURE( aObjectInfo.Object.is(), "No object was created!\n" );
>     if ( !aObjectInfo.Object.is() )
>         throw uno::RuntimeException();
> 
>     return aObjectInfo;
>+#else
>+    throw lang::NoSupportException(); // TODO:
>+#endif
> }
> 
> //-------------------------------------------------------------------------
>@@ -312,7 +311,6 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceInitF
>     embed::InsertedObjectInfo aObjectInfo;
> 
> #ifdef WNT
>-
>     if ( !xStorage.is() )
>         throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
>                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
>@@ -341,15 +339,15 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceInitF
>     aObjectInfo.Object = xResult;
> 
>     // TODO/LATER: in case of iconifie object the icon should be stored in aObjectInfo
>-#else
>-    throw lang::NoSupportException(); // TODO:
>-#endif
> 
>     OSL_ENSURE( aObjectInfo.Object.is(), "No object was created!\n" );
>     if ( !aObjectInfo.Object.is() )
>         throw uno::RuntimeException();
> 
>     return aObjectInfo;
>+#else
>+    throw lang::NoSupportException(); // TODO:
>+#endif
> }
> 
> //-------------------------------------------------------------------------
>diff --git a/extensions/source/nsplugin/source/so_env.cxx b/extensions/source/nsplugin/source/so_env.cxx
>index b196a33..37d8ee3 100644
>--- a/extensions/source/nsplugin/source/so_env.cxx
>+++ b/extensions/source/nsplugin/source/so_env.cxx
>@@ -255,7 +255,7 @@ int findReadSversion(void** aResult, int /*bWnt*/, const char* /*tag*/, const ch
>       return 0;
> 
>     /* .. now in $HOME */
>-#endif
>+#endif // LINUX
>     sprintf(lnkFileName, "%s/.mozilla/plugins/libnpsoplugin%s", getenv("HOME"), SAL_DLLEXTENSION);
> #ifdef LINUX
>     ssize_t len = readlink(lnkFileName, realFileName, NPP_PATH_MAX-1);
>@@ -267,18 +267,17 @@ int findReadSversion(void** aResult, int /*bWnt*/, const char* /*tag*/, const ch
>     realFileName[len] = '\0';
> 
>     if (NULL == (pTempZero = strstr(realFileName, "/program/libnpsoplugin" SAL_DLLEXTENSION)))
>-#else
>+#else  // LINUX
>     if ((0 > readlink(lnkFileName, realFileName, NPP_PATH_MAX)) ||
>         (NULL == (pTempZero = strstr(realFileName, "/program/libnpsoplugin" SAL_DLLEXTENSION))))
>-#endif
>+#endif // LINUX
>     {
>         *realFileName = 0;
>         return -1;
>     }
>     *pTempZero = 0;
>     return 0;
>-#endif
>-#ifdef WNT
>+#elif defined WNT // UNIX
>     static char realFileName[NPP_PATH_MAX] = {0};
>     *aResult = realFileName;
>     HKEY hKey;
>@@ -316,7 +315,7 @@ int findReadSversion(void** aResult, int /*bWnt*/, const char* /*tag*/, const ch
>     *pTempZero = 0;
>     debug_fprintf(NSP_LOG_APPEND, "realFileName is %s\n", realFileName);
>     return 0;
>-#endif
>+#endif // UNIX
> }
> 
> // Return the install dir path of staroffice, return value like "/home/build/staroffice"
>diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
>index 3249d03..a5e2bd2 100644
>--- a/framework/source/services/autorecovery.cxx
>+++ b/framework/source/services/autorecovery.cxx
>@@ -1331,11 +1331,11 @@ void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rIn
>             css::uno::Reference< css::util::XChangesBatch > xFlush(xCFG, css::uno::UNO_QUERY_THROW);
>             xFlush->commitChanges();
> 
>-            #ifdef TRIGGER_FULL_DISC_CHECK
>+#ifdef TRIGGER_FULL_DISC_CHECK
>             throw css::uno::Exception();
>-            #endif
>-
>+#else  // TRIGGER_FULL_DISC_CHECK
>             nRetry = 0;
>+#endif // TRIGGER_FULL_DISC_CHECK
>         }
>         catch(const css::uno::Exception&)
>         {
>@@ -2363,12 +2363,13 @@ void AutoRecovery::implts_saveOneDoc(const ::rtl::OUString&
>         {
>             xDocRecover->storeToRecoveryFile( rInfo.NewTempURL, lNewArgs.getAsConstPropertyValueList() );
> 
>-            #ifdef TRIGGER_FULL_DISC_CHECK
>+#ifdef TRIGGER_FULL_DISC_CHECK
>             throw css::uno::Exception();
>-            #endif
>+#else  // TRIGGER_FULL_DISC_CHECK
> 
>             bError = sal_False;
>             nRetry = 0;
>+#endif // TRIGGER_FULL_DISC_CHECK
>         }
>         catch(const css::uno::Exception&)
>         {
>@@ -3454,10 +3455,9 @@ void AutoRecovery::implts_verifyCacheAgainstDesktopDocumentList()
> //-----------------------------------------------
> sal_Bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace)
> {
>-    #ifdef SIMULATE_FULL_DISC
>+#ifdef SIMULATE_FULL_DISC
>     return sal_False;
>-    #endif
>-
>+#else  // SIMULATE_FULL_DISC
>     // In case an error occures and we are not able to retrieve the needed information
>     // it's better to "disable" the feature ShowErrorOnFullDisc !
>     // Otherwhise we start a confusing process of error handling ...
>@@ -3478,6 +3478,7 @@ sal_Bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace)
> 
>     sal_uInt64 nFreeMB = (nFreeSpace/1048576);
>     return (nFreeMB >= (sal_uInt64)nRequiredSpace);
>+#endif // SIMULATE_FULL_DISC
> }
> 
> //-----------------------------------------------
>-- 
>1.7.9.5
>

Actions: View

Attachments on bug 39440: 62750 | 62755 | 64577