Removed lot of ACE_OSCALL_RETURN calls, the macro expanded to only the method invocation itself

    * ACE/ace/OS_NS_Thread.inl:
    * ACE/ace/OS_NS_arpa_inet.cpp:
    * ACE/ace/OS_NS_arpa_inet.inl:
    * ACE/ace/OS_NS_devctl.inl:
    * ACE/ace/OS_NS_dlfcn.inl:
    * ACE/ace/OS_NS_fcntl.cpp:
    * ACE/ace/OS_NS_fcntl.inl:
    * ACE/ace/OS_NS_poll.inl:
    * ACE/ace/OS_NS_regex.inl:
    * ACE/ace/OS_NS_signal.inl:
    * ACE/ace/OS_NS_stdio.inl:
    * ACE/ace/OS_NS_stdlib.inl:
    * ACE/ace/OS_NS_stropts.inl:
    * ACE/ace/OS_NS_sys_mman.inl:
    * ACE/ace/OS_NS_sys_msg.inl:
    * ACE/ace/OS_NS_sys_resource.inl:
    * ACE/ace/OS_NS_sys_shm.inl:
    * ACE/ace/OS_NS_sys_socket.inl:
    * ACE/ace/OS_NS_sys_stat.inl:
    * ACE/ace/OS_NS_sys_uio.inl:
    * ACE/ace/OS_NS_sys_utsname.cpp:
    * ACE/ace/OS_NS_sys_wait.inl:
    * ACE/ace/OS_NS_time.cpp:
    * ACE/ace/OS_NS_time.inl:
    * ACE/ace/OS_NS_unistd.cpp:
    * ACE/ace/OS_NS_unistd.inl:
    * ACE/ace/OS_NS_wchar.inl:
    * ACE/ace/OS_TLI.inl:

1 files changed, 38 insertions, 45 deletions

diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl
index fb881296f87..9c448db1562 100644
--- a/ACE/ace/OS_NS_stdio.inl
+++ b/ACE/ace/OS_NS_stdio.inl
@@ -150,7 +150,7 @@ ACE_OS::flock_unlock (ACE_OS::ace_flock_t *lock,
   lock->lock_.l_type = F_UNLCK;   // Unlock file.
 
   // release lock
-  ACE_OSCALL_RETURN (ACE_OS::fcntl (lock->handle_, F_SETLK, reinterpret_cast<long> (&lock->lock_)), int);
+  return ACE_OS::fcntl (lock->handle_, F_SETLK, reinterpret_cast<long> (&lock->lock_));
 #endif /* ACE_WIN32 */
 }
 
@@ -212,7 +212,7 @@ ACE_OS::flock_rdlock (ACE_OS::ace_flock_t *lock,
   lock->lock_.l_len = len;
   lock->lock_.l_type = F_RDLCK;         // set read lock
   // block, if no access
-  ACE_OSCALL_RETURN (ACE_OS::fcntl (lock->handle_, F_SETLKW, reinterpret_cast<long> (&lock->lock_)), int);
+  return ACE_OS::fcntl (lock->handle_, F_SETLKW, reinterpret_cast<long> (&lock->lock_));
 #endif /* ACE_WIN32 */
 }
 
@@ -336,7 +336,7 @@ ACE_OS::flock_wrlock (ACE_OS::ace_flock_t *lock,
   lock->lock_.l_len = len;
   lock->lock_.l_type = F_WRLCK;         // set write lock
   // block, if no access
-  ACE_OSCALL_RETURN (ACE_OS::fcntl (lock->handle_, F_SETLKW, reinterpret_cast<long> (&lock->lock_)), int);
+  return ACE_OS::fcntl (lock->handle_, F_SETLKW, reinterpret_cast<long> (&lock->lock_));
 #endif /* ACE_WIN32 */
 }
 
@@ -450,7 +450,7 @@ ACE_OS::cuserid (char *user, size_t maxlen)
 #else
   // Hackish because of missing buffer size!
   ACE_UNUSED_ARG (maxlen);
-  ACE_OSCALL_RETURN (::ace_cuserid(user), char*);
+  return ::ace_cuserid(user);
 #endif /* ACE_VXWORKS */
 }
 
@@ -492,7 +492,7 @@ ACE_INLINE int
 ACE_OS::fclose (FILE *fp)
 {
   ACE_OS_TRACE ("ACE_OS::fclose");
-  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fclose (fp), int);
+  return ACE_STD_NAMESPACE::fclose (fp);
 }
 
 ACE_INLINE FILE *
@@ -501,9 +501,9 @@ ACE_OS::fdopen (ACE_HANDLE handle, const ACE_TCHAR *mode)
   ACE_OS_TRACE ("ACE_OS::fdopen");
 #if defined (ACE_HAS_WINCE)
 # if defined (ACE_HAS_NONCONST_WFDOPEN)
