diff options
| author | Fred Hornsey <hornseyf@objectcomputing.com> | 2020-12-05 19:40:08 -0600 |
|---|---|---|
| committer | Fred Hornsey <hornseyf@objectcomputing.com> | 2020-12-05 19:54:35 -0600 |
| commit | cf1d8477fd0d0f49748f30939e999b8a94c527ad (patch) | |
| tree | 8423a71e137ad327b38fbb2946c0e9f5caaa0811 /ACE/ace/OS_NS_dirent.inl | |
| parent | c62ecd5955c1350fa25f95deb9bce2c81bc70f1c (diff) | |
| download | ATCD-cf1d8477fd0d0f49748f30939e999b8a94c527ad.tar.gz | |
Remove ACE_OS::readdir_r
glibc (https://man7.org/linux/man-pages/man3/readdir_r.3.html) and
FreeBSD libc (https://www.freebsd.org/cgi/man.cgi?query=readdir&sektion=3)
have both marked `readdir_r` deprecated, mainly because it can't deal
with arbitrarily long path names, so we should probably remove it.
Also removed `ACE_Dirent::(ACE_DIRENT *, ACE_DIRENT **)` which used it.
`ACE_LACKS_READDIR_R` will now always be defined.
Diffstat (limited to 'ACE/ace/OS_NS_dirent.inl')
| -rw-r--r-- | ACE/ace/OS_NS_dirent.inl | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/ACE/ace/OS_NS_dirent.inl b/ACE/ace/OS_NS_dirent.inl index 145ccb17970..f55ec13406e 100644 --- a/ACE/ace/OS_NS_dirent.inl +++ b/ACE/ace/OS_NS_dirent.inl @@ -65,36 +65,6 @@ readdir (ACE_DIR *d) #endif /* ACE_HAS_DIRENT */ } -ACE_INLINE int -readdir_r (ACE_DIR *dirp, - struct ACE_DIRENT *entry, - struct ACE_DIRENT **result) -{ -#if !defined (ACE_HAS_REENTRANT_FUNCTIONS) - ACE_UNUSED_ARG (entry); - // <result> has better not be 0! - *result = ACE_OS::readdir (dirp); - if (*result) - return 0; // Keep iterating - else - return 1; // Oops, some type of error! -#elif defined (ACE_HAS_DIRENT) && !defined (ACE_LACKS_READDIR_R) -# if defined (ACE_HAS_3_PARAM_READDIR_R) - return ::readdir_r (dirp, entry, result); -# else - // <result> had better not be 0! - *result = ::readdir_r (dirp, entry); - return 0; -# endif /* sun */ -#else /* ! ACE_HAS_DIRENT || ACE_LACKS_READDIR_R */ - ACE_UNUSED_ARG (dirp); - ACE_UNUSED_ARG (entry); - ACE_UNUSED_ARG (result); - ACE_NOTSUP_RETURN (0); - -#endif /* ACE_HAS_REENTRANT_FUNCTIONS */ -} - ACE_INLINE void rewinddir (ACE_DIR *d) { |