diff options
Diffstat (limited to 'sal/osl/unx')
-rw-r--r-- | sal/osl/unx/file_path_helper.cxx | 6 | ||||
-rw-r--r-- | sal/osl/unx/file_stat.cxx | 22 | ||||
-rw-r--r-- | sal/osl/unx/uunxapi.cxx | 2 |
3 files changed, 15 insertions, 15 deletions
diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx index cff84e395561..89969c1c40af 100644 --- a/sal/osl/unx/file_path_helper.cxx +++ b/sal/osl/unx/file_path_helper.cxx @@ -28,13 +28,13 @@ const sal_Unicode FPH_CHAR_PATH_SEPARATOR = '/'; const sal_Unicode FPH_CHAR_DOT = '.'; const sal_Unicode FPH_CHAR_COLON = ':'; -static inline const rtl::OUString FPH_PATH_SEPARATOR() +static const rtl::OUString FPH_PATH_SEPARATOR() { return rtl::OUString(FPH_CHAR_PATH_SEPARATOR); } -static inline const rtl::OUString FPH_LOCAL_DIR_ENTRY() +static const rtl::OUString FPH_LOCAL_DIR_ENTRY() { return rtl::OUString(FPH_CHAR_DOT); } -static inline const rtl::OUString FPH_PARENT_DIR_ENTRY() +static const rtl::OUString FPH_PARENT_DIR_ENTRY() { return rtl::OUString(".."); } void osl_systemPathRemoveSeparator(rtl_uString* pustrPath) diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx index 2b960d017fea..7ba3d90a7037 100644 --- a/sal/osl/unx/file_stat.cxx +++ b/sal/osl/unx/file_stat.cxx @@ -36,7 +36,7 @@ namespace { - inline void set_file_type(const struct stat& file_stat, oslFileStatus* pStat) + void set_file_type(const struct stat& file_stat, oslFileStatus* pStat) { /* links to directories state also to be a directory */ if (S_ISLNK(file_stat.st_mode)) @@ -57,7 +57,7 @@ namespace pStat->uValidFields |= osl_FileStatus_Mask_Type; } - inline void set_file_access_mask(const struct stat& file_stat, oslFileStatus* pStat) + void set_file_access_mask(const struct stat& file_stat, oslFileStatus* pStat) { // user permissions if (S_IRUSR & file_stat.st_mode) @@ -99,7 +99,7 @@ namespace required on network file systems not using unix semantics (AFS, see fdo#43095). */ - inline void set_file_access_rights(const rtl::OUString& file_path, oslFileStatus* pStat) + void set_file_access_rights(const rtl::OUString& file_path, oslFileStatus* pStat) { pStat->uValidFields |= osl_FileStatus_Mask_Attributes; @@ -110,7 +110,7 @@ namespace pStat->uAttributes |= osl_File_Attribute_Executable; } - inline void set_file_hidden_status(const rtl::OUString& file_path, oslFileStatus* pStat) + void set_file_hidden_status(const rtl::OUString& file_path, oslFileStatus* pStat) { pStat->uAttributes = osl::systemPathIsHiddenFileOrDirectoryEntry(file_path) ? osl_File_Attribute_Hidden : 0; pStat->uValidFields |= osl_FileStatus_Mask_Attributes; @@ -118,7 +118,7 @@ namespace /* the set_file_access_rights must be called after set_file_hidden_status(...) and set_file_access_mask(...) because of the hack in set_file_access_rights(...) */ - inline void set_file_attributes( + void set_file_attributes( const rtl::OUString& file_path, const struct stat& file_stat, const sal_uInt32 uFieldMask, oslFileStatus* pStat) { set_file_hidden_status(file_path, pStat); @@ -130,21 +130,21 @@ namespace set_file_access_rights(file_path, pStat); } - inline void set_file_access_time(const struct stat& file_stat, oslFileStatus* pStat) + void set_file_access_time(const struct stat& file_stat, oslFileStatus* pStat) { pStat->aAccessTime.Seconds = file_stat.st_atime; pStat->aAccessTime.Nanosec = 0; pStat->uValidFields |= osl_FileStatus_Mask_AccessTime; } - inline void set_file_modify_time(const struct stat& file_stat, oslFileStatus* pStat) + void set_file_modify_time(const struct stat& file_stat, oslFileStatus* pStat) { pStat->aModifyTime.Seconds = file_stat.st_mtime; pStat->aModifyTime.Nanosec = 0; pStat->uValidFields |= osl_FileStatus_Mask_ModifyTime; } - inline void set_file_size(const struct stat& file_stat, oslFileStatus* pStat) + void set_file_size(const struct stat& file_stat, oslFileStatus* pStat) { if (S_ISREG(file_stat.st_mode)) { @@ -155,7 +155,7 @@ namespace /* we only need to call stat or lstat if one of the following flags is set */ - inline bool is_stat_call_necessary(sal_uInt32 field_mask, oslFileType file_type) + bool is_stat_call_necessary(sal_uInt32 field_mask, oslFileType file_type) { return ( ((field_mask & osl_FileStatus_Mask_Type) && (file_type == osl_File_Type_Unknown)) || @@ -168,7 +168,7 @@ namespace (field_mask & osl_FileStatus_Mask_Validate)); } - inline oslFileError set_link_target_url(const rtl::OUString& file_path, oslFileStatus* pStat) + oslFileError set_link_target_url(const rtl::OUString& file_path, oslFileStatus* pStat) { rtl::OUString link_target; if (!osl::realpath(file_path, link_target)) @@ -182,7 +182,7 @@ namespace return osl_File_E_None; } - inline oslFileError setup_osl_getFileStatus( + oslFileError setup_osl_getFileStatus( DirectoryItem_Impl * pImpl, oslFileStatus* pStat, rtl::OUString& file_path) { if ((pImpl == nullptr) || (pStat == nullptr)) diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx index a6b80daa9e2a..a6dd0954bf41 100644 --- a/sal/osl/unx/uunxapi.cxx +++ b/sal/osl/unx/uunxapi.cxx @@ -29,7 +29,7 @@ #include <osl/detail/android-bootstrap.h> #endif -static inline rtl::OString OUStringToOString(const rtl_uString* s) +static rtl::OString OUStringToOString(const rtl_uString* s) { return rtl::OUStringToOString(rtl::OUString(const_cast<rtl_uString*>(s)), osl_getThreadTextEncoding()); |