diff options
Diffstat (limited to 'sal')
-rw-r--r-- | sal/osl/all/log.cxx | 32 | ||||
-rw-r--r-- | sal/osl/unx/file_stat.cxx | 10 | ||||
-rw-r--r-- | sal/qa/osl/file/osl_File.cxx | 2 |
3 files changed, 22 insertions, 22 deletions
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx index c493f4ddf03e..405d5599ccae 100644 --- a/sal/osl/all/log.cxx +++ b/sal/osl/all/log.cxx @@ -184,24 +184,24 @@ std::pair<bool, bool> getTimestampFlags(char const *selector) bool outputTimestamp = false; bool outputRelativeTimer = false; for (char const* p = selector; p && *p;) - { + { if (*p++ == '+') - { - char const * p1 = p; - while (*p1 != '.' && *p1 != '+' && *p1 != '-' && *p1 != '\0') { - ++p1; - } - if (equalStrings(p, p1 - p, RTL_CONSTASCII_STRINGPARAM("TIMESTAMP"))) - outputTimestamp = true; - else if (equalStrings(p, p1 - p, RTL_CONSTASCII_STRINGPARAM("RELATIVETIMER"))) - outputRelativeTimer = true; - char const * p2 = p1; - while (*p2 != '+' && *p2 != '-' && *p2 != '\0') { - ++p2; - } - p = p2; + { + char const * p1 = p; + while (*p1 != '.' && *p1 != '+' && *p1 != '-' && *p1 != '\0') { + ++p1; } - } + if (equalStrings(p, p1 - p, RTL_CONSTASCII_STRINGPARAM("TIMESTAMP"))) + outputTimestamp = true; + else if (equalStrings(p, p1 - p, RTL_CONSTASCII_STRINGPARAM("RELATIVETIMER"))) + outputRelativeTimer = true; + char const * p2 = p1; + while (*p2 != '+' && *p2 != '-' && *p2 != '\0') { + ++p2; + } + p = p2; + } + } return std::pair(outputTimestamp, outputRelativeTimer); } diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx index 4d7a7cb43da5..d08a6ed56894 100644 --- a/sal/osl/unx/file_stat.cxx +++ b/sal/osl/unx/file_stat.cxx @@ -148,10 +148,10 @@ namespace void set_file_size(const struct stat& file_stat, oslFileStatus* pStat) { if (S_ISREG(file_stat.st_mode)) - { - pStat->uFileSize = file_stat.st_size; - pStat->uValidFields |= osl_FileStatus_Mask_FileSize; - } + { + pStat->uFileSize = file_stat.st_size; + pStat->uValidFields |= osl_FileStatus_Mask_FileSize; + } } /* we only need to call stat or lstat if one of the @@ -262,7 +262,7 @@ oslFileError SAL_CALL osl_getFileStatus(oslDirectoryItem Item, oslFileStatus* pS | RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT)); assert(ok); (void)ok; pStat->uValidFields |= osl_FileStatus_Mask_FileName; - } + } return osl_File_E_None; } diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index e4c595a6f0f7..9280ceb40406 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -4224,7 +4224,7 @@ namespace osl_Directory { bOk3 = true; } - } + } // close a directory nError1 = testDirectory.close(); |