diff options
Diffstat (limited to 'ace/OS_NS_dirent.inl')
| -rw-r--r-- | ace/OS_NS_dirent.inl | 58 |
1 files changed, 19 insertions, 39 deletions
diff --git a/ace/OS_NS_dirent.inl b/ace/OS_NS_dirent.inl index ff562717cb9..7d2b7bfb288 100644 --- a/ace/OS_NS_dirent.inl +++ b/ace/OS_NS_dirent.inl @@ -1,16 +1,10 @@ // -*- C++ -*- -// // $Id$ #include "ace/OS_Memory.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace ACE_OS -{ - ACE_INLINE void -closedir (ACE_DIR *d) +ACE_OS::closedir (ACE_DIR *d) { #if defined (ACE_HAS_DIRENT) # if defined (ACE_PSOS) @@ -26,8 +20,6 @@ closedir (ACE_DIR *d) ACE_OS::closedir_emulation (d); delete [] d->directory_name_; delete d; -# elif defined (ACE_HAS_WCLOSEDIR) && defined (ACE_USES_WCHAR) - ::wclosedir (d); # else /* ACE_WIN32 && ACE_LACKS_CLOSEDIR */ ::closedir (d); # endif /* ACE_WIN32 && ACE_LACKS_CLOSEDIR */ @@ -39,13 +31,13 @@ closedir (ACE_DIR *d) } ACE_INLINE ACE_DIR * -opendir (const ACE_TCHAR *filename) +ACE_OS::opendir (const ACE_TCHAR *filename) { #if defined (ACE_HAS_DIRENT) # if defined (ACE_PSOS) // The pointer to the <ACE_DIR> buffer *must* be passed to // <ACE_OS::closedir> to free it and avoid a memory leak. - ACE_DIR *dir = 0; + ACE_DIR *dir; u_long result; ACE_NEW_RETURN (dir, ACE_DIR, 0); result = ::open_dir (const_cast<ACE_TCHAR *> (filename), &dir->xdir); @@ -59,12 +51,10 @@ opendir (const ACE_TCHAR *filename) # else /* ! ACE_PSOS */ # if defined (ACE_WIN32) && defined (ACE_LACKS_OPENDIR) return ::ACE_OS::opendir_emulation (filename); -# elif defined (ACE_HAS_WOPENDIR) && defined (ACE_USES_WCHAR) - return ::wopendir (filename); # elif defined (ACE_HAS_NONCONST_OPENDIR) return ::opendir (const_cast<char *> (filename)); # else /* ! ACE_WIN32 && ACE_LACKS_OPENDIR */ - return ::opendir (ACE_TEXT_ALWAYS_CHAR (filename)); + return ::opendir (ACE_TEXT_TO_CHAR_IN (filename)); # endif /* ACE_WIN32 && ACE_LACKS_OPENDIR */ # endif /* ACE_PSOS */ #else @@ -73,9 +63,8 @@ opendir (const ACE_TCHAR *filename) #endif /* ACE_HAS_DIRENT */ } -ACE_INLINE -struct ACE_DIRENT * -readdir (ACE_DIR *d) +ACE_INLINE struct dirent * +ACE_OS::readdir (ACE_DIR *d) { #if defined (ACE_HAS_DIRENT) # if defined (ACE_PSOS) @@ -92,8 +81,6 @@ readdir (ACE_DIR *d) # else /* ! ACE_PSOS */ # if defined (ACE_WIN32) && defined (ACE_LACKS_READDIR) return ACE_OS::readdir_emulation (d); -# elif defined (ACE_HAS_WREADDIR) && defined (ACE_USES_WCHAR) - return ::wreaddir (d); # else /* ACE_WIN32 && ACE_LACKS_READDIR */ return ::readdir (d); # endif /* ACE_WIN32 && ACE_LACKS_READDIR */ @@ -105,9 +92,9 @@ readdir (ACE_DIR *d) } ACE_INLINE int -readdir_r (ACE_DIR *dirp, - struct ACE_DIRENT *entry, - struct ACE_DIRENT **result) +ACE_OS::readdir_r (ACE_DIR *dirp, + struct dirent *entry, + struct dirent **result) { #if !defined (ACE_HAS_REENTRANT_FUNCTIONS) ACE_UNUSED_ARG (entry); @@ -136,7 +123,7 @@ readdir_r (ACE_DIR *dirp, *result = entry; return ::readdir_r (dirp, entry); #elif defined(__GNUC__) && defined (_AIX) - return ::readdir_r (dirp, entry, result); + return ::readdir_r (dirp, entry, result); # else // <result> had better not be 0! *result = ::readdir_r (dirp, entry); @@ -153,14 +140,12 @@ readdir_r (ACE_DIR *dirp, } ACE_INLINE void -rewinddir (ACE_DIR *d) +ACE_OS::rewinddir (ACE_DIR *d) { #if defined (ACE_HAS_DIRENT) # if defined (ACE_LACKS_SEEKDIR) # if defined (ACE_LACKS_REWINDDIR) ACE_UNUSED_ARG (d); -# elif defined (ACE_HAS_WREWINDDIR) && defined (ACE_USES_WCHAR) - ::wrewinddir (d); # else /* ! defined (ACE_LACKS_REWINDDIR) */ ::rewinddir (d); # endif /* ! defined (ACE_LACKS_REWINDDIR) */ @@ -175,14 +160,14 @@ rewinddir (ACE_DIR *d) } ACE_INLINE int -scandir (const ACE_TCHAR *dirname, - struct ACE_DIRENT **namelist[], - int (*selector)(const struct ACE_DIRENT *), - int (*comparator) (const struct ACE_DIRENT **f1, - const struct ACE_DIRENT **f2)) +ACE_OS::scandir (const ACE_TCHAR *dirname, + struct dirent **namelist[], + int (*selector)(const struct dirent *), + int (*comparator) (const struct dirent **f1, + const struct dirent **f2)) { #if defined (ACE_HAS_SCANDIR) - return ::scandir (ACE_TEXT_ALWAYS_CHAR (dirname), + return ::scandir (ACE_TEXT_TO_CHAR_IN (dirname), namelist, selector, # if defined (ACE_SCANDIR_CMP_USES_VOIDPTR) @@ -194,9 +179,8 @@ scandir (const ACE_TCHAR *dirname, return ACE_OS::scandir_emulation (dirname, namelist, selector, comparator); #endif /* ACE_HAS_SCANDIR */ } - ACE_INLINE void -seekdir (ACE_DIR *d, long loc) +ACE_OS::seekdir (ACE_DIR *d, long loc) { #if defined (ACE_HAS_DIRENT) && !defined (ACE_LACKS_SEEKDIR) ::seekdir (d, loc); @@ -207,7 +191,7 @@ seekdir (ACE_DIR *d, long loc) } ACE_INLINE long -telldir (ACE_DIR *d) +ACE_OS::telldir (ACE_DIR *d) { #if defined (ACE_HAS_DIRENT) && !defined (ACE_LACKS_TELLDIR) return ::telldir (d); @@ -216,7 +200,3 @@ telldir (ACE_DIR *d) ACE_NOTSUP_RETURN (-1); #endif /* ! ACE_HAS_DIRENT || ACE_LACKS_TELLDIR */ } - -} - -ACE_END_VERSIONED_NAMESPACE_DECL |