-  ACE_OSCALL_RETURN (::_wfdopen ((int)handle, const_cast <ACE_TCHAR*> (ACE_TEXT_ALWAYS_WCHAR (mode))), FILE*);
+  return ::_wfdopen ((int)handle, const_cast <ACE_TCHAR*> (ACE_TEXT_ALWAYS_WCHAR (mode)));
 # else
-  ACE_OSCALL_RETURN (::_wfdopen (handle, ACE_TEXT_ALWAYS_WCHAR (mode)), FILE*);
+  return ::_wfdopen (handle, ACE_TEXT_ALWAYS_WCHAR (mode));
 # endif
 #elif defined (ACE_WIN32)
   // kernel file handle -> FILE* conversion...
@@ -533,7 +533,7 @@ ACE_OS::fdopen (ACE_HANDLE handle, const ACE_TCHAR *mode)
   ACE_UNUSED_ARG (mode);
   ACE_NOTSUP_RETURN (0);
 #else
-  ACE_OSCALL_RETURN (::fdopen (handle, ACE_TEXT_ALWAYS_CHAR (mode)), FILE *);
+  return ::fdopen (handle, ACE_TEXT_ALWAYS_CHAR (mode));
 #endif /* ACE_HAS_WINCE */
 }
 
@@ -541,7 +541,7 @@ ACE_INLINE int
 ACE_OS::fflush (FILE *fp)
 {
   ACE_OS_TRACE ("ACE_OS::fflush");
-  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fflush (fp), int);
+  return ACE_STD_NAMESPACE::fflush (fp);
 }
 
 ACE_INLINE int
@@ -569,7 +569,7 @@ ACE_OS::fgetpos (FILE *fp, fpos_t *pos)
   ACE_UNUSED_ARG (pos);
   ACE_NOTSUP_RETURN (-1);
 #else
-  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgetpos (fp, pos), int);
+  return ACE_STD_NAMESPACE::fgetpos (fp, pos);
 #endif
 }
 
@@ -589,7 +589,7 @@ ACE_OS::fgets (char *buf, int size, FILE *fp)
   *iter = '\0';
   return c == EOF ? 0 : buf;
 #else
-  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgets (buf, size, fp), char *);
+  return ACE_STD_NAMESPACE::fgets (buf, size, fp);
 #endif /* ACE_LACKS_FGETS */
 }
 
@@ -598,7 +598,7 @@ ACE_INLINE wchar_t *
 ACE_OS::fgets (wchar_t *buf, int size, FILE *fp)
 {
   ACE_OS_TRACE ("ACE_OS::fgets");
-  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgetws (buf, size, fp), wchar_t *);
+  return ACE_STD_NAMESPACE::fgetws (buf, size, fp);
 }
 #endif /* ACE_HAS_WCHAR && !ACE_LACKS_FGETWS */
 
@@ -618,7 +618,7 @@ ACE_INLINE FILE *
 ACE_OS::fopen (const char *filename, const char *mode)
 {
   ACE_OS_TRACE ("ACE_OS::fopen");
-  ACE_OSCALL_RETURN (::fopen (filename, mode), FILE *);
+  return ::fopen (filename, mode);
 }
 
 #if defined (ACE_HAS_WCHAR)
@@ -628,7 +628,7 @@ ACE_OS::fopen (const char *filename, const wchar_t *mode)
 {
   ACE_OS_TRACE ("ACE_OS::fopen");
   ACE_Wide_To_Ascii n_mode (mode);
-  ACE_OSCALL_RETURN (::fopen (filename, n_mode.char_rep ()), FILE *);
+  return ::fopen (filename, n_mode.char_rep ());
 }
 
 // Win32 PC implementation of fopen () is in OS_NS_stdio.cpp.
@@ -637,12 +637,12 @@ ACE_OS::fopen (const wchar_t *filename, const wchar_t *mode)
 {
   ACE_OS_TRACE ("ACE_OS::fopen");
 #if defined (ACE_HAS_WINCE)
-  ACE_OSCALL_RETURN (::_wfopen (filename, mode), FILE *, 0);
+  return ::_wfopen (filename, mode);
 #else
   // Non-Windows doesn't use wchar_t file systems.
   ACE_Wide_To_Ascii n_filename (filename);
   ACE_Wide_To_Ascii n_mode (mode);
-  ACE_OSCALL_RETURN (::fopen (n_filename.char_rep (), n_mode.char_rep ()), FILE*);
+  return ::fopen (n_filename.char_rep (), n_mode.char_rep ());
 #endif /* ACE_HAS_WINCE */
 }
 // Win32 PC implementation of fopen () is in OS_NS_stdio.cpp.
