diff options
Diffstat (limited to 'ace/OS_NS_sys_stat.inl')
| -rw-r--r-- | ace/OS_NS_sys_stat.inl | 51 |
1 files changed, 20 insertions, 31 deletions
diff --git a/ace/OS_NS_sys_stat.inl b/ace/OS_NS_sys_stat.inl index 448cfcd3246..382863a2f59 100644 --- a/ace/OS_NS_sys_stat.inl +++ b/ace/OS_NS_sys_stat.inl @@ -1,5 +1,4 @@ // -*- C++ -*- -// // $Id$ #include "ace/OS_NS_unistd.h" @@ -7,10 +6,7 @@ #include "ace/OS_NS_errno.h" #include "ace/OS_NS_macros.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace ACE_OS -{ +namespace ACE_OS { ACE_INLINE ACE_HANDLE creat (const ACE_TCHAR *filename, mode_t mode) @@ -22,12 +18,16 @@ namespace ACE_OS ACE_OSCALL_RETURN(::create_f((char *)filename, 1024, S_IRUSR | S_IWUSR | S_IXUSR), ACE_HANDLE, ACE_INVALID_HANDLE); -#elif defined(ACE_PSOS_TM) || defined (ACE_PSOS) +#elif defined(ACE_PSOS_TM) + ACE_UNUSED_ARG (filename); + ACE_UNUSED_ARG (mode); + ACE_NOTSUP_RETURN (-1); +#elif defined(ACE_PSOS) ACE_UNUSED_ARG (filename); ACE_UNUSED_ARG (mode); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::creat (ACE_TEXT_ALWAYS_CHAR (filename), mode), + ACE_OSCALL_RETURN (::creat (ACE_TEXT_TO_CHAR_IN (filename), mode), ACE_HANDLE, ACE_INVALID_HANDLE); #endif /* ACE_WIN32 */ } @@ -111,19 +111,19 @@ namespace ACE_OS // This function returns the number of bytes in the file referenced by // FD. - ACE_INLINE off_t + ACE_INLINE long filesize (ACE_HANDLE handle) { ACE_OS_TRACE ("ACE_OS::filesize"); #if defined (ACE_WIN32) - ACE_WIN32CALL_RETURN (::GetFileSize (handle, 0), off_t, -1); + ACE_WIN32CALL_RETURN (::GetFileSize (handle, 0), long, -1); #else /* !ACE_WIN32 */ ACE_stat sb; - return ACE_OS::fstat (handle, &sb) == -1 ? -1 : sb.st_size; + return ACE_OS::fstat (handle, &sb) == -1 ? -1 : (long) sb.st_size; #endif /* ACE_WIN32 */ } - ACE_INLINE off_t + ACE_INLINE long filesize (const ACE_TCHAR *filename) { ACE_OS_TRACE ("ACE_OS::filesize"); @@ -131,7 +131,7 @@ namespace ACE_OS ACE_HANDLE h = ACE_OS::open (filename, O_RDONLY); if (h != ACE_INVALID_HANDLE) { - off_t size = ACE_OS::filesize (h); + long size = ACE_OS::filesize (h); ACE_OS::close (h); return size; } @@ -154,7 +154,6 @@ namespace ACE_OS # endif /* ACE_LACKS_LSTAT */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE int lstat (const wchar_t *file, ACE_stat *stp) { @@ -162,10 +161,9 @@ namespace ACE_OS # if defined (ACE_LACKS_LSTAT) return ACE_OS::stat (file, stp); # else - return ACE_OS::lstat (ACE_Wide_To_Ascii (file).char_rep (), stp); + return ACE_OS::lstat (ACE_TEXT_TO_CHAR_IN (file), stp); # endif /* ACE_LACKS_LSTAT */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE int mkdir (const char *path, mode_t mode) @@ -211,10 +209,10 @@ namespace ACE_OS #elif defined (ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400) ACE_UNUSED_ARG (mode); - ACE_OSCALL_RETURN (::_mkdir (const_cast <char *> (path)), int, -1); + ACE_OSCALL_RETURN (::_mkdir ((char *) path), int, -1); #elif defined (ACE_HAS_WINCE) ACE_UNUSED_ARG (mode); - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CreateDirectory (ACE_TEXT_CHAR_TO_TCHAR (path), 0), + ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CreateDirectory (ACE_TEXT_TO_TCHAR_IN (path), 0), ace_result_), int, -1); #elif defined (ACE_MKDIR_LACKS_MODE) @@ -225,8 +223,6 @@ namespace ACE_OS #endif /* ACE_PSOS_LACKS_PHILE */ } -#if defined (ACE_HAS_WCHAR) - ACE_INLINE int mkdir (const wchar_t *path, mode_t mode) { @@ -239,12 +235,10 @@ namespace ACE_OS ACE_UNUSED_ARG (mode); ACE_OSCALL_RETURN (::_wmkdir (path), int, -1); #else - return ACE_OS::mkdir (ACE_Wide_To_Ascii (path).char_rep (), mode); + return ACE_OS::mkdir (ACE_TEXT_TO_CHAR_IN (path), mode); #endif /* ACE_HAS_WINCE */ } -#endif /* ACE_HAS_WCHAR */ - ACE_INLINE int mkfifo (const ACE_TCHAR *file, mode_t mode) { @@ -254,7 +248,7 @@ namespace ACE_OS ACE_UNUSED_ARG (mode); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::mkfifo (ACE_TEXT_ALWAYS_CHAR (file), mode), int, -1); + ACE_OSCALL_RETURN (::mkfifo (ACE_TEXT_TO_CHAR_IN (file), mode), int, -1); #endif /* ACE_LACKS_MKFIFO */ } @@ -275,7 +269,7 @@ namespace ACE_OS HANDLE fhandle; - fhandle = ::FindFirstFile (ACE_TEXT_CHAR_TO_TCHAR (file), &fdata); + fhandle = ::FindFirstFile (ACE_TEXT_TO_TCHAR_IN (file), &fdata); if (fhandle == INVALID_HANDLE_VALUE) { ACE_OS::set_errno_to_last_error (); @@ -309,7 +303,6 @@ namespace ACE_OS #endif /* ACE_HAS_NONCONST_STAT */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE int stat (const wchar_t *file, ACE_stat *stp) { @@ -343,11 +336,9 @@ namespace ACE_OS #elif defined (ACE_WIN32) ACE_OSCALL_RETURN (::_wstat (file, (struct _stat *) stp), int, -1); #else /* ACE_HAS_WINCE */ - ACE_Wide_To_Ascii nfile (file); - return ACE_OS::stat (nfile.char_rep (), stp); + return ACE_OS::stat (ACE_TEXT_TO_CHAR_IN (file), stp); #endif /* ACE_HAS_WINCE */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE mode_t umask (mode_t cmask) @@ -356,7 +347,7 @@ namespace ACE_OS # if defined (ACE_LACKS_UMASK) ACE_UNUSED_ARG (cmask); ACE_NOTSUP_RETURN ((mode_t)-1); -# elif defined (ACE_WIN32) && !defined (__BORLANDC__) +# elif defined (ACE_WIN32) ACE_OSCALL_RETURN (::_umask (cmask), mode_t, -1); # else return ::umask (cmask); // This call shouldn't fail... @@ -364,5 +355,3 @@ namespace ACE_OS } } // ACE_OS namespace - -ACE_END_VERSIONED_NAMESPACE_DECL |