diff options
| author | Martyn Russell <martyn@lanedo.com> | 2012-06-07 18:35:07 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-06-12 12:08:33 +0100 |
| commit | 4019acf2974b58210ffc1b1975720553e7b5d337 (patch) | |
| tree | d290a4593c8c369281392f2504974e27b522ac77 /extensions | |
| parent | cb0450899ddb2ea75d6a6fcf630f41292af64330 (diff) | |
cppcheck: avoid unreachable code warnings
Change-Id: I1d126eb10bfebc747d4bb6d153b80abe73a1e81e
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/nsplugin/source/so_env.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/extensions/source/nsplugin/source/so_env.cxx b/extensions/source/nsplugin/source/so_env.cxx index b196a3338ea1..37d8ee3934d2 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" |