@@ -652,11 +652,11 @@ ACE_OS::fopen (const wchar_t *filename, const char *mode)
   ACE_OS_TRACE ("ACE_OS::fopen");
 #if defined (ACE_HAS_WINCE)
   ACE_Ascii_To_Wide n_mode (mode);
-  ACE_OSCALL_RETURN (::_wfopen (filename, n_mode.wchar_rep ()), FILE *);
+  return ::_wfopen (filename, n_mode.wchar_rep ());
 #else
   // Non-Windows doesn't use wchar_t file systems.
   ACE_Wide_To_Ascii n_filename (filename);
-  ACE_OSCALL_RETURN (::fopen (n_filename.char_rep (), mode), FILE*);
+  return ::fopen (n_filename.char_rep (), mode);
 #endif /* ACE_HAS_WINCE */
 }
 #endif /* ACE_HAS_WCHAR */
@@ -708,7 +708,7 @@ ACE_OS::fputs (const char *s, FILE *stream)
   ACE_UNUSED_ARG (stream);
   ACE_NOTSUP_RETURN (-1);
 #else
-  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fputs (s, stream), int);
+  return ACE_STD_NAMESPACE::fputs (s, stream);
 #endif
 }
 
@@ -717,7 +717,7 @@ ACE_INLINE int
 ACE_OS::fputs (const wchar_t *s, FILE *stream)
 {
   ACE_OS_TRACE ("ACE_OS::fputs");
-  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fputws (s, stream), int);
+  return ACE_STD_NAMESPACE::fputws (s, stream);
 }
 #endif /* ACE_HAS_WCHAR && !ACE_LACKS_FPUTWS */
 
@@ -725,7 +725,7 @@ ACE_INLINE size_t
 ACE_OS::fread (void *ptr, size_t size, size_t nelems, FILE *fp)
 {
   ACE_OS_TRACE ("ACE_OS::fread");
-  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fread (ptr, size, nelems, fp), size_t);
+  return ACE_STD_NAMESPACE::fread (ptr, size, nelems, fp);
 }
 
 ACE_INLINE FILE *
@@ -733,21 +733,14 @@ ACE_OS::freopen (const ACE_TCHAR *filename, const ACE_TCHAR *mode, FILE* stream)
 {
   ACE_OS_TRACE ("ACE_OS::freopen");
 #if defined (ACE_WIN32) && defined(ACE_USES_WCHAR)
-  ACE_OSCALL_RETURN (::_wfreopen (ACE_TEXT_ALWAYS_WCHAR (filename),
-                                  ACE_TEXT_ALWAYS_WCHAR (mode),
-                                  stream),
-                     FILE *);
+  return ::_wfreopen (ACE_TEXT_ALWAYS_WCHAR (filename), ACE_TEXT_ALWAYS_WCHAR (mode), stream);
 #elif defined (ACE_LACKS_FREOPEN)
   ACE_UNUSED_ARG (filename);
   ACE_UNUSED_ARG (mode);
   ACE_UNUSED_ARG (stream);
   ACE_NOTSUP_RETURN (0);
 #else
-  ACE_OSCALL_RETURN
-    (ACE_STD_NAMESPACE::freopen (ACE_TEXT_ALWAYS_CHAR (filename),
-                                 ACE_TEXT_ALWAYS_CHAR (mode),
-                                 stream),
-     FILE *);
+  return ACE_STD_NAMESPACE::freopen (ACE_TEXT_ALWAYS_CHAR (filename), ACE_TEXT_ALWAYS_CHAR (mode), stream);
 #endif /* ACE_WIN32 && ACE_USES_WCHAR */
 }
 
@@ -774,7 +767,7 @@ ACE_OS::fseek (FILE *fp, long offset, int whence)
     }
 # endif  /* SEEK_SET != FILE_BEGIN || SEEK_CUR != FILE_CURRENT || SEEK_END != FILE_END */
 #endif   /* ACE_WIN32 */
-  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fseek (fp, offset, whence), int);
+  return ACE_STD_NAMESPACE::fseek (fp, offset, whence);
 }
 
 ACE_INLINE int
@@ -785,21 +778,21 @@ ACE_OS::fsetpos (FILE* fp, fpos_t* pos)
   ACE_UNUSED_ARG (pos);
   ACE_NOTSUP_RETURN (-1);
 #else
