diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-08 13:53:08 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-09 17:08:00 +0100 |
commit | 4188ae6a093d935c7c983c7abb0a2fcb89f96c2a (patch) | |
tree | 1546698631a17520fab828822672ba874dddeeb4 /sal/osl | |
parent | 82b91027691a0a7138c0f70b94d6500e35bb8b44 (diff) |
loplugin:indentation in registry..sax
Change-Id: I4b877751818febaec8e64018335dca691a476a43
Reviewed-on: https://gerrit.libreoffice.org/67561
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sal/osl')
-rw-r--r-- | sal/osl/unx/file_misc.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/file_stat.cxx | 6 | ||||
-rw-r--r-- | sal/osl/unx/file_url.cxx | 5 | ||||
-rw-r--r-- | sal/osl/unx/pipe.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/process.cxx | 10 | ||||
-rw-r--r-- | sal/osl/unx/profile.cxx | 8 | ||||
-rw-r--r-- | sal/osl/unx/tempfile.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/thread.cxx | 16 |
8 files changed, 26 insertions, 25 deletions
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx index fb12e4155e14..167877e5d670 100644 --- a/sal/osl/unx/file_misc.cxx +++ b/sal/osl/unx/file_misc.cxx @@ -557,7 +557,7 @@ static oslFileError create_dir_recursively_( if (osl_error != osl_File_E_None && osl_error != osl_File_E_EXIST) return osl_error; - dir_path[pos] = '/'; + dir_path[pos] = '/'; return create_dir_recursively_(dir_path, aDirectoryCreationCallbackFunc, pData); } diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx index b25bc3f1ed14..f6a2299643cc 100644 --- a/sal/osl/unx/file_stat.cxx +++ b/sal/osl/unx/file_stat.cxx @@ -134,7 +134,7 @@ namespace { pStat->aAccessTime.Seconds = file_stat.st_atime; pStat->aAccessTime.Nanosec = 0; - pStat->uValidFields |= osl_FileStatus_Mask_AccessTime; + pStat->uValidFields |= osl_FileStatus_Mask_AccessTime; } void set_file_modify_time(const struct stat& file_stat, oslFileStatus* pStat) @@ -148,7 +148,7 @@ namespace { if (S_ISREG(file_stat.st_mode)) { - pStat->uFileSize = file_stat.st_size; + pStat->uFileSize = file_stat.st_size; pStat->uValidFields |= osl_FileStatus_Mask_FileSize; } } @@ -260,7 +260,7 @@ static oslFileError osl_psz_setFileAttributes( const sal_Char* pszFilePath, sal_ oslFileError osl_error = osl_File_E_None; mode_t nNewMode = 0; - OSL_ENSURE(!(osl_File_Attribute_Hidden & uAttributes), "osl_File_Attribute_Hidden doesn't work under Unix"); + OSL_ENSURE(!(osl_File_Attribute_Hidden & uAttributes), "osl_File_Attribute_Hidden doesn't work under Unix"); if (uAttributes & osl_File_Attribute_OwnRead) nNewMode |= S_IRUSR; diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx index 0661975926fe..20e40cb444c1 100644 --- a/sal/osl/unx/file_url.cxx +++ b/sal/osl/unx/file_url.cxx @@ -127,7 +127,8 @@ oslFileError getSystemPathFromFileUrl( } i = j + 1; break; - } if (!rtl::isAsciiAlphanumeric(c) && c != '+' && c != '-' + } + if (!rtl::isAsciiAlphanumeric(c) && c != '+' && c != '-' && c != '.') { break; @@ -418,7 +419,7 @@ namespace if (*p == '/') { p++; - *p = '\0'; + *p = '\0'; } else { diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx index a4f1594a1896..f9037a14e4a7 100644 --- a/sal/osl/unx/pipe.cxx +++ b/sal/osl/unx/pipe.cxx @@ -461,7 +461,7 @@ sal_Int32 SAL_CALL osl_sendPipe(oslPipe pPipe, if (nRet <= 0) SAL_WARN("sal.osl.pipe", "send() failed: " << UnixErrnoString(errno)); - return nRet; + return nRet; } oslPipeError SAL_CALL osl_getLastPipeError(SAL_UNUSED_PARAMETER oslPipe) diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx index fcb074d9b7c0..e40d53e4b279 100644 --- a/sal/osl/unx/process.cxx +++ b/sal/osl/unx/process.cxx @@ -610,7 +610,7 @@ oslProcessError osl_psz_executeProcess(sal_Char *pszImageName, { for (i = 0; ((i + 1) < MAX_ENVS) && (pszEnvironments[i] != nullptr); i++) Data.m_pszEnv[i] = strdup(pszEnvironments[i]); - Data.m_pszEnv[i+1] = nullptr; + Data.m_pszEnv[i+1] = nullptr; } else Data.m_pszEnv[0] = nullptr; @@ -657,14 +657,14 @@ oslProcessError osl_psz_executeProcess(sal_Char *pszImageName, if (Data.m_pProcImpl->m_pid != 0) { - assert(hThread != nullptr); + assert(hThread != nullptr); *pProcess = Data.m_pProcImpl; - if (Options & osl_Process_WAIT) + if (Options & osl_Process_WAIT) osl_joinProcess(*pProcess); - return osl_Process_E_None; + return osl_Process_E_None; } osl_destroyCondition(Data.m_pProcImpl->m_terminated); @@ -1072,7 +1072,7 @@ oslProcessError SAL_CALL osl_getProcessInfo(oslProcess Process, oslProcessData F userseconds = procstat.utime/hz; systemseconds = procstat.stime/hz; - pInfo->UserTime.Seconds = userseconds; + pInfo->UserTime.Seconds = userseconds; pInfo->UserTime.Nanosec = procstat.utime - (userseconds * hz); pInfo->SystemTime.Seconds = systemseconds; pInfo->SystemTime.Nanosec = procstat.stime - (systemseconds * hz); diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx index 589662b9b62a..e06ff82aef32 100644 --- a/sal/osl/unx/profile.cxx +++ b/sal/osl/unx/profile.cxx @@ -911,7 +911,7 @@ static bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode) } #ifndef MACOSX - if ( fcntl(pFile->m_Handle, F_SETLKW, &lock) == -1 ) + if ( fcntl(pFile->m_Handle, F_SETLKW, &lock) == -1 ) #else /* Mac OSX will return ENOTSUP for webdav drives so we should ignore it */ if ( fcntl(pFile->m_Handle, F_SETLKW, &lock) == -1 && errno != ENOTSUP ) @@ -1477,9 +1477,9 @@ static osl_TProfileSection* findEntry(osl_TProfileImpl* pProfile, sal_uInt32 *pNoEntry) { static sal_uInt32 Sect = 0; - sal_uInt32 i, n; - sal_uInt32 Len; - osl_TProfileSection* pSec=nullptr; + sal_uInt32 i, n; + sal_uInt32 Len; + osl_TProfileSection* pSec=nullptr; Len = strlen(Section); diff --git a/sal/osl/unx/tempfile.cxx b/sal/osl/unx/tempfile.cxx index b7630cb32f4c..cc29a6f59625 100644 --- a/sal/osl/unx/tempfile.cxx +++ b/sal/osl/unx/tempfile.cxx @@ -149,7 +149,7 @@ static oslFileError osl_setup_base_directory_impl_( rtl_uString** ppustr_base_dir, bool* b_delete_on_close) { - oslFileError osl_error; + oslFileError osl_error; OSL_PRECOND(((nullptr != pHandle) || (nullptr != ppustrTempFileURL)), "Invalid parameter!"); diff --git a/sal/osl/unx/thread.cxx b/sal/osl/unx/thread.cxx index 8fbe04e46d91..aa05f6ef407a 100644 --- a/sal/osl/unx/thread.cxx +++ b/sal/osl/unx/thread.cxx @@ -584,16 +584,16 @@ static oslThreadIdentifier lookupThreadId (pthread_t hThread) pthread_mutex_lock(&HashLock); - pEntry = HashTable[HASHID(hThread)]; - while (pEntry != nullptr) + pEntry = HashTable[HASHID(hThread)]; + while (pEntry != nullptr) + { + if (pthread_equal(pEntry->Handle, hThread)) { - if (pthread_equal(pEntry->Handle, hThread)) - { - pthread_mutex_unlock(&HashLock); - return pEntry->Ident; - } - pEntry = pEntry->Next; + pthread_mutex_unlock(&HashLock); + return pEntry->Ident; } + pEntry = pEntry->Next; + } pthread_mutex_unlock(&HashLock); |