-  ACE_OSCALL_RETURN (::fsetpos (fp, pos), int);
+  return ::fsetpos (fp, pos);
 #endif /* ACE_LACKS_FSETPOS */
 }
 
 ACE_INLINE long
 ACE_OS::ftell (FILE* fp)
 {
-  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::ftell (fp), long);
+  return ACE_STD_NAMESPACE::ftell (fp);
 }
 
 ACE_INLINE size_t
 ACE_OS::fwrite (const void *ptr, size_t size, size_t nitems, FILE *fp)
 {
   ACE_OS_TRACE ("ACE_OS::fwrite");
-  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fwrite (ptr, size, nitems, fp), size_t);
+  return ACE_STD_NAMESPACE::fwrite (ptr, size, nitems, fp);
 }
 
 ACE_INLINE void
@@ -837,7 +830,7 @@ ACE_OS::puts (const char *s)
   ACE_UNUSED_ARG (s);
   ACE_NOTSUP_RETURN (-1);
 #else
-  ACE_OSCALL_RETURN (::puts (s), int);
+  return ::puts (s);
 #endif /* ACE_LACKS_PUTS */
 }
 
@@ -847,11 +840,11 @@ ACE_OS::puts (const wchar_t *s)
 {
   ACE_OS_TRACE ("ACE_OS::puts");
 #if defined (ACE_WIN32)
-  ACE_OSCALL_RETURN (::_putws (s), int);
+  return ::_putws (s);
 #else /* ACE_WIN32 */
   // There's no putws()...
   ACE_Wide_To_Ascii n_s (s);
-  ACE_OSCALL_RETURN (::puts (n_s.char_rep ()), int);
+  return ::puts (n_s.char_rep ());
 #endif /* ACE_WIN32 */
 }
 #endif /* ACE_HAS_WCHAR */
@@ -884,10 +877,10 @@ ACE_OS::rename (const char *old_name,
     ACE_FAIL_RETURN (-1);
   return 0;
 #elif defined (ACE_RENAME_EQUIVALENT)
-  ACE_OSCALL_RETURN (ACE_RENAME_EQUIVALENT (old_name, new_name), int);
+  return ACE_RENAME_EQUIVALENT (old_name, new_name);
 # else
   ACE_UNUSED_ARG (flags);
-  ACE_OSCALL_RETURN (::rename (old_name, new_name), int);
+  return ::rename (old_name, new_name);
 # endif /* ACE_HAS_WINCE */
 }
 
@@ -919,7 +912,7 @@ ACE_OS::rename (const wchar_t *old_name,
   return 0;
 # elif defined (ACE_WIN32)
   ACE_UNUSED_ARG (flags);
-  ACE_OSCALL_RETURN (::_wrename (old_name, new_name), int);
+  return ::_wrename (old_name, new_name);
 # else
   ACE_Wide_To_Ascii nold_name (old_name);
   ACE_Wide_To_Ascii nnew_name (new_name);
@@ -955,11 +948,11 @@ ACE_OS::tempnam (const char *dir, const char *pfx)
   ACE_UNUSED_ARG (pfx);
   ACE_NOTSUP_RETURN (0);
 #elif defined (ACE_HAS_NONCONST_TEMPNAM)
-  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::tempnam (const_cast <char *> (dir), const_cast<char *> (pfx)), char *);
+  return ACE_STD_NAMESPACE::tempnam (const_cast <char *> (dir), const_cast<char *> (pfx));
 #elif defined (ACE_TEMPNAM_EQUIVALENT)
-  ACE_OSCALL_RETURN (ACE_TEMPNAM_EQUIVALENT (dir, pfx), char *);
+  return ACE_TEMPNAM_EQUIVALENT (dir, pfx);
 #else /* ACE_LACKS_TEMPNAM */
-  ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::tempnam (dir, pfx), char *);
+  return ACE_STD_NAMESPACE::tempnam (dir, pfx);
 #endif /* ACE_LACKS_TEMPNAM */
 }
 
@@ -974,9 +967,9 @@ ACE_OS::tempnam (const wchar_t *dir, const wchar_t *pfx)
   ACE_NOTSUP_RETURN (0);
 #elif defined(ACE_WIN32)
 #  if defined (ACE_HAS_NONCONST_TEMPNAM)
-  ACE_OSCALL_RETURN (::_wtempnam (const_cast <wchar_t*> (dir), const_cast <wchar_t*> (pfx)), wchar_t *);
+  return ::_wtempnam (const_cast <wchar_t*> (dir), const_cast <wchar_t*> (pfx));
 #  else
-  ACE_OSCALL_RETURN (::_wtempnam (dir, pfx), wchar_t *);
+  return ::_wtempnam (dir, pfx);
 #  endif /* ACE_HAS_NONCONST_TEMPNAM */
 #else /* ACE_LACKS_TEMPNAM */
   // No native wide-char support; convert to narrow and call the char* variant.