diff options
36 files changed, 392 insertions, 477 deletions
diff --git a/ACE/ace/Mem_Map.cpp b/ACE/ace/Mem_Map.cpp index 93a5b52b880..47fa9b2b3d2 100644 --- a/ACE/ace/Mem_Map.cpp +++ b/ACE/ace/Mem_Map.cpp @@ -189,7 +189,7 @@ ACE_Mem_Map::open (const ACE_TCHAR *file_name, #if defined (INTEGRITY) || defined (__QNXNTO__) || defined (ACE_VXWORKS) this->handle_ = ACE_OS::shm_open (file_name, flags, perms, sa); #elif defined (ACE_OPENVMS) - ACE_OSCALL (::open (file_name, flags, perms, "shr=get,put,upd"), ACE_HANDLE, -1, this->handle_); + ACE_OSCALL (::open (file_name, flags, perms, "shr=get,put,upd"), ACE_HANDLE, this->handle_); #else this->handle_ = ACE_OS::open (file_name, flags, perms, sa); #endif /* INTEGRITY */ diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp index 01690d94c71..8ef256aa9c3 100644 --- a/ACE/ace/OS_NS_Thread.cpp +++ b/ACE/ace/OS_NS_Thread.cpp @@ -1621,7 +1621,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, ACE_OSCALL (ACE_ADAPT_RETVAL (::SleepConditionVariableCS (cv, external_mutex, msec_timeout), result), - int, -1, result); + int, result); return result; #else // Prevent race conditions on the <waiters_> count. @@ -1728,8 +1728,7 @@ ACE_OS::cond_wait (ACE_cond_t *cv, # if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::SleepConditionVariableCS (cv, external_mutex, INFINITE), result), - int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::SleepConditionVariableCS (cv, external_mutex, INFINITE), result), int); #else if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) return -1; @@ -1911,11 +1910,9 @@ ACE_OS::mutex_init (ACE_mutex_t *m, ACE_UNUSED_ARG (sa); ACE_UNUSED_ARG (lock_type); int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_init (m, - lock_scope, - attributes), + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_init (m, lock_scope, attributes), result), - int, -1); + int); # elif defined (ACE_HAS_WTHREADS) m->type_ = lock_scope; @@ -1987,12 +1984,11 @@ ACE_OS::mutex_destroy (ACE_mutex_t *m) ACE_NOTSUP_RETURN (-1); # else int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_mutex_destroy (m), - result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_mutex_destroy (m), result), int); # endif /* ACE_LACKS_PTHREAD_MUTEX_DESTROY */ # elif defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_destroy (m), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_destroy (m), result), int); # elif defined (ACE_HAS_WTHREADS) switch (m->type_) { @@ -2073,11 +2069,10 @@ ACE_OS::mutex_lock (ACE_mutex_t *m) # if defined (ACE_HAS_PTHREADS) // Note, don't use "::" here since the following call is often a macro. int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_mutex_lock (m), result), - int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_mutex_lock (m), result), int); # elif defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_lock (m), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_lock (m), result), int); # elif defined (ACE_HAS_WTHREADS) switch (m->type_) { @@ -2168,7 +2163,7 @@ ACE_OS::mutex_lock (ACE_mutex_t *m, // Note that the mutex should not be a recursive one, i.e., it // should only be a standard mutex or an error checking mutex. - ACE_OSCALL (ACE_ADAPT_RETVAL (::pthread_mutex_timedlock (m, &ts), result), int, -1, result); + ACE_OSCALL (ACE_ADAPT_RETVAL (::pthread_mutex_timedlock (m, &ts), result), int, result); // We need to adjust this to make the errno values consistent. if (result == -1 && errno == ETIMEDOUT) @@ -2248,11 +2243,10 @@ ACE_OS::mutex_trylock (ACE_mutex_t *m) # if defined (ACE_HAS_PTHREADS) // Note, don't use "::" here since the following call is often a macro. int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_mutex_trylock (m), result), - int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_mutex_trylock (m), result), int); # elif defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_trylock (m), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_trylock (m), result), int); # elif defined (ACE_HAS_WTHREADS) switch (m->type_) { @@ -2350,11 +2344,10 @@ ACE_OS::mutex_unlock (ACE_mutex_t *m) # if defined (ACE_HAS_PTHREADS) // Note, don't use "::" here since the following call is often a macro. int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_mutex_unlock (m), result), - int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_mutex_unlock (m), result), int); # elif defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_unlock (m), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_unlock (m), result), int); # elif defined (ACE_HAS_WTHREADS) switch (m->type_) { @@ -3299,7 +3292,7 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, sched_params.policy (), ¶m), result), - int, -1); + int); } # if defined (sun) // We need to be able to set LWP priorities on Suns, even without @@ -3932,7 +3925,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func, thread_args->entry_point (), thread_args), result), - int, -1, result); + int, result); ::pthread_attr_destroy (&attr); // This is a SunOS or POSIX implementation of pthreads, where we @@ -3966,7 +3959,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func, &policy, &sparam), result), int, - -1, result); + result); // The only policy supported by by SunOS, thru version 5.6, // is SCHED_OTHER, so that's hard-coded here. @@ -3982,7 +3975,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func, policy, &sparam), result), - int, -1); + int); } } @@ -4025,7 +4018,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func, thread_args->entry_point (), thread_args, flags, thr_id), result), - int, -1, result); + int, result); if (result != -1) { @@ -4514,12 +4507,12 @@ ACE_OS::thr_keycreate_native (ACE_OS_thread_key_t *key, int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_key_create (key, dest), result), - int, -1); + int); # elif defined (ACE_HAS_STHREADS) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_keycreate (key, dest), result), - int, -1); + int); # elif defined (ACE_HAS_WTHREADS) ACE_UNUSED_ARG (dest); *key = ::TlsAlloc (); @@ -4722,10 +4715,10 @@ ACE_OS::thr_setspecific_native (ACE_OS_thread_key_t key, void *data) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_setspecific (key, data), result), - int, -1); + int); # elif defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_setspecific (key, data), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_setspecific (key, data), result), int); # elif defined (ACE_HAS_WTHREADS) ::TlsSetValue (key, data); return 0; diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl index 8d3c29a913a..8c8483eb75e 100644 --- a/ACE/ace/OS_NS_Thread.inl +++ b/ACE/ace/OS_NS_Thread.inl @@ -223,7 +223,7 @@ ACE_OS::condattr_setclock (ACE_condattr_t &attributes, clockid_t clock_id) int result = -1; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_condattr_setclock (&attributes, clock_id), result), - int, -1); + int); return result; #else ACE_UNUSED_ARG (clock_id); @@ -247,12 +247,12 @@ ACE_OS::cond_broadcast (ACE_cond_t *cv) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cond_broadcast (cv), result), - int, -1); + int); # elif defined (ACE_HAS_STHREADS) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_broadcast (cv), result), - int, -1); + int); # elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) ::WakeAllConditionVariable (cv); return 0; @@ -270,10 +270,10 @@ ACE_OS::cond_destroy (ACE_cond_t *cv) # if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cond_destroy (cv), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cond_destroy (cv), result), int); # elif defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_destroy (cv), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_destroy (cv), result), int); # elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) // Windows doesn't have a destroy return 0; @@ -319,7 +319,7 @@ ACE_OS::cond_init (ACE_cond_t *cv, attributes.type, arg), result), - int, -1); + int); # elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) ::InitializeConditionVariable (cv); return 0; @@ -360,10 +360,10 @@ ACE_OS::cond_signal (ACE_cond_t *cv) # if defined (ACE_HAS_PTHREADS) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cond_signal (cv), result), - int, -1); + int); # elif defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_signal (cv), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_signal (cv), result), int); # elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) ::WakeConditionVariable (cv); return 0; @@ -383,15 +383,15 @@ ACE_OS::cond_wait (ACE_cond_t *cv, # if defined (ACE_HAS_PTHREADS) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cond_wait (cv, external_mutex), result), - int, -1); + int); # elif defined (ACE_HAS_STHREADS) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_wait (cv, external_mutex), result), - int, -1); + int); # elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::SleepConditionVariableCS (cv, &external_mutex->thr_mutex_, INFINITE), result), - int, -1); + int); # endif /* ACE_HAS_PTHREADS */ # else ACE_UNUSED_ARG (cv); @@ -420,7 +420,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, : pthread_cond_timedwait (cv, external_mutex, (ACE_TIMESPEC_PTR) &ts), result), - int, -1, result); + int, result); // We need to adjust this to make the POSIX and Solaris return // values consistent. EAGAIN is from Pthreads DRAFT4 (HP-UX 10.20 and down) if (result == -1 && @@ -434,7 +434,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, external_mutex, (timestruc_t*)&ts), result), - int, -1, result); + int, result); # elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) int msec_timeout = 0; if (timeout != 0) @@ -448,7 +448,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, ACE_OSCALL (ACE_ADAPT_RETVAL (::SleepConditionVariableCS (cv, &external_mutex->thr_mutex_, msec_timeout), result), - int, -1, result); + int, result); return result; # endif /* ACE_HAS_STHREADS */ @@ -574,7 +574,7 @@ ACE_OS::priority_control (ACE_idtype_t idtype, ACE_id_t identifier, int cmd, voi ACE_OS_TRACE ("ACE_OS::priority_control"); #if defined (ACE_HAS_PRIOCNTL) ACE_OSCALL_RETURN (priocntl (idtype, identifier, cmd, static_cast<caddr_t> (arg)), - long, -1); + long); #else /* ! ACE_HAS_PRIOCNTL*/ ACE_UNUSED_ARG (idtype); ACE_UNUSED_ARG (identifier); @@ -1029,10 +1029,10 @@ ACE_OS::rw_rdlock (ACE_rwlock_t *rw) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_rdlock (rw), result), - int, -1); + int); # else /* Solaris */ int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_rdlock (rw), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_rdlock (rw), result), int); # endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ # else /* NT, POSIX, and VxWorks don't support this natively. */ # if defined (ACE_HAS_PTHREADS) @@ -1080,10 +1080,10 @@ ACE_OS::rw_tryrdlock (ACE_rwlock_t *rw) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_tryrdlock (rw), result), - int, -1); + int); # else /* Solaris */ int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_tryrdlock (rw), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_tryrdlock (rw), result), int); # endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ # else /* NT, POSIX, and VxWorks don't support this natively. */ int result = -1; @@ -1123,10 +1123,10 @@ ACE_OS::rw_trywrlock (ACE_rwlock_t *rw) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_trywrlock (rw), result), - int, -1); + int); # else /* Solaris */ int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_trywrlock (rw), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_trywrlock (rw), result), int); # endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ # else /* NT, POSIX, and VxWorks don't support this natively. */ int result = -1; @@ -1171,7 +1171,7 @@ ACE_OS::rw_trywrlock_upgrade (ACE_rwlock_t *rw) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_trywrlock (rw), result), - int, -1); + int); # elif !defined (ACE_LACKS_RWLOCK_T) // Some native rwlocks, such as those on Solaris, don't // support the upgrade feature . . . @@ -1244,10 +1244,10 @@ ACE_OS::rw_unlock (ACE_rwlock_t *rw) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_unlock (rw), result), - int, -1); + int); # else /* Solaris */ int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_unlock (rw), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_unlock (rw), result), int); # endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ # else /* NT, POSIX, and VxWorks don't support this natively. */ if (ACE_OS::mutex_lock (&rw->lock_) == -1) @@ -1303,10 +1303,10 @@ ACE_OS::rw_wrlock (ACE_rwlock_t *rw) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_wrlock (rw), result), - int, -1); + int); # else /* Solaris */ int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_wrlock (rw), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_wrlock (rw), result), int); # endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ # else /* NT, POSIX, and VxWorks don't support this natively. */ # if defined (ACE_HAS_PTHREADS) @@ -1356,10 +1356,10 @@ ACE_OS::rwlock_destroy (ACE_rwlock_t *rw) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_destroy (rw), result), - int, -1); + int); # else /* Solaris */ int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rwlock_destroy (rw), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rwlock_destroy (rw), result), int); # endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ # else /* NT, POSIX, and VxWorks don't support this natively. */ ACE_OS::mutex_destroy (&rw->lock_); @@ -1404,7 +1404,7 @@ ACE_OS::rwlock_init (ACE_rwlock_t *rw, type = type; name = name; int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rwlock_init (rw, type, arg), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rwlock_init (rw, type, arg), result), int); # endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ } #endif /* ACE_HAS_THREADS && !defined (ACE_LACKS_RWLOCK_T) */ @@ -1425,7 +1425,7 @@ ACE_OS::sema_destroy (ACE_sema_t *s) // Only destroy the semaphore if we're the ones who // initialized it. # if !defined (ACE_LACKS_SEM_DESTROY) - ACE_OSCALL (::sem_destroy (s->sema_),int, -1, result); + ACE_OSCALL (::sem_destroy (s->sema_),int, result); # endif /* ACE_LACKS_SEM_DESTROY */ ACE_OS::shm_unlink (s->name_); delete s->name_; @@ -1441,13 +1441,13 @@ ACE_OS::sema_destroy (ACE_sema_t *s) #else ACE_OS::free ((void *) s->name_); #endif /* ACE_HAS_ALLOC_HOOKS */ - ACE_OSCALL_RETURN (::sem_close (s->sema_), int, -1); + ACE_OSCALL_RETURN (::sem_close (s->sema_), int); } # endif /* ACE_LACKS_NAMED_POSIX_SEM */ else { # if !defined (ACE_LACKS_UNNAMED_SEMAPHORE) && !defined (ACE_LACKS_SEM_DESTROY) - ACE_OSCALL (::sem_destroy (s->sema_), int, -1, result); + ACE_OSCALL (::sem_destroy (s->sema_), int, result); # endif /* !ACE_LACKS_UNNAMED_SEMAPHORE && !ACE_LACKS_SEM_DESTROY */ # if defined (ACE_LACKS_NAMED_POSIX_SEM) if (s->new_sema_) @@ -1478,7 +1478,7 @@ ACE_OS::sema_destroy (ACE_sema_t *s) #elif defined (ACE_HAS_THREADS) # if defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_destroy (s), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_destroy (s), result), int); # elif defined (ACE_HAS_PTHREADS) int r1 = ACE_OS::mutex_destroy (&s->lock_); int r2 = ACE_OS::cond_destroy (&s->count_nonzero_); @@ -1494,7 +1494,7 @@ ACE_OS::sema_destroy (ACE_sema_t *s) # endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # elif defined (ACE_VXWORKS) int result; - ACE_OSCALL (::semDelete (s->sema_), int, -1, result); + ACE_OSCALL (::semDelete (s->sema_), int, result); s->sema_ = 0; return result; # endif /* ACE_HAS_STHREADS */ @@ -1669,7 +1669,7 @@ ACE_OS::sema_init (ACE_sema_t *s, ACE_OS::memset(s->sema_, 0, sizeof(*s->sema_)); ACE_OSCALL_RETURN (::sem_init (s->sema_, type != USYNC_THREAD, - count), int, -1); + count), int); # endif /* ACE_LACKS_UNNAMED_SEMAPHORE */ } @@ -1766,7 +1766,7 @@ ACE_OS::sema_init (ACE_sema_t *s, ACE_UNUSED_ARG (attributes); int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_init (s, count, type, arg), result), - int, -1); + int); # elif defined (ACE_HAS_PTHREADS) ACE_UNUSED_ARG (max); ACE_UNUSED_ARG (sa); @@ -1977,7 +1977,7 @@ ACE_INLINE int ACE_OS::sema_unlink (const char *name) { #if defined (ACE_HAS_POSIX_SEM) && !defined (ACE_LACKS_SEM_UNLINK) - ACE_OSCALL_RETURN (::sem_unlink (name), int, -1); + ACE_OSCALL_RETURN (::sem_unlink (name), int); #else ACE_UNUSED_ARG (name); ACE_NOTSUP_RETURN (-1); @@ -1990,7 +1990,7 @@ ACE_OS::sema_post (ACE_sema_t *s) ACE_OS_TRACE ("ACE_OS::sema_post"); # if defined (ACE_HAS_POSIX_SEM) # if defined (ACE_HAS_POSIX_SEM_TIMEOUT) || defined (ACE_DISABLE_POSIX_SEM_TIMEOUT_EMULATION) - ACE_OSCALL_RETURN (::sem_post (s->sema_), int, -1); + ACE_OSCALL_RETURN (::sem_post (s->sema_), int); # else int result = -1; @@ -2011,7 +2011,7 @@ ACE_OS::sema_post (ACE_sema_t *s) # elif defined (ACE_HAS_THREADS) # if defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_post (s), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_post (s), result), int); # elif defined (ACE_HAS_PTHREADS) int result = -1; @@ -2052,7 +2052,7 @@ ACE_OS::sema_post (ACE_sema_t *s) return result; # endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # elif defined (ACE_VXWORKS) - ACE_OSCALL_RETURN (::semGive (s->sema_), int, -1); + ACE_OSCALL_RETURN (::semGive (s->sema_), int); # endif /* ACE_HAS_STHREADS */ # else ACE_UNUSED_ARG (s); @@ -2089,7 +2089,7 @@ ACE_OS::sema_trywait (ACE_sema_t *s) ACE_OS_TRACE ("ACE_OS::sema_trywait"); # if defined (ACE_HAS_POSIX_SEM) // POSIX semaphores set errno to EAGAIN if trywait fails - ACE_OSCALL_RETURN (::sem_trywait (s->sema_), int, -1); + ACE_OSCALL_RETURN (::sem_trywait (s->sema_), int); # elif defined (ACE_USES_FIFO_SEM) char c; int rc, flags; @@ -2118,7 +2118,7 @@ ACE_OS::sema_trywait (ACE_sema_t *s) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_trywait (s), result), - int, -1); + int); # elif defined (ACE_HAS_PTHREADS) int result = -1; @@ -2212,7 +2212,7 @@ ACE_OS::sema_wait (ACE_sema_t *s) { ACE_OS_TRACE ("ACE_OS::sema_wait"); # if defined (ACE_HAS_POSIX_SEM) - ACE_OSCALL_RETURN (::sem_wait (s->sema_), int, -1); + ACE_OSCALL_RETURN (::sem_wait (s->sema_), int); # elif defined (ACE_USES_FIFO_SEM) char c; if (ACE_OS::read (s->fd_[0], &c, sizeof (char)) == 1) @@ -2221,7 +2221,7 @@ ACE_OS::sema_wait (ACE_sema_t *s) # elif defined (ACE_HAS_THREADS) # if defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_wait (s), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_wait (s), result), int); # elif defined (ACE_HAS_PTHREADS) int result = 0; @@ -2308,7 +2308,7 @@ ACE_OS::sema_wait (ACE_sema_t *s) /* NOTREACHED */ # endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # elif defined (ACE_VXWORKS) - ACE_OSCALL_RETURN (::semTake (s->sema_, WAIT_FOREVER), int, -1); + ACE_OSCALL_RETURN (::semTake (s->sema_, WAIT_FOREVER), int); # endif /* ACE_HAS_STHREADS */ # else ACE_UNUSED_ARG (s); @@ -2325,7 +2325,7 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv) int rc; timespec_t ts; ts = tv; // Calls ACE_Time_Value::operator timespec_t(). - ACE_OSCALL (::sem_timedwait (s->sema_, &ts), int, -1, rc); + ACE_OSCALL (::sem_timedwait (s->sema_, &ts), int, rc); if (rc == -1 && errno == ETIMEDOUT) errno = ETIME; /* POSIX returns ETIMEDOUT but we need ETIME */ return rc; @@ -2609,7 +2609,7 @@ ACE_OS::semctl (int int_id, int semnum, int cmd, semun value) { ACE_OS_TRACE ("ACE_OS::semctl"); #if defined (ACE_HAS_SYSV_IPC) - ACE_OSCALL_RETURN (::semctl (int_id, semnum, cmd, value), int, -1); + ACE_OSCALL_RETURN (::semctl (int_id, semnum, cmd, value), int); #else ACE_UNUSED_ARG (int_id); ACE_UNUSED_ARG (semnum); @@ -2625,7 +2625,7 @@ ACE_OS::semget (key_t key, int nsems, int flags) { ACE_OS_TRACE ("ACE_OS::semget"); #if defined (ACE_HAS_SYSV_IPC) - ACE_OSCALL_RETURN (::semget (key, nsems, flags), int, -1); + ACE_OSCALL_RETURN (::semget (key, nsems, flags), int); #else ACE_UNUSED_ARG (key); ACE_UNUSED_ARG (nsems); @@ -2640,7 +2640,7 @@ ACE_OS::semop (int int_id, struct sembuf *sops, size_t nsops) { ACE_OS_TRACE ("ACE_OS::semop"); #if defined (ACE_HAS_SYSV_IPC) - ACE_OSCALL_RETURN (::semop (int_id, sops, nsops), int, -1); + ACE_OSCALL_RETURN (::semop (int_id, sops, nsops), int); #else ACE_UNUSED_ARG (int_id); ACE_UNUSED_ARG (sops); @@ -2667,7 +2667,7 @@ ACE_OS::sigtimedwait (const sigset_t *sset, } ACE_OSCALL_RETURN (::sigtimedwait (sset, info, tsp), - int, -1); + int); #else ACE_UNUSED_ARG (sset); ACE_UNUSED_ARG (info); @@ -2730,7 +2730,7 @@ ACE_OS::sigwaitinfo (const sigset_t *sset, // If this isn't true somewhere, let me know and I'll fix this. // -Steve Huston <shuston@riverace.com>. #if defined (ACE_HAS_SIGTIMEDWAIT) - ACE_OSCALL_RETURN (::sigwaitinfo (sset, info), int, -1); + ACE_OSCALL_RETURN (::sigwaitinfo (sset, info), int); #else ACE_UNUSED_ARG (sset); ACE_UNUSED_ARG (info); @@ -2747,9 +2747,9 @@ ACE_OS::thr_cancel (ACE_thread_t thr_id) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cancel (thr_id), result), - int, -1); + int); # elif defined (ACE_HAS_VXTHREADS) - ACE_OSCALL_RETURN (::taskDelete (thr_id), int, -1); + ACE_OSCALL_RETURN (::taskDelete (thr_id), int); # else /* Could be ACE_HAS_PTHREADS && ACE_LACKS_PTHREAD_CANCEL */ ACE_UNUSED_ARG (thr_id); ACE_NOTSUP_RETURN (-1); @@ -2784,23 +2784,23 @@ ACE_OS::thr_continue (ACE_hthread_t target_thread) #if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_continue (target_thread), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_continue (target_thread), result), int); # elif defined (ACE_HAS_PTHREADS) # if defined (ACE_HAS_PTHREAD_CONTINUE) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_continue (target_thread), result), - int, -1); + int); # elif defined (ACE_HAS_PTHREAD_CONTINUE_NP) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_continue_np (target_thread), result), - int, -1); + int); # elif defined (ACE_HAS_PTHREAD_RESUME_NP) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_resume_np (target_thread), result), - int, -1); + int); # else ACE_UNUSED_ARG (target_thread); ACE_NOTSUP_RETURN (-1); @@ -2812,7 +2812,7 @@ ACE_OS::thr_continue (ACE_hthread_t target_thread) else return 0; # elif defined (ACE_HAS_VXTHREADS) - ACE_OSCALL_RETURN (::taskResume (target_thread), int, -1); + ACE_OSCALL_RETURN (::taskResume (target_thread), int); # endif /* ACE_HAS_STHREADS */ #else ACE_UNUSED_ARG (target_thread); @@ -2851,12 +2851,12 @@ ACE_OS::thr_getprio (ACE_hthread_t ht_id, int &priority, int &policy) ACE_OSCALL (ACE_ADAPT_RETVAL (pthread_getschedparam (ht_id, &policy, ¶m), result), int, - -1, result); + result); priority = param.sched_priority; return result; # elif defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_getprio (ht_id, &priority), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_getprio (ht_id, &priority), result), int); # elif defined (ACE_HAS_WTHREADS) ACE_Errno_Guard error (errno); @@ -2885,7 +2885,7 @@ ACE_OS::thr_getprio (ACE_hthread_t ht_id, int &priority, int &policy) return 0; # elif defined (ACE_HAS_VXTHREADS) - ACE_OSCALL_RETURN (::taskPriorityGet (ht_id, &priority), int, -1); + ACE_OSCALL_RETURN (::taskPriorityGet (ht_id, &priority), int); # else ACE_UNUSED_ARG (ht_id); ACE_UNUSED_ARG (priority); @@ -2916,7 +2916,7 @@ ACE_OS::thr_getspecific_native (ACE_OS_thread_key_t key, void **data) return 0; # elif defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_getspecific (key, data), result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_getspecific (key, data), result), int); # elif defined (ACE_HAS_WTHREADS) *data = ::TlsGetValue (key); if (*data == 0 && ::GetLastError () != NO_ERROR) @@ -2975,7 +2975,7 @@ ACE_OS::thr_join (ACE_hthread_t thr_handle, # if defined (ACE_HAS_STHREADS) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_join (thr_handle, 0, status), result), - int, -1); + int); # elif defined (ACE_HAS_PTHREADS) # if defined (ACE_LACKS_PTHREAD_JOIN) ACE_UNUSED_ARG (thr_handle); @@ -2984,7 +2984,7 @@ ACE_OS::thr_join (ACE_hthread_t thr_handle, # else int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_join (thr_handle, status), result), - int, -1); + int); # endif /* ACE_LACKS_PTHREAD_JOIN */ # elif defined (ACE_HAS_WTHREADS) // Waiting on the calling thread will deadlock, so try to avoid that. The @@ -3039,7 +3039,7 @@ ACE_OS::thr_join (ACE_thread_t waiter_id, # if defined (ACE_HAS_STHREADS) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_join (waiter_id, thr_id, status), result), - int, -1); + int); # elif defined (ACE_HAS_PTHREADS) # if defined (ACE_LACKS_PTHREAD_JOIN) ACE_UNUSED_ARG (waiter_id); @@ -3050,7 +3050,7 @@ ACE_OS::thr_join (ACE_thread_t waiter_id, ACE_UNUSED_ARG (thr_id); int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_join (waiter_id, status), result), - int, -1); + int); # endif /* ACE_LACKS_PTHREAD_JOIN */ # elif defined (ACE_HAS_WTHREADS) ACE_UNUSED_ARG (waiter_id); @@ -3084,16 +3084,16 @@ ACE_OS::thr_kill (ACE_thread_t thr_id, int signum) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_kill (thr_id, signum), result), - int, -1); + int); # endif /* ACE_LACKS_PTHREAD_KILL */ # elif defined (ACE_HAS_STHREADS) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_kill (thr_id, signum), result), - int, -1); + int); # elif defined (ACE_HAS_VXTHREADS) //FUZZ: disable check_for_lack_ACE_OS - ACE_OSCALL_RETURN (::kill (thr_id, signum), int, -1); + ACE_OSCALL_RETURN (::kill (thr_id, signum), int); //FUZZ: enable check_for_lack_ACE_OS # else ACE_UNUSED_ARG (thr_id); @@ -3137,7 +3137,7 @@ ACE_OS::thr_min_stack () ACE_OSCALL (ACE_ADAPT_RETVAL (::taskInfoGet (tid, &taskDesc), status), - STATUS, -1, status); + STATUS, status); return status == OK ? taskDesc.td_stackSize : 0; # else /* Should not happen... */ ACE_NOTSUP_RETURN (0); @@ -3198,7 +3198,7 @@ ACE_OS::thr_self () // Note, don't use "::" here since the following call is often a macro. return pthread_self (); # elif defined (ACE_HAS_STHREADS) - ACE_OSCALL_RETURN (::thr_self (), int, -1); + ACE_OSCALL_RETURN (::thr_self (), int); # elif defined (ACE_HAS_WTHREADS) return ::GetCurrentThreadId (); # elif defined (ACE_HAS_VXTHREADS) @@ -3268,7 +3268,7 @@ ACE_OS::thr_setcancelstate (int new_state, int *old_state) ACE_OSCALL (ACE_ADAPT_RETVAL (pthread_setcancelstate (local_new, &local_old), result), - int, -1, result); + int, result); if (result == -1) return -1; switch (local_old) @@ -3324,7 +3324,7 @@ ACE_OS::thr_setcanceltype (int new_type, int *old_type) ACE_OSCALL (ACE_ADAPT_RETVAL (pthread_setcanceltype (local_new, &local_old), result), - int, -1, result); + int, result); if (result == -1) return -1; switch (local_old) @@ -3358,12 +3358,10 @@ ACE_OS::thr_setconcurrency (int hint) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_setconcurrency (hint), result), - int, -1); + int); # elif defined (ACE_HAS_PTHREADS) && defined (ACE_HAS_PTHREAD_SETCONCURRENCY) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_setconcurrency (hint), - result), - int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_setconcurrency (hint), result), int); # else ACE_UNUSED_ARG (hint); ACE_NOTSUP_RETURN (-1); @@ -3392,9 +3390,7 @@ ACE_OS::thr_setprio (ACE_hthread_t ht_id, int priority, int policy) // pthread_getschedparam(). if (policy == -1) { - ACE_OSCALL (ACE_ADAPT_RETVAL (pthread_getschedparam (ht_id, &policy, ¶m), - result), - int, -1, result); + ACE_OSCALL (ACE_ADAPT_RETVAL (pthread_getschedparam (ht_id, &policy, ¶m), result), int, result); if (result == -1) return result; } @@ -3405,12 +3401,10 @@ ACE_OS::thr_setprio (ACE_hthread_t ht_id, int priority, int policy) policy, ¶m), result), - int, -1); + int); # elif defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_setprio (ht_id, priority), - result), - int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_setprio (ht_id, priority), result), int); # elif defined (ACE_HAS_WTHREADS) # if defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_CE_THREAD_PRIORITY) @@ -3424,7 +3418,7 @@ ACE_OS::thr_setprio (ACE_hthread_t ht_id, int priority, int policy) # endif /* defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_CE_THREAD_PRIORITY) */ # elif defined (ACE_HAS_VXTHREADS) - ACE_OSCALL_RETURN (::taskPrioritySet (ht_id, priority), int, -1); + ACE_OSCALL_RETURN (::taskPrioritySet (ht_id, priority), int); # else // For example, platforms that support Pthreads but LACK_SETSCHED. ACE_UNUSED_ARG (ht_id); @@ -3454,28 +3448,19 @@ ACE_OS::thr_sigsetmask (int how, ACE_NOTSUP_RETURN (-1); # elif defined (ACE_HAS_SIGTHREADMASK) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sigthreadmask (how, nsm, osm), - result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sigthreadmask (how, nsm, osm), result), int); # elif defined (ACE_HAS_STHREADS) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_sigsetmask (how, nsm, osm), - result), - int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_sigsetmask (how, nsm, osm), result), int); # elif defined (ACE_HAS_PTHREADS) # if !defined (ACE_LACKS_PTHREAD_SIGMASK) int result; //FUZZ: disable check_for_lack_ACE_OS # if defined (ACE_HAS_NONCONST_PTHREAD_SIGMASK) sigset_t *ncnsm = const_cast<sigset_t *>(nsm); - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_sigmask (how, ncnsm, osm), - result), - int, - -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_sigmask (how, ncnsm, osm), result), int); # else - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_sigmask (how, nsm, osm), - result), - int, - -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_sigmask (how, nsm, osm), result), int); # endif /* ACE_HAS_NONCONST__PTHREAD_SIGMASK */ //FUZZ: enable check_for_lack_ACE_OS # endif /* !ACE_LACKS_PTHREAD_SIGMASK */ @@ -3537,14 +3522,10 @@ ACE_OS::thr_suspend (ACE_hthread_t target_thread) # elif defined (ACE_HAS_PTHREADS) # if defined (ACE_HAS_PTHREAD_SUSPEND) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_suspend (target_thread), - result), - int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_suspend (target_thread), result), int); # elif defined (ACE_HAS_PTHREAD_SUSPEND_NP) int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_suspend_np (target_thread), - result), - int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_suspend_np (target_thread), result), int); # else ACE_UNUSED_ARG (target_thread); ACE_NOTSUP_RETURN (-1); @@ -3556,7 +3537,7 @@ ACE_OS::thr_suspend (ACE_hthread_t target_thread) ACE_FAIL_RETURN (-1); /* NOTREACHED */ # elif defined (ACE_HAS_VXTHREADS) - ACE_OSCALL_RETURN (::taskSuspend (target_thread), int, -1); + ACE_OSCALL_RETURN (::taskSuspend (target_thread), int); # endif /* ACE_HAS_STHREADS */ #else ACE_UNUSED_ARG (target_thread); diff --git a/ACE/ace/OS_NS_arpa_inet.cpp b/ACE/ace/OS_NS_arpa_inet.cpp index 0cc14c302b8..3bc402160b3 100644 --- a/ACE/ace/OS_NS_arpa_inet.cpp +++ b/ACE/ace/OS_NS_arpa_inet.cpp @@ -90,12 +90,12 @@ ACE_OS::inet_aton (const char *host_name, struct in_addr *addr) // Must reset errno first. Refer to WindRiver SPR# 34949, SPR# 36026 ::errnoSet(0); int result = ERROR; - ACE_OSCALL (::inet_aton (const_cast <char*>(host_name), addr), int, ERROR, result); + ACE_OSCALL (::inet_aton (const_cast <char*>(host_name), addr), int, result); return (result == ERROR) ? 0 : 1; #else // inet_aton() returns 0 upon failure, not -1 since -1 is a valid // address (255.255.255.255). - ACE_OSCALL_RETURN (::inet_aton (host_name, addr), int, 0); + ACE_OSCALL_RETURN (::inet_aton (host_name, addr), int); #endif /* ACE_LACKS_INET_ATON */ } diff --git a/ACE/ace/OS_NS_arpa_inet.inl b/ACE/ace/OS_NS_arpa_inet.inl index 3860140cbbb..59d92c15e09 100644 --- a/ACE/ace/OS_NS_arpa_inet.inl +++ b/ACE/ace/OS_NS_arpa_inet.inl @@ -27,7 +27,7 @@ ACE_OS::inet_ntoa (const struct in_addr addr) ACE_UNUSED_ARG (addr); ACE_NOTSUP_RETURN (0); #else - ACE_OSCALL_RETURN (::inet_ntoa (addr), char *, 0); + ACE_OSCALL_RETURN (::inet_ntoa (addr), char *); #endif } @@ -38,9 +38,9 @@ ACE_OS::inet_ntop (int family, const void *addrptr, char *strptr, size_t len) #if defined ACE_HAS_IPV6 && !defined ACE_LACKS_INET_NTOP # if defined (ACE_HAS_NONCONST_INET_NTOP) - ACE_OSCALL_RETURN (::inet_ntop (family, const_cast<void *> (addrptr), strptr, len), const char *, 0); + ACE_OSCALL_RETURN (::inet_ntop (family, const_cast<void *> (addrptr), strptr, len), const char *); # else - ACE_OSCALL_RETURN (::inet_ntop (family, addrptr, strptr, len), const char *, 0); + ACE_OSCALL_RETURN (::inet_ntop (family, addrptr, strptr, len), const char *); # endif #else @@ -67,7 +67,7 @@ ACE_OS::inet_pton (int family, const char *strptr, void *addrptr) ACE_OS_TRACE ("ACE_OS::inet_pton"); #if defined ACE_HAS_IPV6 && !defined ACE_LACKS_INET_PTON - ACE_OSCALL_RETURN (::inet_pton (family, strptr, addrptr), int, -1); + ACE_OSCALL_RETURN (::inet_pton (family, strptr, addrptr), int); #else if (family == AF_INET) diff --git a/ACE/ace/OS_NS_devctl.inl b/ACE/ace/OS_NS_devctl.inl index d151005c006..6f44f98aa6e 100644 --- a/ACE/ace/OS_NS_devctl.inl +++ b/ACE/ace/OS_NS_devctl.inl @@ -16,7 +16,7 @@ ACE_OS::posix_devctl (int filedes, int dcmd, ACE_UNUSED_ARG (nbyte); ACE_UNUSED_ARG (dev_info_ptr); # if defined ACE_EMULATE_POSIX_DEVCTL && ACE_EMULATE_POSIX_DEVCTL - ACE_OSCALL_RETURN (::ioctl (filedes, dcmd, dev_data_ptr), int, -1); + ACE_OSCALL_RETURN (::ioctl (filedes, dcmd, dev_data_ptr), int); # else ACE_UNUSED_ARG (filedes); ACE_UNUSED_ARG (dcmd); @@ -24,8 +24,7 @@ ACE_OS::posix_devctl (int filedes, int dcmd, ACE_NOTSUP_RETURN (-1); # endif #else - ACE_OSCALL_RETURN (::posix_devctl (filedes, dcmd, dev_data_ptr, nbyte, - dev_info_ptr), int, -1); + ACE_OSCALL_RETURN (::posix_devctl (filedes, dcmd, dev_data_ptr, nbyte, dev_info_ptr), int); #endif } diff --git a/ACE/ace/OS_NS_dlfcn.inl b/ACE/ace/OS_NS_dlfcn.inl index 6f804c67679..86628f8d725 100644 --- a/ACE/ace/OS_NS_dlfcn.inl +++ b/ACE/ace/OS_NS_dlfcn.inl @@ -32,12 +32,12 @@ ACE_OS::dlclose (ACE_SHLIB_HANDLE handle) // SunOS4 does not automatically call _fini()! void *ptr; - ACE_OSCALL (::dlsym (handle, ACE_TEXT ("_fini")), void *, 0, ptr); + ACE_OSCALL (::dlsym (handle, ACE_TEXT ("_fini")), void *, ptr); if (ptr != 0) (*((int (*)(void)) ptr)) (); // Call _fini hook explicitly. # endif /* ACE_HAS_AUTOMATIC_INIT_FINI */ - ACE_OSCALL_RETURN (::dlclose (handle), int, -1); + ACE_OSCALL_RETURN (::dlclose (handle), int); #elif defined (ACE_WIN32) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::FreeLibrary (handle), ace_result_), int, -1); #elif defined (__hpux) @@ -55,7 +55,7 @@ ACE_OS::dlclose (ACE_SHLIB_HANDLE handle) return -1; if (desc.ref_count > 1) return 0; - ACE_OSCALL_RETURN (::shl_unload (handle), int, -1); + ACE_OSCALL_RETURN (::shl_unload (handle), int); #else ACE_UNUSED_ARG (handle); ACE_NOTSUP_RETURN (-1); @@ -68,7 +68,7 @@ ACE_OS::dlerror () ACE_OS_TRACE ("ACE_OS::dlerror"); # if defined (ACE_HAS_SVR4_DYNAMIC_LINKING) const char *err = 0; - ACE_OSCALL (::dlerror (), const char *, 0, err); + ACE_OSCALL (::dlerror (), const char *, err); if (err == 0) return 0; # if defined (ACE_USES_WCHAR) @@ -81,7 +81,7 @@ ACE_OS::dlerror () # endif /* ACE_USES_WCHAR */ # elif defined (__hpux) || defined (ACE_VXWORKS) //FUZZ: disable check_for_lack_ACE_OS - ACE_OSCALL_RETURN (::strerror(errno), char *, 0); + ACE_OSCALL_RETURN (::strerror(errno), char *); //FUZZ: enable check_for_lack_ACE_OS # elif defined (ACE_WIN32) static ACE_TCHAR buf[128]; @@ -110,7 +110,7 @@ ACE_OS::dlopen (const ACE_TCHAR *fname, # if defined (ACE_HAS_SVR4_DYNAMIC_LINKING) void *handle; - ACE_OSCALL (::dlopen (ACE_TEXT_ALWAYS_CHAR (fname), mode), void *, 0, handle); + ACE_OSCALL (::dlopen (ACE_TEXT_ALWAYS_CHAR (fname), mode), void *, handle); # if !defined (ACE_HAS_AUTOMATIC_INIT_FINI) if (handle != 0) { @@ -118,7 +118,7 @@ ACE_OS::dlopen (const ACE_TCHAR *fname, // Some systems (e.g., SunOS4) do not automatically call _init(), so // we'll have to call it manually. - ACE_OSCALL (::dlsym (handle, ACE_TEXT ("_init")), void *, 0, ptr); + ACE_OSCALL (::dlsym (handle, ACE_TEXT ("_init")), void *, ptr); if (ptr != 0 && (*((int (*)(void)) ptr)) () == -1) // Call _init hook explicitly. { @@ -134,7 +134,7 @@ ACE_OS::dlopen (const ACE_TCHAR *fname, ACE_WIN32CALL_RETURN (ACE_TEXT_LoadLibrary (fname), ACE_SHLIB_HANDLE, 0); # elif defined (__hpux) - ACE_OSCALL_RETURN (::shl_load(fname, mode, 0L), ACE_SHLIB_HANDLE, 0); + ACE_OSCALL_RETURN (::shl_load(fname, mode, 0L), ACE_SHLIB_HANDLE); # elif defined (ACE_VXWORKS) && !defined (__RTP__) ACE_UNUSED_ARG (mode); MODULE* handle = 0; @@ -146,7 +146,7 @@ ACE_OS::dlopen (const ACE_TCHAR *fname, if (filehandle != ACE_INVALID_HANDLE) { ACE_OS::last_error(0); - ACE_OSCALL ( ::loadModule (filehandle, LOAD_GLOBAL_SYMBOLS|LOAD_COMMON_MATCH_ALL ), MODULE *, 0, handle); + ACE_OSCALL ( ::loadModule (filehandle, LOAD_GLOBAL_SYMBOLS|LOAD_COMMON_MATCH_ALL ), MODULE *, handle); int loaderror = ACE_OS::last_error(); ACE_OS::close (filehandle); @@ -213,11 +213,11 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle, ACE_OS::strcpy (asm_symbolname, "_") ; ACE_OS::strcpy (asm_symbolname + 1, symbolname) ; void *ace_result; - ACE_OSCALL (::dlsym (handle, asm_symbolname), void *, 0, ace_result); + ACE_OSCALL (::dlsym (handle, asm_symbolname), void *, ace_result); delete [] asm_symbolname; return ace_result; # else - ACE_OSCALL_RETURN (::dlsym (handle, symbolname), void *, 0); + ACE_OSCALL_RETURN (::dlsym (handle, symbolname), void *); # endif /* ACE_USES_ASM_SYMBOL_IN_DLSYM */ # elif defined (ACE_WIN32) @@ -229,7 +229,7 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle, void *value = 0; int status; shl_t _handle = handle; - ACE_OSCALL (::shl_findsym(&_handle, symbolname, TYPE_UNDEFINED, &value), int, -1, status); + ACE_OSCALL (::shl_findsym(&_handle, symbolname, TYPE_UNDEFINED, &value), int, status); return status == 0 ? value : 0; # elif defined (ACE_VXWORKS) && !defined (__RTP__) @@ -242,7 +242,7 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle, SYM_TYPE symtype; char *value = 0; STATUS status; - ACE_OSCALL (::symFindByName(sysSymTbl, symbolname, &value, &symtype), int, -1, status); + ACE_OSCALL (::symFindByName(sysSymTbl, symbolname, &value, &symtype), int, status); return status == OK ? reinterpret_cast <void*>(value) : 0; #else @@ -253,7 +253,7 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle, symbolDesc.mask = SYM_FIND_BY_NAME; symbolDesc.name = symbolname; - ACE_OSCALL (::symFind(sysSymTbl, &symbolDesc), int, -1, status); + ACE_OSCALL (::symFind(sysSymTbl, &symbolDesc), int, status); return status == OK ? reinterpret_cast <void*>(symbolDesc.value) : 0; #endif /* (ACE_VXWORKS < 0x690) */ diff --git a/ACE/ace/OS_NS_fcntl.cpp b/ACE/ace/OS_NS_fcntl.cpp index d530a27ecc8..d16a28a642c 100644 --- a/ACE/ace/OS_NS_fcntl.cpp +++ b/ACE/ace/OS_NS_fcntl.cpp @@ -120,10 +120,10 @@ ACE_OS::open (const char *filename, #elif defined (INTEGRITY) ACE_UNUSED_ARG (sa); if(!strcmp(filename,ACE_DEV_NULL)) { - ACE_OSCALL_RETURN (::AllocateNullConsoleDescriptor(), ACE_HANDLE, -1); + ACE_OSCALL_RETURN (::AllocateNullConsoleDescriptor(), ACE_HANDLE); } else { - ACE_OSCALL_RETURN (::open (filename, mode, perms), ACE_HANDLE, -1); + ACE_OSCALL_RETURN (::open (filename, mode, perms), ACE_HANDLE); } #elif defined (ACE_MQX) ACE_UNUSED_ARG (perms); @@ -131,7 +131,7 @@ ACE_OS::open (const char *filename, return MQX_Filesystem::inst ().open (filename, mode); #else ACE_UNUSED_ARG (sa); - ACE_OSCALL_RETURN (::open (filename, mode, perms), ACE_HANDLE, ACE_INVALID_HANDLE); + ACE_OSCALL_RETURN (::open (filename, mode, perms), ACE_HANDLE); #endif /* ACE_WIN32 */ } diff --git a/ACE/ace/OS_NS_fcntl.inl b/ACE/ace/OS_NS_fcntl.inl index afb95c68428..c4229948e32 100644 --- a/ACE/ace/OS_NS_fcntl.inl +++ b/ACE/ace/OS_NS_fcntl.inl @@ -13,7 +13,7 @@ ACE_OS::fcntl (ACE_HANDLE handle, int cmd, long arg) ACE_UNUSED_ARG (arg); ACE_NOTSUP_RETURN (-1); # else - ACE_OSCALL_RETURN (::fcntl (handle, cmd, arg), int, -1); + ACE_OSCALL_RETURN (::fcntl (handle, cmd, arg), int); # endif /* ACE_LACKS_FCNTL */ } diff --git a/ACE/ace/OS_NS_macros.h b/ACE/ace/OS_NS_macros.h index 0714f574f7c..e901019ddb0 100644 --- a/ACE/ace/OS_NS_macros.h +++ b/ACE/ace/OS_NS_macros.h @@ -31,8 +31,8 @@ if (RESULT == FAILVALUE) { int ___ = ::WSAGetLastError (); errno = ___; RESULT = FAILVALUE; } \ } while (0) #else -# define ACE_SOCKCALL_RETURN(OP,TYPE,FAILVALUE) ACE_OSCALL_RETURN(OP,TYPE,FAILVALUE) -# define ACE_SOCKCALL(OP,TYPE,FAILVALUE,RESULT) ACE_OSCALL(OP,TYPE,FAILVALUE,RESULT) +# define ACE_SOCKCALL_RETURN(OP,TYPE,FAILVALUE) ACE_OSCALL_RETURN(OP,TYPE) +# define ACE_SOCKCALL(OP,TYPE,FAILVALUE,RESULT) ACE_OSCALL(OP,TYPE,RESULT) #endif /* ACE_WIN32 */ #if !defined (ACE_WIN32) diff --git a/ACE/ace/OS_NS_netdb.inl b/ACE/ace/OS_NS_netdb.inl index 5f4e4c258e9..ad67751c875 100644 --- a/ACE/ace/OS_NS_netdb.inl +++ b/ACE/ace/OS_NS_netdb.inl @@ -13,7 +13,7 @@ else \ { \ TYPE ace_result_; \ - ACE_OSCALL (OP, TYPE, FAILVALUE, ace_result_); \ + ACE_OSCALL (OP, TYPE, ace_result_); \ if (ace_result_ != FAILVALUE) \ ACE_OS::memcpy (TARGET, \ ace_result_, \ @@ -27,7 +27,7 @@ do \ { \ TYPE ace_result_; \ - ACE_OSCALL(OP,TYPE,FAILVALUE,ace_result_); \ + ACE_OSCALL(OP,TYPE,ace_result_); \ if (ace_result_ != FAILVALUE) \ ACE_OS::memcpy (TARGET, \ ace_result_, \ diff --git a/ACE/ace/OS_NS_poll.inl b/ACE/ace/OS_NS_poll.inl index 511c71948c3..950cacf9bdd 100644 --- a/ACE/ace/OS_NS_poll.inl +++ b/ACE/ace/OS_NS_poll.inl @@ -12,7 +12,7 @@ ACE_OS::poll (struct pollfd *pollfds, ACE_OS_TRACE ("ACE_OS::poll"); #if defined (ACE_HAS_POLL) int to = timeout == 0 ? -1 : int (timeout->msec ()); - ACE_OSCALL_RETURN (::poll (pollfds, len, to), int, -1); + ACE_OSCALL_RETURN (::poll (pollfds, len, to), int); #else ACE_UNUSED_ARG (timeout); ACE_UNUSED_ARG (len); @@ -29,7 +29,7 @@ ACE_OS::poll (struct pollfd *pollfds, { ACE_OS_TRACE ("ACE_OS::poll"); #if defined (ACE_HAS_POLL) - ACE_OSCALL_RETURN (::poll (pollfds, len, int (timeout.msec ())), int, -1); + ACE_OSCALL_RETURN (::poll (pollfds, len, int (timeout.msec ())), int); #else ACE_UNUSED_ARG (timeout); ACE_UNUSED_ARG (len); diff --git a/ACE/ace/OS_NS_regex.inl b/ACE/ace/OS_NS_regex.inl index e135051c762..9b760feb865 100644 --- a/ACE/ace/OS_NS_regex.inl +++ b/ACE/ace/OS_NS_regex.inl @@ -9,7 +9,7 @@ ACE_OS::compile (const char *instring, char *expbuf, char *endbuf) { ACE_OS_TRACE ("ACE_OS::compile"); #if defined (ACE_HAS_REGEX) - ACE_OSCALL_RETURN (::compile (instring, expbuf, endbuf), char *, 0); + ACE_OSCALL_RETURN (::compile (instring, expbuf, endbuf), char *); #else ACE_UNUSED_ARG (instring); ACE_UNUSED_ARG (expbuf); @@ -24,7 +24,7 @@ ACE_OS::step (const char *str, char *expbuf) { ACE_OS_TRACE ("ACE_OS::step"); #if defined (ACE_HAS_REGEX) - ACE_OSCALL_RETURN (::step (str, expbuf), int, -1); + ACE_OSCALL_RETURN (::step (str, expbuf), int); #else ACE_UNUSED_ARG (str); ACE_UNUSED_ARG (expbuf); diff --git a/ACE/ace/OS_NS_signal.inl b/ACE/ace/OS_NS_signal.inl index 1f74021742d..e469705fca2 100644 --- a/ACE/ace/OS_NS_signal.inl +++ b/ACE/ace/OS_NS_signal.inl @@ -23,9 +23,9 @@ kill (pid_t pid, int signum) * This only becomes an issue when using the 64bit compiler * as the TASK_ID is no longer defined as an int. */ - ACE_OSCALL_RETURN (::kill ((ACE_VX_TASK_ID)pid, signum), int, -1); + ACE_OSCALL_RETURN (::kill ((ACE_VX_TASK_ID)pid, signum), int); #else - ACE_OSCALL_RETURN (::kill (pid, signum), int, -1); + ACE_OSCALL_RETURN (::kill (pid, signum), int); #endif /* ACE_LACKS_KILL */ } @@ -35,19 +35,12 @@ pthread_sigmask (int how, const sigset_t *nsp, sigset_t *osp) #if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_SIGMASK) int result; # ifdef ACE_PTHREAD_SIGMASK_MACRO - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (ACE_PTHREAD_SIGMASK_MACRO (how, nsp, osp) - , result), int, -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (ACE_PTHREAD_SIGMASK_MACRO (how, nsp, osp), result), int); # elif defined (ACE_HAS_NONCONST_PTHREAD_SIGMASK) sigset_t *ncnsp = const_cast<sigset_t *>(nsp); - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_sigmask (how, ncnsp, osp), - result), - int, - -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_sigmask (how, ncnsp, osp), result), int); # else - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_sigmask (how, nsp, osp), - result), - int, - -1); + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_sigmask (how, nsp, osp), result), int); # endif /* ACE_HAS_NONCONST__PTHREAD_SIGMASK */ #else /* !ACE_HAS_PTHREADS && !ACE_LACKS_PTHREAD_SIGMASK */ ACE_UNUSED_ARG (how); @@ -85,9 +78,9 @@ sigaction (int signum, const ACE_SIGACTION *nsa, ACE_SIGACTION *osa) ACE_OSCALL_RETURN (::sigaction (signum, const_cast<ACE_SIGACTION*> (nsa), osa), - int, -1); + int); #else - ACE_OSCALL_RETURN (::sigaction (signum, nsa, osa), int, -1); + ACE_OSCALL_RETURN (::sigaction (signum, nsa, osa), int); #endif /* ACE_WIN32 !ACE_HAS_WINCE */ } @@ -219,7 +212,7 @@ sigprocmask (int how, const sigset_t *nsp, sigset_t *osp) ACE_UNUSED_ARG (osp); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::sigprocmask (how, nsp, osp), int, -1); + ACE_OSCALL_RETURN (::sigprocmask (how, nsp, osp), int); #endif /* ACE_LACKS_SIGSET || ACE_LACKS_SIGSET_DEFINITIONS || ACE_LACKS_SIGPROCMASK */ } @@ -248,7 +241,7 @@ raise (const int signum) ACE_UNUSED_ARG (signum); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::raise (signum), int, -1); + ACE_OSCALL_RETURN (::raise (signum), int); #endif /* ACE_LACKS_RAISE */ } diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl index f17002c630e..fb881296f87 100644 --- a/ACE/ace/OS_NS_stdio.inl +++ b/ACE/ace/OS_NS_stdio.inl @@ -110,10 +110,7 @@ ACE_OS::flock_init (ACE_OS::ace_flock_t *lock, if (name != 0) { - ACE_OSCALL (ACE_OS::open (name, flags, perms), - ACE_HANDLE, - ACE_INVALID_HANDLE, - lock->handle_); + ACE_OSCALL (ACE_OS::open (name, flags, perms), ACE_HANDLE, lock->handle_); if (lock->handle_ != ACE_INVALID_HANDLE) lock->lockname_ = ACE_OS::strdup (name); return lock->handle_ == ACE_INVALID_HANDLE ? -1 : 0; @@ -153,9 +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, -1); + ACE_OSCALL_RETURN (ACE_OS::fcntl (lock->handle_, F_SETLK, reinterpret_cast<long> (&lock->lock_)), int); #endif /* ACE_WIN32 */ } @@ -217,9 +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, -1); + ACE_OSCALL_RETURN (ACE_OS::fcntl (lock->handle_, F_SETLKW, reinterpret_cast<long> (&lock->lock_)), int); #endif /* ACE_WIN32 */ } @@ -258,7 +251,7 @@ ACE_OS::flock_tryrdlock (ACE_OS::ace_flock_t *lock, // Does not block, if no access, returns -1 and set errno = EBUSY; ACE_OSCALL (ACE_OS::fcntl (lock->handle_, F_SETLK, reinterpret_cast<long> (&lock->lock_)), - int, -1, result); + int, result); if (result == -1 && (errno == EACCES || errno == EAGAIN)) errno = EBUSY; @@ -303,7 +296,7 @@ ACE_OS::flock_trywrlock (ACE_OS::ace_flock_t *lock, ACE_OSCALL (ACE_OS::fcntl (lock->handle_, F_SETLK, reinterpret_cast<long> (&lock->lock_)), - int, -1, result); + int, result); if (result == -1 && (errno == EACCES || errno == EAGAIN)) errno = EBUSY; @@ -343,9 +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, -1); + ACE_OSCALL_RETURN (ACE_OS::fcntl (lock->handle_, F_SETLKW, reinterpret_cast<long> (&lock->lock_)), int); #endif /* ACE_WIN32 */ } @@ -459,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*, 0); + ACE_OSCALL_RETURN (::ace_cuserid(user), char*); #endif /* ACE_VXWORKS */ } @@ -501,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, -1); + ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fclose (fp), int); } ACE_INLINE FILE * @@ -510,13 +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*, - 0); + ACE_OSCALL_RETURN (::_wfdopen ((int)handle, const_cast <ACE_TCHAR*> (ACE_TEXT_ALWAYS_WCHAR (mode))), FILE*); # else - ACE_OSCALL_RETURN (::_wfdopen (handle, ACE_TEXT_ALWAYS_WCHAR (mode)), - FILE*, - 0); + ACE_OSCALL_RETURN (::_wfdopen (handle, ACE_TEXT_ALWAYS_WCHAR (mode)), FILE*); # endif #elif defined (ACE_WIN32) // kernel file handle -> FILE* conversion... @@ -546,8 +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 *, 0); + ACE_OSCALL_RETURN (::fdopen (handle, ACE_TEXT_ALWAYS_CHAR (mode)), FILE *); #endif /* ACE_HAS_WINCE */ } @@ -555,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, -1); + ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fflush (fp), int); } ACE_INLINE int @@ -583,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, -1); + ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgetpos (fp, pos), int); #endif } @@ -603,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 *, 0); + ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgets (buf, size, fp), char *); #endif /* ACE_LACKS_FGETS */ } @@ -612,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 *, 0); + ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgetws (buf, size, fp), wchar_t *); } #endif /* ACE_HAS_WCHAR && !ACE_LACKS_FGETWS */ @@ -632,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 *, 0); + ACE_OSCALL_RETURN (::fopen (filename, mode), FILE *); } #if defined (ACE_HAS_WCHAR) @@ -642,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 *, 0); + ACE_OSCALL_RETURN (::fopen (filename, n_mode.char_rep ()), FILE *); } // Win32 PC implementation of fopen () is in OS_NS_stdio.cpp. @@ -656,8 +642,7 @@ ACE_OS::fopen (const wchar_t *filename, const wchar_t *mode) // 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*, 0); + ACE_OSCALL_RETURN (::fopen (n_filename.char_rep (), n_mode.char_rep ()), FILE*); #endif /* ACE_HAS_WINCE */ } // Win32 PC implementation of fopen () is in OS_NS_stdio.cpp. @@ -667,13 +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 *, 0); + ACE_OSCALL_RETURN (::_wfopen (filename, n_mode.wchar_rep ()), FILE *); #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*, 0); + ACE_OSCALL_RETURN (::fopen (n_filename.char_rep (), mode), FILE*); #endif /* ACE_HAS_WINCE */ } #endif /* ACE_HAS_WCHAR */ @@ -725,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, -1); + ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fputs (s, stream), int); #endif } @@ -734,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, -1); + ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fputws (s, stream), int); } #endif /* ACE_HAS_WCHAR && !ACE_LACKS_FPUTWS */ @@ -742,9 +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, - 0); + ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fread (ptr, size, nelems, fp), size_t); } ACE_INLINE FILE * @@ -755,7 +736,7 @@ ACE_OS::freopen (const ACE_TCHAR *filename, const ACE_TCHAR *mode, FILE* stream) ACE_OSCALL_RETURN (::_wfreopen (ACE_TEXT_ALWAYS_WCHAR (filename), ACE_TEXT_ALWAYS_WCHAR (mode), stream), - FILE *, 0); + FILE *); #elif defined (ACE_LACKS_FREOPEN) ACE_UNUSED_ARG (filename); ACE_UNUSED_ARG (mode); @@ -766,7 +747,7 @@ ACE_OS::freopen (const ACE_TCHAR *filename, const ACE_TCHAR *mode, FILE* stream) (ACE_STD_NAMESPACE::freopen (ACE_TEXT_ALWAYS_CHAR (filename), ACE_TEXT_ALWAYS_CHAR (mode), stream), - FILE *, 0); + FILE *); #endif /* ACE_WIN32 && ACE_USES_WCHAR */ } @@ -793,7 +774,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, -1); + ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fseek (fp, offset, whence), int); } ACE_INLINE int @@ -804,23 +785,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, -1); + ACE_OSCALL_RETURN (::fsetpos (fp, pos), int); #endif /* ACE_LACKS_FSETPOS */ } ACE_INLINE long ACE_OS::ftell (FILE* fp) { - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::ftell (fp), long, -1); + ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::ftell (fp), long); } 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, - 0); + ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fwrite (ptr, size, nitems, fp), size_t); } ACE_INLINE void @@ -858,7 +837,7 @@ ACE_OS::puts (const char *s) ACE_UNUSED_ARG (s); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::puts (s), int, -1); + ACE_OSCALL_RETURN (::puts (s), int); #endif /* ACE_LACKS_PUTS */ } @@ -868,11 +847,11 @@ ACE_OS::puts (const wchar_t *s) { ACE_OS_TRACE ("ACE_OS::puts"); #if defined (ACE_WIN32) - ACE_OSCALL_RETURN (::_putws (s), int, -1); + ACE_OSCALL_RETURN (::_putws (s), int); #else /* ACE_WIN32 */ // There's no putws()... ACE_Wide_To_Ascii n_s (s); - ACE_OSCALL_RETURN (::puts (n_s.char_rep ()), int, -1); + ACE_OSCALL_RETURN (::puts (n_s.char_rep ()), int); #endif /* ACE_WIN32 */ } #endif /* ACE_HAS_WCHAR */ @@ -905,10 +884,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, -1); + ACE_OSCALL_RETURN (ACE_RENAME_EQUIVALENT (old_name, new_name), int); # else ACE_UNUSED_ARG (flags); - ACE_OSCALL_RETURN (::rename (old_name, new_name), int, -1); + ACE_OSCALL_RETURN (::rename (old_name, new_name), int); # endif /* ACE_HAS_WINCE */ } @@ -940,7 +919,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, -1); + ACE_OSCALL_RETURN (::_wrename (old_name, new_name), int); # else ACE_Wide_To_Ascii nold_name (old_name); ACE_Wide_To_Ascii nnew_name (new_name); @@ -976,11 +955,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 *, 0); + ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::tempnam (const_cast <char *> (dir), const_cast<char *> (pfx)), char *); #elif defined (ACE_TEMPNAM_EQUIVALENT) - ACE_OSCALL_RETURN (ACE_TEMPNAM_EQUIVALENT (dir, pfx), char *, 0); + ACE_OSCALL_RETURN (ACE_TEMPNAM_EQUIVALENT (dir, pfx), char *); #else /* ACE_LACKS_TEMPNAM */ - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::tempnam (dir, pfx), char *, 0); + ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::tempnam (dir, pfx), char *); #endif /* ACE_LACKS_TEMPNAM */ } @@ -995,9 +974,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 *, 0); + ACE_OSCALL_RETURN (::_wtempnam (const_cast <wchar_t*> (dir), const_cast <wchar_t*> (pfx)), wchar_t *); # else - ACE_OSCALL_RETURN (::_wtempnam (dir, pfx), wchar_t *, 0); + ACE_OSCALL_RETURN (::_wtempnam (dir, pfx), wchar_t *); # endif /* ACE_HAS_NONCONST_TEMPNAM */ #else /* ACE_LACKS_TEMPNAM */ // No native wide-char support; convert to narrow and call the char* variant. diff --git a/ACE/ace/OS_NS_stdlib.inl b/ACE/ace/OS_NS_stdlib.inl index 356b258ae69..37c737620a8 100644 --- a/ACE/ace/OS_NS_stdlib.inl +++ b/ACE/ace/OS_NS_stdlib.inl @@ -57,7 +57,7 @@ ACE_OS::atexit (ACE_EXIT_HOOK func, const char* name) ACE_INLINE int ACE_OS::atoi (const char *s) { - ACE_OSCALL_RETURN (::atoi (s), int, -1); + ACE_OSCALL_RETURN (::atoi (s), int); } #if defined (ACE_HAS_WCHAR) @@ -65,7 +65,7 @@ ACE_INLINE int ACE_OS::atoi (const wchar_t *s) { #if defined (ACE_WIN32) && defined (ACE_HAS_WTOI) - ACE_OSCALL_RETURN (::_wtoi (s), int, -1); + ACE_OSCALL_RETURN (::_wtoi (s), int); #else /* ACE_WIN32 */ return ACE_OS::atoi (ACE_Wide_To_Ascii (s).char_rep ()); #endif /* ACE_WIN32 */ @@ -75,7 +75,7 @@ ACE_OS::atoi (const wchar_t *s) ACE_INLINE long ACE_OS::atol (const char *s) { - ACE_OSCALL_RETURN (::atol (s), long, -1); + ACE_OSCALL_RETURN (::atol (s), long); } #if defined (ACE_HAS_WCHAR) @@ -83,7 +83,7 @@ ACE_INLINE long ACE_OS::atol (const wchar_t *s) { #if defined (ACE_WIN32) && defined (ACE_HAS_WTOL) - ACE_OSCALL_RETURN (::_wtol (s), long, -1); + ACE_OSCALL_RETURN (::_wtol (s), long); #else /* ACE_WIN32 */ return ACE_OS::atol (ACE_Wide_To_Ascii (s).char_rep ()); #endif /* ACE_WIN32 */ @@ -93,7 +93,7 @@ ACE_OS::atol (const wchar_t *s) ACE_INLINE double ACE_OS::atof (const char *s) { - ACE_OSCALL_RETURN (::atof (s), double, -1); + ACE_OSCALL_RETURN (::atof (s), double); } #if defined (ACE_HAS_WCHAR) @@ -103,9 +103,9 @@ ACE_OS::atof (const wchar_t *s) #if !defined (ACE_HAS_WTOF) return ACE_OS::atof (ACE_Wide_To_Ascii (s).char_rep ()); #elif defined (ACE_WTOF_EQUIVALENT) - ACE_OSCALL_RETURN (ACE_WTOF_EQUIVALENT (s), double, -1); + ACE_OSCALL_RETURN (ACE_WTOF_EQUIVALENT (s), double); #else /* ACE_HAS__WTOF */ - ACE_OSCALL_RETURN (::wtof (s), double, -1); + ACE_OSCALL_RETURN (::wtof (s), double); #endif /* ACE_HAS_WTOF */ } #endif /* ACE_HAS_WCHAR */ @@ -176,7 +176,7 @@ ACE_OS::getenv (const char *symbol) ACE_UNUSED_ARG (symbol); ACE_NOTSUP_RETURN (0); #else /* ACE_LACKS_GETENV */ - ACE_OSCALL_RETURN (::getenv (symbol), char *, 0); + ACE_OSCALL_RETURN (::getenv (symbol), char *); #endif /* ACE_LACKS_GETENV */ } @@ -188,7 +188,7 @@ ACE_OS::getenv (const wchar_t *symbol) ACE_UNUSED_ARG (symbol); ACE_NOTSUP_RETURN (0); #else - ACE_OSCALL_RETURN (::_wgetenv (symbol), wchar_t *, 0); + ACE_OSCALL_RETURN (::_wgetenv (symbol), wchar_t *); #endif /* ACE_LACKS_GETENV */ } #endif /* ACE_HAS_WCHAR && ACE_WIN32 */ @@ -341,9 +341,9 @@ ACE_OS::putenv (const char *string) ACE_UNUSED_ARG (string); ACE_NOTSUP_RETURN (0); #elif defined (ACE_PUTENV_EQUIVALENT) - ACE_OSCALL_RETURN (ACE_PUTENV_EQUIVALENT (const_cast <char *> (string)), int, -1); + ACE_OSCALL_RETURN (ACE_PUTENV_EQUIVALENT (const_cast <char *> (string)), int); #else /* ! ACE_HAS_WINCE */ - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::putenv (const_cast <char *> (string)), int, -1); + ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::putenv (const_cast <char *> (string)), int); #endif /* ACE_LACKS_PUTENV && ACE_HAS_SETENV */ } @@ -356,7 +356,7 @@ ACE_OS::setenv(const char *envname, const char *envval, int overwrite) ACE_UNUSED_ARG (overwrite); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::setenv (envname, envval, overwrite), int, -1); + ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::setenv (envname, envval, overwrite), int); #endif } @@ -371,7 +371,7 @@ ACE_OS::unsetenv(const char *name) ::unsetenv (name); return 0; #else - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::unsetenv (name), int, -1); + ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::unsetenv (name), int); # endif /* ACE_HAS_VOID_UNSETENV */ #endif /* ACE_LACKS_UNSETENV */ } @@ -385,7 +385,7 @@ ACE_OS::putenv (const wchar_t *string) ACE_UNUSED_ARG (string); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::_wputenv (string), int, -1); + ACE_OSCALL_RETURN (::_wputenv (string), int); #endif /* ACE_LACKS_PUTENV */ } #endif /* ACE_HAS_WCHAR && ACE_WIN32 */ @@ -411,7 +411,7 @@ ACE_OS::rand () { ACE_OS_TRACE ("ACE_OS::rand"); #if !defined (ACE_LACKS_RAND) - ACE_OSCALL_RETURN (::rand (), int, -1); + ACE_OSCALL_RETURN (::rand (), int); #else ACE_NOTSUP_RETURN (-1); #endif /* ACE_LACKS_RAND */ @@ -609,9 +609,9 @@ ACE_OS::system (const ACE_TCHAR *s) ACE_UNUSED_ARG (s); ACE_NOTSUP_RETURN (-1); #elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_OSCALL_RETURN (::_wsystem (s), int, -1); + ACE_OSCALL_RETURN (::_wsystem (s), int); #else - ACE_OSCALL_RETURN (::system (ACE_TEXT_ALWAYS_CHAR (s)), int, -1); + ACE_OSCALL_RETURN (::system (ACE_TEXT_ALWAYS_CHAR (s)), int); #endif /* ACE_LACKS_SYSTEM */ } diff --git a/ACE/ace/OS_NS_stropts.inl b/ACE/ace/OS_NS_stropts.inl index 6f433a441ce..44594051b16 100644 --- a/ACE/ace/OS_NS_stropts.inl +++ b/ACE/ace/OS_NS_stropts.inl @@ -45,7 +45,7 @@ ACE_OS::getmsg (ACE_HANDLE handle, { ACE_OS_TRACE ("ACE_OS::getmsg"); #if defined (ACE_HAS_STREAM_PIPES) - ACE_OSCALL_RETURN (::getmsg (handle, ctl, data, flags), int, -1); + ACE_OSCALL_RETURN (::getmsg (handle, ctl, data, flags), int); #else ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (ctl); @@ -66,7 +66,7 @@ ACE_OS::getpmsg (ACE_HANDLE handle, { ACE_OS_TRACE ("ACE_OS::getpmsg"); #if defined (ACE_HAS_STREAM_PIPES) - ACE_OSCALL_RETURN (::getpmsg (handle, ctl, data, band, flags), int, -1); + ACE_OSCALL_RETURN (::getpmsg (handle, ctl, data, band, flags), int); #else ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (ctl); @@ -84,7 +84,7 @@ ACE_OS::fattach (int handle, const char *path) { ACE_OS_TRACE ("ACE_OS::fattach"); #if defined (ACE_HAS_STREAM_PIPES) - ACE_OSCALL_RETURN (::fattach (handle, path), int, -1); + ACE_OSCALL_RETURN (::fattach (handle, path), int); #else ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (path); @@ -98,7 +98,7 @@ ACE_OS::fdetach (const char *file) { ACE_OS_TRACE ("ACE_OS::fdetach"); #if defined (ACE_HAS_STREAM_PIPES) - ACE_OSCALL_RETURN (::fdetach (file), int, -1); + ACE_OSCALL_RETURN (::fdetach (file), int); #else ACE_UNUSED_ARG (file); @@ -121,13 +121,12 @@ ACE_OS::ioctl (ACE_HANDLE handle, ACE_SOCKET sock = (ACE_SOCKET) handle; ACE_SOCKCALL_RETURN (::ioctlsocket (sock, cmd, reinterpret_cast<unsigned long *> (val)), int, -1); #elif defined (ACE_HAS_IOCTL_INT_3_PARAM) - ACE_OSCALL_RETURN (::ioctl (handle, cmd, reinterpret_cast<int> (val)), - int, -1); + ACE_OSCALL_RETURN (::ioctl (handle, cmd, reinterpret_cast<int> (val)), int); #elif defined (ACE_MQX) // TBD: See if there is a way to provide this functionality ACE_NOTSUP_RETURN (0); #else - ACE_OSCALL_RETURN (::ioctl (handle, cmd, val), int, -1); + ACE_OSCALL_RETURN (::ioctl (handle, cmd, val), int); #endif /* ACE_WIN32 */ } @@ -136,7 +135,7 @@ ACE_OS::isastream (ACE_HANDLE handle) { ACE_OS_TRACE ("ACE_OS::isastream"); #if defined (ACE_HAS_STREAM_PIPES) - ACE_OSCALL_RETURN (::isastream (handle), int, -1); + ACE_OSCALL_RETURN (::isastream (handle), int); #else ACE_UNUSED_ARG (handle); @@ -153,7 +152,7 @@ ACE_OS::putmsg (ACE_HANDLE handle, const struct strbuf *ctl, ACE_OSCALL_RETURN (::putmsg (handle, (ACE_STRBUF_TYPE) ctl, (ACE_STRBUF_TYPE) data, - flags), int, -1); + flags), int); #else ACE_UNUSED_ARG (flags); ssize_t result; @@ -208,7 +207,7 @@ ACE_OS::putpmsg (ACE_HANDLE handle, ACE_OSCALL_RETURN (::putpmsg (handle, (ACE_STRBUF_TYPE) ctl, (ACE_STRBUF_TYPE) data, - band, flags), int, -1); + band, flags), int); #else ACE_UNUSED_ARG (flags); ACE_UNUSED_ARG (band); diff --git a/ACE/ace/OS_NS_sys_mman.inl b/ACE/ace/OS_NS_sys_mman.inl index cd2931a8e1c..51df59d4531 100644 --- a/ACE/ace/OS_NS_sys_mman.inl +++ b/ACE/ace/OS_NS_sys_mman.inl @@ -19,7 +19,7 @@ ACE_OS::madvise (caddr_t addr, size_t len, int map_advice) { ACE_OS_TRACE ("ACE_OS::madvise"); #if !defined (ACE_LACKS_MADVISE) - ACE_OSCALL_RETURN (::madvise (addr, len, map_advice), int, -1); + ACE_OSCALL_RETURN (::madvise (addr, len, map_advice), int); #else ACE_UNUSED_ARG (addr); ACE_UNUSED_ARG (len); @@ -166,7 +166,7 @@ ACE_OS::mmap (void *addr, flags, file_handle, off), - void *, MAP_FAILED); + void *); //FUZZ: enable check_for_lack_ACE_OS #else ACE_UNUSED_ARG (addr); @@ -194,7 +194,7 @@ ACE_OS::mprotect (void *addr, size_t len, int prot) DWORD dummy; // Sigh! return ::VirtualProtect(addr, len, prot, &dummy) ? 0 : -1; #elif !defined (ACE_LACKS_MPROTECT) - ACE_OSCALL_RETURN (::mprotect ((ACE_MMAP_TYPE) addr, len, prot), int, -1); + ACE_OSCALL_RETURN (::mprotect ((ACE_MMAP_TYPE) addr, len, prot), int); #else ACE_UNUSED_ARG (addr); ACE_UNUSED_ARG (len); @@ -212,7 +212,7 @@ ACE_OS::msync (void *addr, size_t len, int sync) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::FlushViewOfFile (addr, len), ace_result_), int, -1); #elif !defined (ACE_LACKS_MSYNC) - ACE_OSCALL_RETURN (::msync ((ACE_MMAP_TYPE) addr, len, sync), int, -1); + ACE_OSCALL_RETURN (::msync ((ACE_MMAP_TYPE) addr, len, sync), int); #else ACE_UNUSED_ARG (addr); ACE_UNUSED_ARG (len); @@ -230,7 +230,7 @@ ACE_OS::munmap (void *addr, size_t len) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::UnmapViewOfFile (addr), ace_result_), int, -1); #elif !defined (ACE_LACKS_MMAP) && !defined (ACE_LACKS_MUNMAP) - ACE_OSCALL_RETURN (::munmap ((ACE_MMAP_TYPE) addr, len), int, -1); + ACE_OSCALL_RETURN (::munmap ((ACE_MMAP_TYPE) addr, len), int); #else ACE_UNUSED_ARG (addr); ACE_UNUSED_ARG (len); @@ -263,10 +263,10 @@ ACE_OS::shm_open (const ACE_TCHAR *filename, } filename = buf; #endif - ACE_OSCALL_RETURN (::shm_open (ACE_TEXT_ALWAYS_CHAR(filename), mode, perms), ACE_HANDLE, ACE_INVALID_HANDLE); + ACE_OSCALL_RETURN (::shm_open (ACE_TEXT_ALWAYS_CHAR(filename), mode, perms), ACE_HANDLE); #elif defined (ACE_OPENVMS) //FUZZ: disable check_for_lack_ACE_OS - ACE_OSCALL_RETURN (::open (filename, mode, perms, ACE_TEXT("shr=get,put,upd")), ACE_HANDLE, ACE_INVALID_HANDLE); + ACE_OSCALL_RETURN (::open (filename, mode, perms, ACE_TEXT("shr=get,put,upd")), ACE_HANDLE); //FUZZ: enable check_for_lack_ACE_OS #else /* ! ACE_HAS_SHM_OPEN */ // Just use ::open. @@ -299,7 +299,7 @@ ACE_OS::shm_unlink (const ACE_TCHAR *path) ACE_UNUSED_ARG (path); ACE_NOTSUP_RETURN (-1); # else - ACE_OSCALL_RETURN (::shm_unlink (ACE_TEXT_ALWAYS_CHAR(path)), int, -1); + ACE_OSCALL_RETURN (::shm_unlink (ACE_TEXT_ALWAYS_CHAR(path)), int); # endif /* ACE_LACKS_SHM_UNLINK */ #else /* ! ACE_HAS_SHM_OPEN */ // Just use ::unlink. diff --git a/ACE/ace/OS_NS_sys_msg.inl b/ACE/ace/OS_NS_sys_msg.inl index 92b7a646e19..de059e2d3c9 100644 --- a/ACE/ace/OS_NS_sys_msg.inl +++ b/ACE/ace/OS_NS_sys_msg.inl @@ -8,7 +8,7 @@ ACE_OS::msgctl (int msqid, int cmd, struct msqid_ds *val) { ACE_OS_TRACE ("ACE_OS::msgctl"); #if defined (ACE_HAS_SYSV_IPC) - ACE_OSCALL_RETURN (::msgctl (msqid, cmd, val), int, -1); + ACE_OSCALL_RETURN (::msgctl (msqid, cmd, val), int); #else ACE_UNUSED_ARG (msqid); ACE_UNUSED_ARG (cmd); @@ -23,7 +23,7 @@ ACE_OS::msgget (key_t key, int msgflg) { ACE_OS_TRACE ("ACE_OS::msgget"); #if defined (ACE_HAS_SYSV_IPC) - ACE_OSCALL_RETURN (::msgget (key, msgflg), int, -1); + ACE_OSCALL_RETURN (::msgget (key, msgflg), int); #else ACE_UNUSED_ARG (key); ACE_UNUSED_ARG (msgflg); @@ -38,8 +38,7 @@ ACE_OS::msgrcv (int int_id, void *buf, size_t len, { ACE_OS_TRACE ("ACE_OS::msgrcv"); #if defined (ACE_HAS_SYSV_IPC) - ACE_OSCALL_RETURN (::msgrcv (int_id, buf, len, type, flags), - int, -1); + ACE_OSCALL_RETURN (::msgrcv (int_id, buf, len, type, flags), int); #else ACE_UNUSED_ARG (int_id); ACE_UNUSED_ARG (buf); @@ -57,10 +56,9 @@ ACE_OS::msgsnd (int int_id, const void *buf, size_t len, int flags) ACE_OS_TRACE ("ACE_OS::msgsnd"); #if defined (ACE_HAS_SYSV_IPC) # if defined (ACE_HAS_NONCONST_MSGSND) - ACE_OSCALL_RETURN (::msgsnd (int_id, - const_cast<void *> (buf), len, flags), int, -1); + ACE_OSCALL_RETURN (::msgsnd (int_id, const_cast<void *> (buf), len, flags), int); # else - ACE_OSCALL_RETURN (::msgsnd (int_id, buf, len, flags), int, -1); + ACE_OSCALL_RETURN (::msgsnd (int_id, buf, len, flags), int); # endif /* ACE_HAS_NONCONST_MSGSND */ #else ACE_UNUSED_ARG (int_id); diff --git a/ACE/ace/OS_NS_sys_resource.inl b/ACE/ace/OS_NS_sys_resource.inl index e49119d3e32..4bf059c95c8 100644 --- a/ACE/ace/OS_NS_sys_resource.inl +++ b/ACE/ace/OS_NS_sys_resource.inl @@ -16,9 +16,9 @@ ACE_OS::getrlimit (int resource, struct rlimit *rl) ACE_NOTSUP_RETURN (-1); #else # if defined (ACE_HAS_RLIMIT_RESOURCE_ENUM) - ACE_OSCALL_RETURN (::getrlimit ((ACE_HAS_RLIMIT_RESOURCE_ENUM) resource, rl), int, -1); + ACE_OSCALL_RETURN (::getrlimit ((ACE_HAS_RLIMIT_RESOURCE_ENUM) resource, rl), int); # else - ACE_OSCALL_RETURN (::getrlimit (resource, rl), int, -1); + ACE_OSCALL_RETURN (::getrlimit (resource, rl), int); # endif /* ACE_HAS_RLIMIT_RESOURCE_ENUM */ #endif /* ACE_LACKS_RLIMIT */ } @@ -48,9 +48,9 @@ ACE_OS::getrusage (int who, struct rusage *ru) # endif /* ACE_LACKS_WIN32_GETPROCESSTIMES */ # else # if defined (ACE_HAS_RUSAGE_WHO_ENUM) - ACE_OSCALL_RETURN (::getrusage ((ACE_HAS_RUSAGE_WHO_ENUM) who, ru), int, -1); + ACE_OSCALL_RETURN (::getrusage ((ACE_HAS_RUSAGE_WHO_ENUM) who, ru), int); # else - ACE_OSCALL_RETURN (::getrusage (who, ru), int, -1); + ACE_OSCALL_RETURN (::getrusage (who, ru), int); # endif /* ACE_HAS_RUSAGE_WHO_ENUM */ # endif /* ACE_WIN32 */ #else @@ -73,20 +73,15 @@ ACE_OS::setrlimit (int resource, const struct rlimit *rl) #else # if defined (ACE_HAS_RLIMIT_RESOURCE_ENUM) # if defined (ACE_HAS_NONCONST_SETRLIMIT) - ACE_OSCALL_RETURN (::setrlimit ((ACE_HAS_RLIMIT_RESOURCE_ENUM) resource, - const_cast<struct rlimit *>(rl) - ), int, -1); + ACE_OSCALL_RETURN (::setrlimit ((ACE_HAS_RLIMIT_RESOURCE_ENUM) resource, const_cast<struct rlimit *>(rl)), int); # else - ACE_OSCALL_RETURN (::setrlimit ((ACE_HAS_RLIMIT_RESOURCE_ENUM) resource, - rl - ), int, -1); + ACE_OSCALL_RETURN (::setrlimit ((ACE_HAS_RLIMIT_RESOURCE_ENUM) resource, rl), int); # endif /* ACE_HAS_NONCONST_SETRLIMIT */ # else /* ACE_HAS_RLIMIT_RESOURCE_ENUM */ # if defined (ACE_HAS_NONCONST_SETRLIMIT) - ACE_OSCALL_RETURN (::setrlimit (resource, const_cast<struct rlimit *>(rl) - ), int, -1); + ACE_OSCALL_RETURN (::setrlimit (resource, const_cast<struct rlimit *>(rl)), int); # else - ACE_OSCALL_RETURN (::setrlimit (resource, rl), int, -1); + ACE_OSCALL_RETURN (::setrlimit (resource, rl), int); # endif /* ACE_HAS_NONCONST_SETRLIMIT */ # endif /* ACE_HAS_RLIMIT_RESOURCE_ENUM */ #endif /* ACE_LACKS_RLIMIT */ diff --git a/ACE/ace/OS_NS_sys_shm.inl b/ACE/ace/OS_NS_sys_shm.inl index 02c3b9221f5..5704db6d78e 100644 --- a/ACE/ace/OS_NS_sys_shm.inl +++ b/ACE/ace/OS_NS_sys_shm.inl @@ -9,9 +9,9 @@ ACE_OS::shmat (int int_id, const void *shmaddr, int shmflg) ACE_OS_TRACE ("ACE_OS::shmat"); #if defined (ACE_HAS_SYSV_IPC) # if defined (ACE_HAS_CHARPTR_SHMAT) - ACE_OSCALL_RETURN (::shmat (int_id, static_cast <char*> (const_cast <void *>(shmaddr)), shmflg), void *, (void *) -1); + ACE_OSCALL_RETURN (::shmat (int_id, static_cast <char*> (const_cast <void *>(shmaddr)), shmflg), void *); # else - ACE_OSCALL_RETURN (::shmat (int_id, shmaddr, shmflg), void *, (void *) -1); + ACE_OSCALL_RETURN (::shmat (int_id, shmaddr, shmflg), void *); # endif /* ACE_HAS_CHARPTR_SHMAT */ #else ACE_UNUSED_ARG (int_id); @@ -27,7 +27,7 @@ ACE_OS::shmctl (int int_id, int cmd, struct shmid_ds *buf) { ACE_OS_TRACE ("ACE_OS::shmctl"); #if defined (ACE_HAS_SYSV_IPC) - ACE_OSCALL_RETURN (::shmctl (int_id, cmd, buf), int, -1); + ACE_OSCALL_RETURN (::shmctl (int_id, cmd, buf), int); #else ACE_UNUSED_ARG (buf); ACE_UNUSED_ARG (cmd); @@ -43,10 +43,9 @@ ACE_OS::shmdt (const void *shmaddr) ACE_OS_TRACE ("ACE_OS::shmdt"); #if defined (ACE_HAS_SYSV_IPC) # if defined (ACE_HAS_CHARPTR_SHMDT) - ACE_OSCALL_RETURN (::shmdt ( - static_cast <char*> (const_cast <void *>(shmaddr))), int, -1); + ACE_OSCALL_RETURN (::shmdt (static_cast <char*> (const_cast <void *>(shmaddr))), int); # else - ACE_OSCALL_RETURN (::shmdt (shmaddr), int, -1); + ACE_OSCALL_RETURN (::shmdt (shmaddr), int); # endif /* ACE_HAS_CHARPTR_SHMDT */ #else ACE_UNUSED_ARG (shmaddr); @@ -60,7 +59,7 @@ ACE_OS::shmget (key_t key, size_t size, int flags) { ACE_OS_TRACE ("ACE_OS::shmget"); #if defined (ACE_HAS_SYSV_IPC) - ACE_OSCALL_RETURN (::shmget (key, size, flags), int, -1); + ACE_OSCALL_RETURN (::shmget (key, size, flags), int); #else ACE_UNUSED_ARG (flags); ACE_UNUSED_ARG (size); diff --git a/ACE/ace/OS_NS_sys_socket.inl b/ACE/ace/OS_NS_sys_socket.inl index 53036af3b8f..d94cd5de0fe 100644 --- a/ACE/ace/OS_NS_sys_socket.inl +++ b/ACE/ace/OS_NS_sys_socket.inl @@ -137,7 +137,7 @@ ACE_OS::closesocket (ACE_HANDLE handle) ACE_SOCKCALL_RETURN (::closesocket ((SOCKET) handle), int, -1); #else //FUZZ: disable check_for_lack_ACE_OS - ACE_OSCALL_RETURN (::close (handle), int, -1); + ACE_OSCALL_RETURN (::close (handle), int); //FUZZ: enable check_for_lack_ACE_OS #endif /* ACE_WIN32 */ } @@ -1015,8 +1015,7 @@ ACE_OS::socketpair (int domain, int type, ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::socketpair (domain, type, protocol, sv), - int, -1); + ACE_OSCALL_RETURN (::socketpair (domain, type, protocol, sv), int); #endif /* ACE_LACKS_SOCKETPAIR */ } @@ -1028,7 +1027,7 @@ ACE_OS::if_nametoindex (const char *ifname) ACE_UNUSED_ARG (ifname); ACE_NOTSUP_RETURN (0); #else - ACE_OSCALL_RETURN (::if_nametoindex (ifname), int, 0); + ACE_OSCALL_RETURN (::if_nametoindex (ifname), int); #endif /* ACE_LACKS_IF_NAMETOINDEX */ } @@ -1041,7 +1040,7 @@ ACE_OS::if_indextoname (unsigned int ifindex, char *ifname) ACE_UNUSED_ARG (ifname); ACE_NOTSUP_RETURN (0); #else - ACE_OSCALL_RETURN (::if_indextoname (ifindex, ifname), char *, 0); + ACE_OSCALL_RETURN (::if_indextoname (ifindex, ifname), char *); #endif /* ACE_LACKS_IF_NAMETOINDEX */ } @@ -1052,7 +1051,7 @@ ACE_OS::if_nameindex () #ifdef ACE_LACKS_IF_NAMEINDEX ACE_NOTSUP_RETURN (0); #else - ACE_OSCALL_RETURN (::if_nameindex (), struct if_nameindex *, 0); + ACE_OSCALL_RETURN (::if_nameindex (), struct if_nameindex *); #endif /* ACE_LACKS_IF_NAMEINDEX */ } diff --git a/ACE/ace/OS_NS_sys_stat.inl b/ACE/ace/OS_NS_sys_stat.inl index dd940376d9c..db99b17bb79 100644 --- a/ACE/ace/OS_NS_sys_stat.inl +++ b/ACE/ace/OS_NS_sys_stat.inl @@ -20,8 +20,7 @@ namespace ACE_OS #if defined (ACE_WIN32) || defined (ACE_MQX) return ACE_OS::open (filename, O_CREAT|O_TRUNC|O_WRONLY, mode); #else - ACE_OSCALL_RETURN (::creat (ACE_TEXT_ALWAYS_CHAR (filename), mode), - ACE_HANDLE, ACE_INVALID_HANDLE); + ACE_OSCALL_RETURN (::creat (ACE_TEXT_ALWAYS_CHAR (filename), mode), ACE_HANDLE); #endif /* ACE_WIN32 */ } @@ -33,7 +32,7 @@ namespace ACE_OS // Solaris for intel uses an macro for fstat(), this is a wrapper // for _fxstat() use of the macro. // causes compile and runtime problems. - ACE_OSCALL_RETURN (::_fxstat (_STAT_VER, handle, stp), int, -1); + ACE_OSCALL_RETURN (::_fxstat (_STAT_VER, handle, stp), int); #elif defined (ACE_WIN32) BY_HANDLE_FILE_INFORMATION fdata; @@ -70,7 +69,7 @@ namespace ACE_OS ::fsync(handle); //FUZZ: enable check_for_lack_ACE_OS # endif - ACE_OSCALL_RETURN (::fstat (handle, stp), int, -1); + ACE_OSCALL_RETURN (::fstat (handle, stp), int); #endif /* !ACE_HAS_X86_STAT_MACROS */ } @@ -132,9 +131,9 @@ namespace ACE_OS # elif defined (ACE_HAS_X86_STAT_MACROS) // Solaris for intel uses an macro for lstat(), this macro is a // wrapper for _lxstat(). - ACE_OSCALL_RETURN (::_lxstat (_STAT_VER, file, stp), int, -1); + ACE_OSCALL_RETURN (::_lxstat (_STAT_VER, file, stp), int); # else /* !ACE_HAS_X86_STAT_MACROS */ - ACE_OSCALL_RETURN (::lstat (file, stp), int, -1); + ACE_OSCALL_RETURN (::lstat (file, stp), int); # endif /* ACE_LACKS_LSTAT */ } @@ -162,12 +161,12 @@ namespace ACE_OS #elif defined (ACE_MKDIR_LACKS_MODE) ACE_UNUSED_ARG (mode); # if defined (ACE_MKDIR_EQUIVALENT) - ACE_OSCALL_RETURN (ACE_MKDIR_EQUIVALENT (path), int, -1); + ACE_OSCALL_RETURN (ACE_MKDIR_EQUIVALENT (path), int); # else - ACE_OSCALL_RETURN (::mkdir (path), int, -1); + ACE_OSCALL_RETURN (::mkdir (path), int); # endif #else - ACE_OSCALL_RETURN (::mkdir (path, mode), int, -1); + ACE_OSCALL_RETURN (::mkdir (path, mode), int); #endif } @@ -183,7 +182,7 @@ namespace ACE_OS int, -1); #elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR) ACE_UNUSED_ARG (mode); - ACE_OSCALL_RETURN (::_wmkdir (path), int, -1); + ACE_OSCALL_RETURN (::_wmkdir (path), int); #else return ACE_OS::mkdir (ACE_Wide_To_Ascii (path).char_rep (), mode); #endif /* ACE_HAS_WINCE */ @@ -200,7 +199,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_ALWAYS_CHAR (file), mode), int); #endif /* ACE_LACKS_MKFIFO */ } @@ -209,7 +208,7 @@ namespace ACE_OS { ACE_OS_TRACE ("ACE_OS::stat"); #if defined (ACE_HAS_NONCONST_STAT) - ACE_OSCALL_RETURN (::stat (const_cast <char *> (file), stp), int, -1); + ACE_OSCALL_RETURN (::stat (const_cast <char *> (file), stp), int); #elif defined (ACE_LACKS_STAT) ACE_NOTSUP_RETURN (-1); #elif defined (ACE_HAS_WINCE) @@ -241,11 +240,11 @@ namespace ACE_OS #elif defined (ACE_HAS_X86_STAT_MACROS) // Solaris for intel uses an macro for stat(), this macro is a // wrapper for _xstat(). - ACE_OSCALL_RETURN (::_xstat (_STAT_VER, file, stp), int, -1); + ACE_OSCALL_RETURN (::_xstat (_STAT_VER, file, stp), int); #elif defined (ACE_MQX) return MQX_Filesystem::inst ().stat (file, stp); #else - ACE_OSCALL_RETURN (ACE_STAT_FUNC_NAME (file, stp), int, -1); + ACE_OSCALL_RETURN (ACE_STAT_FUNC_NAME (file, stp), int); #endif /* ACE_HAS_NONCONST_STAT */ } @@ -283,7 +282,7 @@ namespace ACE_OS #elif defined (__BORLANDC__) \ || defined (_MSC_VER) \ || (defined (__MINGW32__) && !defined (__MINGW64_VERSION_MAJOR)) - ACE_OSCALL_RETURN (ACE_WSTAT_FUNC_NAME (file, stp), int, -1); + ACE_OSCALL_RETURN (ACE_WSTAT_FUNC_NAME (file, stp), int); #else /* ACE_HAS_WINCE */ ACE_Wide_To_Ascii nfile (file); return ACE_OS::stat (nfile.char_rep (), stp); @@ -304,7 +303,7 @@ namespace ACE_OS ACE_SECURECRTCALL (_umask_s (new_mode, &old_mode), mode_t, -1, old_mode); return static_cast<mode_t> (old_mode); # elif defined (ACE_WIN32) && !defined (__BORLANDC__) - ACE_OSCALL_RETURN (::_umask (cmask), mode_t, -1); + ACE_OSCALL_RETURN (::_umask (cmask), mode_t); # else return ::umask (cmask); // This call shouldn't fail... # endif /* ACE_LACKS_UMASK */ diff --git a/ACE/ace/OS_NS_sys_time.inl b/ACE/ace/OS_NS_sys_time.inl index 1f7efda9fcb..5692bf0d8df 100644 --- a/ACE/ace/OS_NS_sys_time.inl +++ b/ACE/ace/OS_NS_sys_time.inl @@ -49,14 +49,14 @@ ACE_OS::gettimeofday () # if defined (ACE_HAS_TIMEZONE_GETTIMEOFDAY) || \ defined(ACE_HAS_VOIDPTR_GETTIMEOFDAY) || \ (defined (ACE_HAS_SVR4_GETTIMEOFDAY) && !defined (SCO)) - ACE_OSCALL (::gettimeofday (&tv, 0), int, -1, result); + ACE_OSCALL (::gettimeofday (&tv, 0), int, result); # elif defined (ACE_VXWORKS) // Assumes that struct timespec is same size as struct timeval, // which assumes that time_t is a long: it currently (VxWorks // 5.2/5.3) is. struct timespec ts; - ACE_OSCALL (ACE_OS::clock_gettime (CLOCK_REALTIME, &ts), int, -1, result); + ACE_OSCALL (ACE_OS::clock_gettime (CLOCK_REALTIME, &ts), int, result); tv.tv_sec = ts.tv_sec; tv.tv_usec = ts.tv_nsec / 1000L; // timespec has nsec, but timeval has usec # elif defined (ACE_MQX) @@ -68,7 +68,7 @@ ACE_OS::gettimeofday () # if defined (ACE_LACKS_GETTIMEOFDAY) ACE_NOTSUP_RETURN (ACE_Time_Value ((time_t)-1)); # else - ACE_OSCALL (::gettimeofday (&tv), int, -1, result); + ACE_OSCALL (::gettimeofday (&tv), int, result); # endif /* ACE_LACKS_GETTIMEOFDAY */ # endif /* ACE_HAS_SVR4_GETTIMEOFDAY */ #endif /* 0 */ diff --git a/ACE/ace/OS_NS_sys_uio.inl b/ACE/ace/OS_NS_sys_uio.inl index d31e7034e0f..71569b9b324 100644 --- a/ACE/ace/OS_NS_sys_uio.inl +++ b/ACE/ace/OS_NS_sys_uio.inl @@ -10,18 +10,12 @@ ACE_OS::readv (ACE_HANDLE handle, { ACE_OS_TRACE ("ACE_OS::readv"); #if defined (ACE_LACKS_READV) - ACE_OSCALL_RETURN (ACE_OS::readv_emulation (handle, iov, iovlen), - ssize_t, - -1); + ACE_OSCALL_RETURN (ACE_OS::readv_emulation (handle, iov, iovlen), ssize_t); #else /* ACE_LACKS_READV */ #if defined (ACE_HAS_NONCONST_READV) - ACE_OSCALL_RETURN (::readv (handle, - const_cast<iovec *>(iov), - iovlen), ssize_t, -1); + ACE_OSCALL_RETURN (::readv (handle, const_cast<iovec *>(iov), iovlen), ssize_t); #else - ACE_OSCALL_RETURN (::readv (handle, - iov, - iovlen), ssize_t, -1); + ACE_OSCALL_RETURN (::readv (handle, iov, iovlen), ssize_t); #endif /* ACE_HAS_NONCONST_READV */ #endif /* ACE_LACKS_READV */ } @@ -33,18 +27,12 @@ ACE_OS::writev (ACE_HANDLE handle, { ACE_OS_TRACE ("ACE_OS::writev"); #if defined (ACE_LACKS_WRITEV) - ACE_OSCALL_RETURN (ACE_OS::writev_emulation (handle, - iov, - iovcnt), ssize_t, -1); + ACE_OSCALL_RETURN (ACE_OS::writev_emulation (handle, iov, iovcnt), ssize_t); #else /* ACE_LACKS_WRITEV */ #if defined (ACE_HAS_NONCONST_WRITEV) - ACE_OSCALL_RETURN (::writev (handle, - const_cast<iovec *>(iov), - iovcnt), ssize_t, -1); + ACE_OSCALL_RETURN (::writev (handle, const_cast<iovec *>(iov), iovcnt), ssize_t); #else - ACE_OSCALL_RETURN (::writev (handle, - iov, - iovcnt), ssize_t, -1); + ACE_OSCALL_RETURN (::writev (handle, iov, iovcnt), ssize_t); #endif /* ACE_HAS_NONCONST_WRITEV */ #endif /* ACE_LACKS_WRITEV */ } diff --git a/ACE/ace/OS_NS_sys_utsname.cpp b/ACE/ace/OS_NS_sys_utsname.cpp index fd561ebac61..2ef6869593c 100644 --- a/ACE/ace/OS_NS_sys_utsname.cpp +++ b/ACE/ace/OS_NS_sys_utsname.cpp @@ -18,7 +18,7 @@ ACE_OS::uname (ACE_utsname *name) { ACE_OS_TRACE ("ACE_OS::uname"); #if !defined (ACE_LACKS_UNAME) - ACE_OSCALL_RETURN (::uname (name), int, -1); + ACE_OSCALL_RETURN (::uname (name), int); #elif defined (ACE_WIN32) size_t maxnamelen = sizeof name->nodename; ACE_OS::strcpy (name->sysname, "Win32"); diff --git a/ACE/ace/OS_NS_sys_wait.inl b/ACE/ace/OS_NS_sys_wait.inl index 1d687a8702d..e4885dbf404 100644 --- a/ACE/ace/OS_NS_sys_wait.inl +++ b/ACE/ace/OS_NS_sys_wait.inl @@ -12,7 +12,7 @@ ACE_OS::wait (int *status) ACE_UNUSED_ARG (status); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::wait (status), pid_t, -1); + ACE_OSCALL_RETURN (::wait (status), pid_t); #endif /* ACE_LACKS_WAIT */ } @@ -75,8 +75,7 @@ ACE_OS::waitpid (pid_t pid, return result; #else ACE_UNUSED_ARG (handle); - ACE_OSCALL_RETURN (::waitpid (pid, status, wait_options), - pid_t, -1); + ACE_OSCALL_RETURN (::waitpid (pid, status, wait_options), pid_t); #endif /* ACE_LACKS_WAITPID */ } diff --git a/ACE/ace/OS_NS_time.cpp b/ACE/ace/OS_NS_time.cpp index 2ab3c7ebe47..870ee572f6d 100644 --- a/ACE/ace/OS_NS_time.cpp +++ b/ACE/ace/OS_NS_time.cpp @@ -278,7 +278,7 @@ ACE_OS::localtime_r (const time_t *t, struct tm *res) ACE_UNUSED_ARG (res); struct tm * res_ptr = 0; - ACE_OSCALL (::localtime (t), struct tm *, 0, res_ptr); + ACE_OSCALL (::localtime (t), struct tm *, res_ptr); if (res_ptr == 0) return 0; else @@ -315,7 +315,7 @@ ACE_OS::mktime (struct tm *t) ACE_OS_GUARD # endif /* ACE_HAS_THREADS && ! ACE_HAS_MT_SAFE_MKTIME */ - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::mktime (t), time_t, (time_t) -1); + ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::mktime (t), time_t); # endif /* ACE_HAS_WINCE */ } diff --git a/ACE/ace/OS_NS_time.h b/ACE/ace/OS_NS_time.h index 6b115e6bc61..d155dc3636f 100644 --- a/ACE/ace/OS_NS_time.h +++ b/ACE/ace/OS_NS_time.h @@ -67,7 +67,7 @@ inline long ace_timezone() struct timeval time; struct timezone zone; ACE_UNUSED_ARG (result); - ACE_OSCALL (::gettimeofday (&time, &zone), int, -1, result); + ACE_OSCALL (::gettimeofday (&time, &zone), int, result); return zone.tz_minuteswest * 60; #else ACE_NOTSUP_RETURN (0); diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl index fee739324e7..5f8a4128fbc 100644 --- a/ACE/ace/OS_NS_time.inl +++ b/ACE/ace/OS_NS_time.inl @@ -15,7 +15,7 @@ ACE_OS::asctime (const struct tm *t) ACE_UNUSED_ARG (t); ACE_NOTSUP_RETURN (0); #else - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::asctime (t), char *, 0); + ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::asctime (t), char *); #endif /* ACE_LACKS_ASCTIME */ } @@ -31,9 +31,9 @@ ACE_OS::asctime_r (const struct tm *t, char *buf, int buflen) return buf; # else # if defined (ACE_HAS_SIZET_PTR_ASCTIME_R_AND_CTIME_R) - ACE_OSCALL_RETURN (::asctime_r (t, buf, reinterpret_cast<size_t*>(&buflen)), char *, 0); + ACE_OSCALL_RETURN (::asctime_r (t, buf, reinterpret_cast<size_t*>(&buflen)), char *); # else - ACE_OSCALL_RETURN (::asctime_r (t, buf, buflen), char *, 0); + ACE_OSCALL_RETURN (::asctime_r (t, buf, buflen), char *); # endif /* ACE_HAS_SIZET_PTR_ASCTIME_R_AND_CTIME_R */ # endif /* ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R */ #elif defined (ACE_HAS_TR24731_2005_CRT) @@ -48,7 +48,7 @@ ACE_OS::asctime_r (const struct tm *t, char *buf, int buflen) ACE_NOTSUP_RETURN (0); #else char *result = 0; - ACE_OSCALL (ACE_STD_NAMESPACE::asctime (t), char *, 0, result); + ACE_OSCALL (ACE_STD_NAMESPACE::asctime (t), char *, result); ACE_OS::strsncpy (buf, result, buflen); return buf; #endif /* ACE_HAS_REENTRANT_FUNCTIONS */ @@ -59,7 +59,7 @@ ACE_OS::clock_gettime (clockid_t clockid, struct timespec *ts) { ACE_OS_TRACE ("ACE_OS::clock_gettime"); #if defined (ACE_HAS_CLOCK_GETTIME) - ACE_OSCALL_RETURN (::clock_gettime (clockid, ts), int, -1); + ACE_OSCALL_RETURN (::clock_gettime (clockid, ts), int); #else ACE_UNUSED_ARG (clockid); ACE_UNUSED_ARG (ts); @@ -72,9 +72,9 @@ ACE_OS::clock_settime (clockid_t clockid, const struct timespec *ts) { #if defined (ACE_HAS_CLOCK_SETTIME) # if defined (ACE_HAS_NONCONST_CLOCK_SETTIME) - ACE_OSCALL_RETURN (::clock_settime (clockid, const_cast<struct timespec *>(ts)), int, -1); + ACE_OSCALL_RETURN (::clock_settime (clockid, const_cast<struct timespec *>(ts)), int); # else - ACE_OSCALL_RETURN (::clock_settime (clockid, ts), int, -1); + ACE_OSCALL_RETURN (::clock_settime (clockid, ts), int); # endif /* ACE_HAS_NONCONST_CLOCK_SETTIME */ #else ACE_UNUSED_ARG (clockid); @@ -99,11 +99,11 @@ ACE_OS::ctime (const time_t *t) buf, ctime_buf_size); #elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_OSCALL_RETURN (::_wctime (t), wchar_t *, 0); + ACE_OSCALL_RETURN (::_wctime (t), wchar_t *); #else # if defined (ACE_USES_WCHAR) /* Not Win32, else it would do the above */ char *narrow_time; - ACE_OSCALL (::ctime (t), char *, 0, narrow_time); + ACE_OSCALL (::ctime (t), char *, narrow_time); if (narrow_time == 0) return 0; // ACE_Ascii_To_Wide::convert allocates (via new []) a wchar_t[]. If @@ -116,7 +116,7 @@ ACE_OS::ctime (const time_t *t) wide_time = ACE_Ascii_To_Wide::convert (narrow_time); return wide_time; # else - ACE_OSCALL_RETURN (::ctime (t), char *, 0); + ACE_OSCALL_RETURN (::ctime (t), char *); # endif /* ACE_USES_WCHAR */ # endif /* ACE_HAS_WINCE */ } @@ -143,7 +143,7 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen) return 0; } # if defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R) - ACE_OSCALL (::ctime_r (t, bufp), char *, 0, bufp); + ACE_OSCALL (::ctime_r (t, bufp), char *, bufp); # else /* ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R */ # if defined (ACE_HAS_SIZET_PTR_ASCTIME_R_AND_CTIME_R) @@ -188,9 +188,9 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen) ACE_TCHAR *result = 0; # if defined (ACE_USES_WCHAR) - ACE_OSCALL (::_wctime (t), wchar_t *, 0, result); + ACE_OSCALL (::_wctime (t), wchar_t *, result); # else /* ACE_USES_WCHAR */ - ACE_OSCALL (::ctime (t), char *, 0, result); + ACE_OSCALL (::ctime (t), char *, result); # endif /* ACE_USES_WCHAR */ if (result != 0) ACE_OS::strsncpy (buf, result, buflen); @@ -350,7 +350,7 @@ ACE_OS::gmtime (const time_t *t) ACE_UNUSED_ARG (t); ACE_NOTSUP_RETURN (0); #else - ACE_OSCALL_RETURN (::gmtime (t), struct tm *, 0); + ACE_OSCALL_RETURN (::gmtime (t), struct tm *); #endif /* ACE_LACKS_GMTIME */ } @@ -370,7 +370,7 @@ ACE_OS::gmtime_r (const time_t *t, struct tm *res) ACE_NOTSUP_RETURN (0); #else struct tm *result; - ACE_OSCALL (::gmtime (t), struct tm *, 0, result) ; + ACE_OSCALL (::gmtime (t), struct tm *, result) ; if (result != 0) *res = *result; return res; @@ -385,7 +385,7 @@ ACE_OS::localtime (const time_t *t) ACE_UNUSED_ARG (t); ACE_NOTSUP_RETURN (0); #else - ACE_OSCALL_RETURN (::localtime (t), struct tm *, 0); + ACE_OSCALL_RETURN (::localtime (t), struct tm *); #endif /* ACE_LACKS_LOCALTIME */ } @@ -446,7 +446,7 @@ ACE_OS::time (time_t *tloc) *tloc = retv; return retv; #else - ACE_OSCALL_RETURN (::time (tloc), time_t, (time_t) -1); + ACE_OSCALL_RETURN (::time (tloc), time_t); #endif /* ACE_LACKS_TIME */ } diff --git a/ACE/ace/OS_NS_unistd.cpp b/ACE/ace/OS_NS_unistd.cpp index 04900f3d318..2a4b6d0658c 100644 --- a/ACE/ace/OS_NS_unistd.cpp +++ b/ACE/ace/OS_NS_unistd.cpp @@ -231,7 +231,7 @@ ACE_OS::execl (const char * /* path */, const char * /* arg0 */, ...) ACE_OS_TRACE ("ACE_OS::execl"); ACE_NOTSUP_RETURN (-1); // Need to write this code. - // ACE_OSCALL_RETURN (::execv (path, argv), int, -1); + // ACE_OSCALL_RETURN (::execv (path, argv), int); } int @@ -240,7 +240,7 @@ ACE_OS::execle (const char * /* path */, const char * /* arg0 */, ...) ACE_OS_TRACE ("ACE_OS::execle"); ACE_NOTSUP_RETURN (-1); // Need to write this code. - // ACE_OSCALL_RETURN (::execve (path, argv, envp), int, -1); + // ACE_OSCALL_RETURN (::execve (path, argv, envp), int); } int @@ -249,7 +249,7 @@ ACE_OS::execlp (const char * /* file */, const char * /* arg0 */, ...) ACE_OS_TRACE ("ACE_OS::execlp"); ACE_NOTSUP_RETURN (-1); // Need to write this code. - // ACE_OSCALL_RETURN (::execvp (file, argv), int, -1); + // ACE_OSCALL_RETURN (::execvp (file, argv), int); } pid_t diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl index bb29b1cfcee..704244fd66b 100644 --- a/ACE/ace/OS_NS_unistd.inl +++ b/ACE/ace/OS_NS_unistd.inl @@ -59,12 +59,12 @@ ACE_OS::access (const char *path, int amode) #elif defined(ACE_WIN32) // Windows doesn't support checking X_OK(6) # if defined (ACE_ACCESS_EQUIVALENT) - ACE_OSCALL_RETURN (ACE_ACCESS_EQUIVALENT (path, amode & 6), int, -1); + ACE_OSCALL_RETURN (ACE_ACCESS_EQUIVALENT (path, amode & 6), int); # else - ACE_OSCALL_RETURN (::access (path, amode & 6), int, -1); + ACE_OSCALL_RETURN (::access (path, amode & 6), int); # endif #else - ACE_OSCALL_RETURN (::access (path, amode), int, -1); + ACE_OSCALL_RETURN (::access (path, amode), int); #endif /* ACE_LACKS_ACCESS */ } @@ -74,7 +74,7 @@ ACE_INLINE int ACE_OS::access (const wchar_t *path, int amode) { #if defined (ACE_WIN32) && !defined (ACE_LACKS__WACCESS) - ACE_OSCALL_RETURN (::_waccess (path, amode), int, -1); + ACE_OSCALL_RETURN (::_waccess (path, amode), int); #else /* ACE_WIN32 && !ACE_HAS_WINCE */ return ACE_OS::access (ACE_Wide_To_Ascii (path).char_rep (), amode); #endif /* ACE_WIN32 && !ACE_LACKS__WACCESS */ @@ -131,11 +131,11 @@ ACE_OS::chdir (const char *path) ACE_UNUSED_ARG (path); ACE_NOTSUP_RETURN (-1); #elif defined (ACE_HAS_NONCONST_CHDIR) - ACE_OSCALL_RETURN (::chdir (const_cast<char *> (path)), int, -1); + ACE_OSCALL_RETURN (::chdir (const_cast<char *> (path)), int); #elif defined (ACE_CHDIR_EQUIVALENT) - ACE_OSCALL_RETURN (ACE_CHDIR_EQUIVALENT (path), int, -1); + ACE_OSCALL_RETURN (ACE_CHDIR_EQUIVALENT (path), int); #else - ACE_OSCALL_RETURN (::chdir (path), int, -1); + ACE_OSCALL_RETURN (::chdir (path), int); #endif /* ACE_HAS_NONCONST_CHDIR */ } @@ -147,7 +147,7 @@ ACE_OS::chdir (const wchar_t *path) ACE_UNUSED_ARG (path); ACE_NOTSUP_RETURN (-1); #elif defined (ACE_WIN32) - ACE_OSCALL_RETURN (::_wchdir (path), int, -1); + ACE_OSCALL_RETURN (::_wchdir (path), int); #else /* ACE_WIN32 */ return ACE_OS::chdir (ACE_Wide_To_Ascii (path).char_rep ()); #endif /* ACE_WIN32 */ @@ -162,9 +162,9 @@ ACE_OS::rmdir (const char *path) ace_result_), int, -1); #elif defined (ACE_RMDIR_EQUIVALENT) - ACE_OSCALL_RETURN (ACE_RMDIR_EQUIVALENT (path), int, -1); + ACE_OSCALL_RETURN (ACE_RMDIR_EQUIVALENT (path), int); #else - ACE_OSCALL_RETURN (::rmdir (path), int, -1); + ACE_OSCALL_RETURN (::rmdir (path), int); #endif /* ACE_WIN32 */ } @@ -177,7 +177,7 @@ ACE_OS::rmdir (const wchar_t *path) ace_result_), int, -1); #elif defined (ACE_WIN32) - ACE_OSCALL_RETURN (::_wrmdir (path), int, -1); + ACE_OSCALL_RETURN (::_wrmdir (path), int); #else ACE_Wide_To_Ascii n_path (path); return ACE_OS::rmdir (n_path.char_rep ()); @@ -198,7 +198,7 @@ ACE_OS::close (ACE_HANDLE handle) #elif defined (ACE_MQX) return MQX_Filesystem::inst ().close (handle); #else - ACE_OSCALL_RETURN (::close (handle), int, -1); + ACE_OSCALL_RETURN (::close (handle), int); #endif /* ACE_WIN32 */ } @@ -223,7 +223,7 @@ ACE_OS::dup (ACE_HANDLE handle) ACE_FAIL_RETURN (ACE_INVALID_HANDLE); /* NOTREACHED */ #else - ACE_OSCALL_RETURN (::dup (handle), ACE_HANDLE, ACE_INVALID_HANDLE); + ACE_OSCALL_RETURN (::dup (handle), ACE_HANDLE); #endif /* ACE_LACKS_DUP */ } @@ -256,7 +256,7 @@ ACE_OS::dup(ACE_HANDLE handle, pid_t pid) /*NOTREACHED*/ #else ACE_UNUSED_ARG (pid); - ACE_OSCALL_RETURN(::dup(handle), ACE_HANDLE, ACE_INVALID_HANDLE); + ACE_OSCALL_RETURN(::dup(handle), ACE_HANDLE); #endif /*ACE_WIN32 && !ACE_HAS_WINCE*/ } @@ -270,7 +270,7 @@ ACE_OS::dup2 (ACE_HANDLE oldhandle, ACE_HANDLE newhandle) ACE_UNUSED_ARG (newhandle); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::dup2 (oldhandle, newhandle), int, -1); + ACE_OSCALL_RETURN (::dup2 (oldhandle, newhandle), int); #endif /* ACE_LACKS_DUP2 */ } @@ -298,7 +298,7 @@ ACE_OS::execv (const char *path, return -1; # endif /* __BORLANDC__ */ #else - ACE_OSCALL_RETURN (::execv (path, argv), int, -1); + ACE_OSCALL_RETURN (::execv (path, argv), int); #endif /* ACE_LACKS_EXEC */ } @@ -328,7 +328,7 @@ ACE_OS::execve (const char *path, return -1; # endif /* __BORLANDC__ */ #else - ACE_OSCALL_RETURN (::execve (path, argv, envp), int, -1); + ACE_OSCALL_RETURN (::execve (path, argv, envp), int); #endif /* ACE_LACKS_EXEC */ } @@ -356,7 +356,7 @@ ACE_OS::execvp (const char *file, return -1; # endif /* __BORLANDC__ */ #else - ACE_OSCALL_RETURN (::execvp (file, argv), int, -1); + ACE_OSCALL_RETURN (::execvp (file, argv), int); #endif /* ACE_LACKS_EXEC */ } @@ -367,7 +367,7 @@ ACE_OS::fork () #if defined (ACE_LACKS_FORK) ACE_NOTSUP_RETURN (pid_t (-1)); #else - ACE_OSCALL_RETURN (::fork (), pid_t, -1); + ACE_OSCALL_RETURN (::fork (), pid_t); #endif /* ACE_LACKS_FORK */ } @@ -381,7 +381,7 @@ ACE_OS::fsync (ACE_HANDLE handle) # elif defined (ACE_WIN32) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::FlushFileBuffers (handle), ace_result_), int, -1); # else - ACE_OSCALL_RETURN (::fsync (handle), int, -1); + ACE_OSCALL_RETURN (::fsync (handle), int); # endif /* ACE_LACKS_FSYNC */ } @@ -406,7 +406,7 @@ ACE_OS::ftruncate (ACE_HANDLE handle, ACE_OFF_T offset) #elif defined (ACE_LACKS_FTRUNCATE) ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::ftruncate (handle, offset), int, -1); + ACE_OSCALL_RETURN (::ftruncate (handle, offset), int); #endif /* ACE_WIN32 */ } @@ -423,7 +423,7 @@ ACE_OS::getcwd (char *buf, size_t size) #elif defined (ACE_WIN32) return ::getcwd (buf, static_cast<int> (size)); #else - ACE_OSCALL_RETURN (::getcwd (buf, size), char *, 0); + ACE_OSCALL_RETURN (::getcwd (buf, size), char*); #endif /* ACE_LACKS_GETCWD */ } @@ -457,7 +457,7 @@ ACE_OS::getgid () #if defined (ACE_LACKS_GETGID) ACE_NOTSUP_RETURN (static_cast<gid_t> (-1)); # else - ACE_OSCALL_RETURN (::getgid (), gid_t, static_cast<gid_t> (-1)); + ACE_OSCALL_RETURN (::getgid (), gid_t); # endif /* ACE_LACKS_GETGID */ } @@ -468,7 +468,7 @@ ACE_OS::getegid () #if defined (ACE_LACKS_GETEGID) ACE_NOTSUP_RETURN (static_cast<gid_t> (-1)); # else - ACE_OSCALL_RETURN (::getegid (), gid_t, static_cast<gid_t> (-1)); + ACE_OSCALL_RETURN (::getegid (), gid_t); # endif /* ACE_LACKS_GETEGID */ } @@ -482,7 +482,7 @@ ACE_OS::getopt (int argc, char *const *argv, const char *optstring) ACE_UNUSED_ARG (optstring); ACE_NOTSUP_RETURN (-1); # else - ACE_OSCALL_RETURN (::getopt (argc, argv, optstring), int, -1); + ACE_OSCALL_RETURN (::getopt (argc, argv, optstring), int); # endif /* ACE_LACKS_GETOPT */ } @@ -498,9 +498,9 @@ ACE_OS::getpgid (pid_t pid) // doesn't enable its prototype by default. // Rather than create our own extern prototype, just use the one // that is visible (ugh). - ACE_OSCALL_RETURN (::__getpgid (pid), pid_t, -1); + ACE_OSCALL_RETURN (::__getpgid (pid), pid_t); #else - ACE_OSCALL_RETURN (::getpgid (pid), pid_t, -1); + ACE_OSCALL_RETURN (::getpgid (pid), pid_t); #endif /* ACE_LACKS_GETPGID */ } @@ -513,7 +513,7 @@ ACE_OS::getpid () #elif defined (ACE_WIN32) return ::GetCurrentProcessId (); #else - ACE_OSCALL_RETURN (::getpid (), pid_t, -1); + ACE_OSCALL_RETURN (::getpid (), pid_t); #endif /* ACE_LACKS_GETPID */ } @@ -524,7 +524,7 @@ ACE_OS::getppid () #if defined (ACE_LACKS_GETPPID) ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::getppid (), pid_t, -1); + ACE_OSCALL_RETURN (::getppid (), pid_t); #endif /* ACE_LACKS_GETPPID */ } @@ -535,7 +535,7 @@ ACE_OS::getuid () #if defined (ACE_LACKS_GETUID) ACE_NOTSUP_RETURN (static_cast<uid_t> (-1)); # else - ACE_OSCALL_RETURN (::getuid (), uid_t, static_cast<uid_t> (-1)); + ACE_OSCALL_RETURN (::getuid (), uid_t); # endif /* ACE_LACKS_GETUID*/ } @@ -546,7 +546,7 @@ ACE_OS::geteuid () #if defined (ACE_LACKS_GETEUID) ACE_NOTSUP_RETURN (static_cast<uid_t> (-1)); # else - ACE_OSCALL_RETURN (::geteuid (), uid_t, (uid_t) -1); + ACE_OSCALL_RETURN (::geteuid (), uid_t); # endif /* ACE_LACKS_GETEUID */ } @@ -567,7 +567,7 @@ ACE_OS::hostname (char name[], size_t maxnamelen) ACE_NOTSUP_RETURN (-1); # endif /* ACE_HAS_PHARLAP_RT */ #elif defined (ACE_VXWORKS) || defined (ACE_HAS_WINCE) - ACE_OSCALL_RETURN (::gethostname (name, maxnamelen), int, -1); + ACE_OSCALL_RETURN (::gethostname (name, maxnamelen), int); #elif defined (ACE_WIN32) if (::gethostname (name, ACE_Utils::truncate_cast<int> (maxnamelen)) == 0) { @@ -636,7 +636,7 @@ ACE_OS::isatty (int handle) # elif defined (ACE_WIN32) return ::_isatty (handle); # else - ACE_OSCALL_RETURN (::isatty (handle), int, -1); + ACE_OSCALL_RETURN (::isatty (handle), int); # endif /* ACE_LACKS_ISATTY */ } @@ -710,7 +710,7 @@ ACE_OS::lseek (ACE_HANDLE handle, ACE_OFF_T offset, int whence) } return static_cast<ACE_OFF_T> (MQX_Filesystem::inst ().lseek (handle, offset, whence)); #else - ACE_OSCALL_RETURN (::lseek (handle, offset, whence), ACE_OFF_T, -1); + ACE_OSCALL_RETURN (::lseek (handle, offset, whence), ACE_OFF_T); #endif /* ACE_WIN32 */ } @@ -726,7 +726,7 @@ ACE_OS::llseek (ACE_HANDLE handle, ACE_LOFF_T offset, int whence) #elif defined (ACE_HAS_LLSEEK) && defined (ACE_HAS_LSEEK64) # error Either ACE_HAS_LSEEK64 and ACE_HAS_LLSEEK should be defined, not both! #elif defined (ACE_HAS_LSEEK64) - ACE_OSCALL_RETURN (::lseek64 (handle, offset, whence), ACE_LOFF_T, -1); + ACE_OSCALL_RETURN (::lseek64 (handle, offset, whence), ACE_LOFF_T); #elif defined (ACE_HAS_LLSEEK) # if defined (ACE_WIN32) # ifndef ACE_LACKS_WIN32_SETFILEPOINTEREX @@ -755,7 +755,7 @@ ACE_OS::llseek (ACE_HANDLE handle, ACE_LOFF_T offset, int whence) return l_offset.QuadPart; # endif /* ACE_LACKS_WIN32_SETFILEPOINTEREX */ # else - ACE_OSCALL_RETURN (::llseek (handle, offset, whence), ACE_LOFF_T, -1); + ACE_OSCALL_RETURN (::llseek (handle, offset, whence), ACE_LOFF_T); # endif /* WIN32 */ #endif } @@ -780,9 +780,9 @@ ACE_OS::read (ACE_HANDLE handle, void *buf, size_t len) ssize_t result; # if defined (ACE_HAS_CHARPTR_SOCKOPT) - ACE_OSCALL (::read (handle, static_cast <char *> (buf), len), ssize_t, -1, result); + ACE_OSCALL (::read (handle, static_cast <char *> (buf), len), ssize_t, -result); # else - ACE_OSCALL (::read (handle, buf, len), ssize_t, -1, result); + ACE_OSCALL (::read (handle, buf, len), ssize_t, result); # endif /* ACE_HAS_CHARPTR_SOCKOPT */ # if !(defined (EAGAIN) && defined (EWOULDBLOCK) && EAGAIN == EWOULDBLOCK) @@ -833,10 +833,9 @@ ACE_OS::readlink (const char *path, char *buf, size_t bufsiz) ACE_UNUSED_ARG (bufsiz); ACE_NOTSUP_RETURN (-1); # elif defined(ACE_HAS_NONCONST_READLINK) - ACE_OSCALL_RETURN ( - ::readlink (const_cast <char *>(path), buf, bufsiz), ssize_t, -1); + ACE_OSCALL_RETURN (::readlink (const_cast <char *>(path), buf, bufsiz), ssize_t); # else - ACE_OSCALL_RETURN (::readlink (path, buf, bufsiz), ssize_t, -1); + ACE_OSCALL_RETURN (::readlink (path, buf, bufsiz), ssize_t); # endif /* ACE_LACKS_READLINK */ } @@ -852,7 +851,7 @@ ACE_OS::pipe (ACE_HANDLE fds[]) (::CreatePipe (&fds[0], &fds[1], 0, 0), ace_result_), int, -1); # else - ACE_OSCALL_RETURN (::pipe (fds), int, -1); + ACE_OSCALL_RETURN (::pipe (fds), int); # endif /* ACE_LACKS_PIPE */ } @@ -863,7 +862,7 @@ ACE_OS::sbrk (intptr_t brk) ACE_UNUSED_ARG (brk); ACE_NOTSUP_RETURN (0); #else - ACE_OSCALL_RETURN (::sbrk (brk), void *, 0); + ACE_OSCALL_RETURN (::sbrk (brk), void *); #endif /* ACE_LACKS_SBRK */ } @@ -875,7 +874,7 @@ ACE_OS::setgid (gid_t gid) ACE_UNUSED_ARG (gid); ACE_NOTSUP_RETURN (-1); # else - ACE_OSCALL_RETURN (::setgid (gid), int, -1); + ACE_OSCALL_RETURN (::setgid (gid), int); # endif /* ACE_LACKS_SETGID */ } @@ -887,7 +886,7 @@ ACE_OS::setegid (gid_t gid) ACE_UNUSED_ARG (gid); ACE_NOTSUP_RETURN (-1); # else - ACE_OSCALL_RETURN (::setegid (gid), int, -1); + ACE_OSCALL_RETURN (::setegid (gid), int); # endif /* ACE_LACKS_SETEGID */ } @@ -900,7 +899,7 @@ ACE_OS::setpgid (pid_t pid, pid_t pgid) ACE_UNUSED_ARG (pgid); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::setpgid (pid, pgid), int, -1); + ACE_OSCALL_RETURN (::setpgid (pid, pgid), int); #endif /* ACE_LACKS_SETPGID */ } @@ -913,7 +912,7 @@ ACE_OS::setregid (gid_t rgid, gid_t egid) ACE_UNUSED_ARG (egid); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::setregid (rgid, egid), int, -1); + ACE_OSCALL_RETURN (::setregid (rgid, egid), int); #endif /* ACE_LACKS_SETREGID */ } @@ -926,7 +925,7 @@ ACE_OS::setreuid (uid_t ruid, uid_t euid) ACE_UNUSED_ARG (euid); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::setreuid (ruid, euid), int, -1); + ACE_OSCALL_RETURN (::setreuid (ruid, euid), int); #endif /* ACE_LACKS_SETREUID */ } @@ -937,7 +936,7 @@ ACE_OS::setsid () #if defined (ACE_LACKS_SETSID) ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::setsid (), int, -1); + ACE_OSCALL_RETURN (::setsid (), int); # endif /* ACE_LACKS_SETSID */ } @@ -949,7 +948,7 @@ ACE_OS::setuid (uid_t uid) ACE_UNUSED_ARG (uid); ACE_NOTSUP_RETURN (-1); # else - ACE_OSCALL_RETURN (::setuid (uid), int, -1); + ACE_OSCALL_RETURN (::setuid (uid), int); # endif /* ACE_LACKS_SETUID */ } @@ -961,7 +960,7 @@ ACE_OS::seteuid (uid_t uid) ACE_UNUSED_ARG (uid); ACE_NOTSUP_RETURN (-1); # else - ACE_OSCALL_RETURN (::seteuid (uid), int, -1); + ACE_OSCALL_RETURN (::seteuid (uid), int); # endif /* ACE_LACKS_SETEUID */ } @@ -975,7 +974,7 @@ ACE_OS::sleep (u_int seconds) rqtp.tv_sec = seconds; rqtp.tv_nsec = 0L; //FUZZ: disable check_for_lack_ACE_OS - ACE_OSCALL_RETURN (::nanosleep (&rqtp, 0), int, -1); + ACE_OSCALL_RETURN (::nanosleep (&rqtp, 0), int); //FUZZ: enable check_for_lack_ACE_OS #elif defined (ACE_LACKS_SLEEP) ACE_UNUSED_ARG (seconds); @@ -987,7 +986,7 @@ ACE_OS::sleep (u_int seconds) _time_delay (seconds * ACE_ONE_SECOND_IN_MSECS); return 0; #else - ACE_OSCALL_RETURN (::sleep (seconds), int, -1); + ACE_OSCALL_RETURN (::sleep (seconds), int); #endif /* ACE_WIN32 */ } @@ -1004,7 +1003,7 @@ ACE_OS::sleep (const ACE_Time_Value &tv) #elif defined (ACE_HAS_CLOCK_GETTIME) timespec_t rqtp = tv; //FUZZ: disable check_for_lack_ACE_OS - ACE_OSCALL_RETURN (::nanosleep (&rqtp, 0), int, -1); + ACE_OSCALL_RETURN (::nanosleep (&rqtp, 0), int); //FUZZ: enable check_for_lack_ACE_OS #else # if defined (ACE_HAS_NONCONST_SELECT_TIMEVAL) @@ -1012,12 +1011,12 @@ ACE_OS::sleep (const ACE_Time_Value &tv) // as a pointer to const. timeval tv_copy = tv; //FUZZ: disable check_for_lack_ACE_OS - ACE_OSCALL_RETURN (::select (0, 0, 0, 0, &tv_copy), int, -1); + ACE_OSCALL_RETURN (::select (0, 0, 0, 0, &tv_copy), int); //FUZZ: enable check_for_lack_ACE_OS # else /* ! ACE_HAS_NONCONST_SELECT_TIMEVAL */ const timeval *tvp = tv; //FUZZ: disable check_for_lack_ACE_OS - ACE_OSCALL_RETURN (::select (0, 0, 0, 0, tvp), int, -1); + ACE_OSCALL_RETURN (::select (0, 0, 0, 0, tvp), int); //FUZZ: enable check_for_lack_ACE_OS # endif /* ACE_HAS_NONCONST_SELECT_TIMEVAL */ #endif /* ACE_WIN32 */ @@ -1093,7 +1092,7 @@ ACE_OS::sysconf (int name) ACE_UNUSED_ARG (name); ACE_NOTSUP_RETURN (-1); #else - ACE_OSCALL_RETURN (::sysconf (name), long, -1); + ACE_OSCALL_RETURN (::sysconf (name), long); #endif /* ACE_LACKS_SYSCONF */ } @@ -1102,7 +1101,7 @@ ACE_OS::sysinfo (int cmd, char *buf, long count) { ACE_OS_TRACE ("ACE_OS::sysinfo"); #if defined (ACE_HAS_SYSV_SYSINFO) - ACE_OSCALL_RETURN (::sysinfo (cmd, buf, count), long, -1); + ACE_OSCALL_RETURN (::sysinfo (cmd, buf, count), long); #else ACE_UNUSED_ARG (cmd); ACE_UNUSED_ARG (buf); @@ -1157,8 +1156,7 @@ ACE_OS::truncate (const ACE_TCHAR *filename, } /* NOTREACHED */ #elif !defined (ACE_LACKS_TRUNCATE) - ACE_OSCALL_RETURN - (::truncate (ACE_TEXT_ALWAYS_CHAR (filename), offset), int, -1); + ACE_OSCALL_RETURN (::truncate (ACE_TEXT_ALWAYS_CHAR (filename), offset), int); #else ACE_UNUSED_ARG (filename); ACE_UNUSED_ARG (offset); @@ -1217,7 +1215,7 @@ ACE_OS::unlink (const char *path) { ACE_OS_TRACE ("ACE_OS::unlink"); # if defined (ACE_HAS_NONCONST_UNLINK) - ACE_OSCALL_RETURN (::unlink (const_cast<char *> (path)), int, -1); + ACE_OSCALL_RETURN (::unlink (const_cast<char *> (path)), int); # elif defined (ACE_HAS_WINCE) // @@ The problem is, DeleteFile is not actually equals to unlink. ;( ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::DeleteFile (ACE_TEXT_CHAR_TO_TCHAR (path)), ace_result_), @@ -1226,9 +1224,9 @@ ACE_OS::unlink (const char *path) ACE_UNUSED_ARG (path); ACE_NOTSUP_RETURN (-1); # elif defined (ACE_UNLINK_EQUIVALENT) - ACE_OSCALL_RETURN (ACE_UNLINK_EQUIVALENT (path), int, -1); + ACE_OSCALL_RETURN (ACE_UNLINK_EQUIVALENT (path), int); # else - ACE_OSCALL_RETURN (::unlink (path), int, -1); + ACE_OSCALL_RETURN (::unlink (path), int); # endif /* ACE_HAS_NONCONST_UNLINK */ } @@ -1242,7 +1240,7 @@ ACE_OS::unlink (const wchar_t *path) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::DeleteFileW (path), ace_result_), int, -1); # elif defined (ACE_WIN32) - ACE_OSCALL_RETURN (::_wunlink (path), int, -1); + ACE_OSCALL_RETURN (::_wunlink (path), int); # else ACE_Wide_To_Ascii npath (path); return ACE_OS::unlink (npath.char_rep ()); @@ -1268,9 +1266,9 @@ ACE_OS::write (ACE_HANDLE handle, const void *buf, size_t nbyte) return MQX_Filesystem::inst ().write (handle, reinterpret_cast<const unsigned char *> (buf), nbyte); #else # if defined (ACE_HAS_CHARPTR_SOCKOPT) - ACE_OSCALL_RETURN (::write (handle, static_cast <char *> (const_cast <void *> (buf)), nbyte), ssize_t, -1); + ACE_OSCALL_RETURN (::write (handle, static_cast <char *> (const_cast <void *> (buf)), nbyte), ssize_t); # else - ACE_OSCALL_RETURN (::write (handle, buf, nbyte), ssize_t, -1); + ACE_OSCALL_RETURN (::write (handle, buf, nbyte), ssize_t); # endif /* ACE_HAS_CHARPTR_SOCKOPT */ #endif /* ACE_WIN32 */ } diff --git a/ACE/ace/OS_NS_wchar.inl b/ACE/ace/OS_NS_wchar.inl index 0b11e61e303..b5e8fedaef7 100644 --- a/ACE/ace/OS_NS_wchar.inl +++ b/ACE/ace/OS_NS_wchar.inl @@ -9,7 +9,7 @@ ACE_OS::fgetwc (FILE* fp) ACE_UNUSED_ARG (fp); ACE_NOTSUP_RETURN (0); # else - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgetwc (fp), wint_t, WEOF); + ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgetwc (fp), wint_t); # endif /* ACE_LACKS_FGETWC */ } #endif /* ACE_HAS_WCHAR */ @@ -76,7 +76,7 @@ ACE_OS::ungetwc (wint_t c, FILE* fp) ACE_UNUSED_ARG (fp); ACE_NOTSUP_RETURN (0); # else - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::ungetwc (c, fp), wint_t, WEOF); + ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::ungetwc (c, fp), wint_t); # endif /* ACE_LACKS_FGETWC */ } #endif /* ACE_HAS_WCHAR */ diff --git a/ACE/ace/OS_TLI.inl b/ACE/ace/OS_TLI.inl index 7104344cac6..0a3045a1788 100644 --- a/ACE/ace/OS_TLI.inl +++ b/ACE/ace/OS_TLI.inl @@ -9,7 +9,7 @@ ACE_INLINE int t_accept (ACE_HANDLE handle, ACE_HANDLE reshandle, struct t_call *call) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_accept (handle, reshandle, call), int, -1); + ACE_OSCALL_RETURN (::t_accept (handle, reshandle, call), int); #else ACE_UNUSED_ARG (call); ACE_UNUSED_ARG (reshandle); @@ -27,11 +27,10 @@ t_alloc (ACE_HANDLE handle, int struct_type, int fields) // XPG5 changes t_alloc() return from char* to void*, so ACE_OSCALL_RETURN // doesn't compile correctly. char *result; - ACE_OSCALL (::t_alloc (handle, struct_type, fields), char *, 0, result); + ACE_OSCALL (::t_alloc (handle, struct_type, fields), char *, result); return result; # else - ACE_OSCALL_RETURN (::t_alloc (handle, struct_type, fields), - char *, 0); + ACE_OSCALL_RETURN (::t_alloc (handle, struct_type, fields), char *); # endif /* XPG4 vs XPG5 */ #else ACE_UNUSED_ARG (fields); @@ -46,7 +45,7 @@ ACE_INLINE int t_bind (ACE_HANDLE handle, ACE_TBIND *req, ACE_TBIND *ret) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_bind (handle, req, ret), int, -1); + ACE_OSCALL_RETURN (::t_bind (handle, req, ret), int); #else ACE_UNUSED_ARG (ret); ACE_UNUSED_ARG (req); @@ -60,7 +59,7 @@ ACE_INLINE int t_close (ACE_HANDLE handle) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_close (handle), int, -1); + ACE_OSCALL_RETURN (::t_close (handle), int); #else ACE_UNUSED_ARG (handle); @@ -74,7 +73,7 @@ t_connect(ACE_HANDLE fildes, struct t_call *rcvcall) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_connect (fildes, sndcall, rcvcall), int, -1); + ACE_OSCALL_RETURN (::t_connect (fildes, sndcall, rcvcall), int); #else ACE_UNUSED_ARG (fildes); ACE_UNUSED_ARG (sndcall); @@ -104,7 +103,7 @@ t_free (char *ptr, int struct_type) #if defined (ACE_HAS_TLI) if (ptr == 0) return 0; - ACE_OSCALL_RETURN (::t_free (ptr, struct_type), int, -1); + ACE_OSCALL_RETURN (::t_free (ptr, struct_type), int); #else ACE_UNUSED_ARG (struct_type); ACE_UNUSED_ARG (ptr); @@ -117,7 +116,7 @@ ACE_INLINE int t_getinfo (ACE_HANDLE handle, struct t_info *info) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_getinfo (handle, info), int, -1); + ACE_OSCALL_RETURN (::t_getinfo (handle, info), int); #else ACE_UNUSED_ARG (info); ACE_UNUSED_ARG (handle); @@ -166,7 +165,7 @@ t_getname (ACE_HANDLE handle, struct netbuf *namep, int type) return 0; #elif defined (ACE_HAS_SVR4_TLI) - ACE_OSCALL_RETURN (::t_getname (handle, namep, type), int, -1); + ACE_OSCALL_RETURN (::t_getname (handle, namep, type), int); #else ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (namep); @@ -180,7 +179,7 @@ ACE_INLINE int t_getstate (ACE_HANDLE handle) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_getstate (handle), int, -1); + ACE_OSCALL_RETURN (::t_getstate (handle), int); #else ACE_UNUSED_ARG (handle); @@ -192,7 +191,7 @@ ACE_INLINE int t_listen (ACE_HANDLE handle, struct t_call *call) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_listen (handle, call), int, -1); + ACE_OSCALL_RETURN (::t_listen (handle, call), int); #else ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (call); @@ -205,7 +204,7 @@ ACE_INLINE int t_look (ACE_HANDLE handle) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_look (handle), int, -1); + ACE_OSCALL_RETURN (::t_look (handle), int); #else ACE_UNUSED_ARG (handle); @@ -217,7 +216,7 @@ ACE_INLINE ACE_HANDLE t_open (char *path, int oflag, struct t_info *info) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_open (path, oflag, info), ACE_HANDLE, ACE_INVALID_HANDLE); + ACE_OSCALL_RETURN (::t_open (path, oflag, info), ACE_HANDLE); #else ACE_UNUSED_ARG (path); ACE_UNUSED_ARG (oflag); @@ -231,7 +230,7 @@ ACE_INLINE int t_optmgmt (ACE_HANDLE handle, ACE_TOPTMGMT *req, ACE_TOPTMGMT *ret) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_optmgmt (handle, req, ret), int, -1); + ACE_OSCALL_RETURN (::t_optmgmt (handle, req, ret), int); #else ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (req); @@ -248,8 +247,7 @@ t_rcv (ACE_HANDLE handle, int *flags) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_rcv (handle, buf, nbytes, flags), - int, -1); + ACE_OSCALL_RETURN (::t_rcv (handle, buf, nbytes, flags), int); #else ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (buf); @@ -264,7 +262,7 @@ ACE_INLINE int t_rcvdis (ACE_HANDLE handle, struct t_discon *discon) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_rcvdis (handle, discon), int, -1); + ACE_OSCALL_RETURN (::t_rcvdis (handle, discon), int); #else ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (discon); @@ -277,7 +275,7 @@ ACE_INLINE int t_rcvrel (ACE_HANDLE handle) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_rcvrel (handle), int, -1); + ACE_OSCALL_RETURN (::t_rcvrel (handle), int); #else ACE_UNUSED_ARG (handle); @@ -291,8 +289,7 @@ t_rcvudata (ACE_HANDLE handle, int *flags) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_rcvudata (handle, unitdata, flags), - int, -1); + ACE_OSCALL_RETURN (::t_rcvudata (handle, unitdata, flags), int); #else ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (unitdata); @@ -306,7 +303,7 @@ ACE_INLINE int t_rcvuderr (ACE_HANDLE handle, struct t_uderr *uderr) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_rcvuderr (handle, uderr), int, -1); + ACE_OSCALL_RETURN (::t_rcvuderr (handle, uderr), int); #else ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (uderr); @@ -322,7 +319,7 @@ t_snd (ACE_HANDLE handle, int flags) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_snd (handle, (char *) buf, nbytes, flags), int, -1); + ACE_OSCALL_RETURN (::t_snd (handle, (char *) buf, nbytes, flags), int); #else ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (buf); @@ -337,7 +334,7 @@ ACE_INLINE int t_snddis (ACE_HANDLE handle, struct t_call *call) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_snddis (handle, call), int, -1); + ACE_OSCALL_RETURN (::t_snddis (handle, call), int); #else ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (call); @@ -350,7 +347,7 @@ ACE_INLINE int t_sndrel (ACE_HANDLE handle) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_sndrel (handle), int, -1); + ACE_OSCALL_RETURN (::t_sndrel (handle), int); #else ACE_UNUSED_ARG (handle); @@ -362,7 +359,7 @@ ACE_INLINE int t_sync (ACE_HANDLE handle) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_sync (handle), int, -1); + ACE_OSCALL_RETURN (::t_sync (handle), int); #else ACE_UNUSED_ARG (handle); @@ -374,7 +371,7 @@ ACE_INLINE int t_unbind (ACE_HANDLE handle) { #if defined (ACE_HAS_TLI) - ACE_OSCALL_RETURN (::t_unbind (handle), int, -1); + ACE_OSCALL_RETURN (::t_unbind (handle), int); #else ACE_UNUSED_ARG (handle); diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h index 1a2bcbaad48..5b302b80607 100644 --- a/ACE/ace/config-macros.h +++ b/ACE/ace/config-macros.h @@ -471,11 +471,11 @@ */ // ============================================================================ -#define ACE_OSCALL_RETURN(X,TYPE,FAILVALUE) \ +#define ACE_OSCALL_RETURN(X,TYPE) \ do \ return (TYPE) (X); \ while (0) -#define ACE_OSCALL(X,TYPE,FAILVALUE,RESULT) \ +#define ACE_OSCALL(X,TYPE,RESULT) \ do \ RESULT = (TYPE) (X); \ while (0) diff --git a/TAO/TAO_IDL/be/be_helper.cpp b/TAO/TAO_IDL/be/be_helper.cpp index 1a0ed5e84a7..356a5500b5f 100644 --- a/TAO/TAO_IDL/be/be_helper.cpp +++ b/TAO/TAO_IDL/be/be_helper.cpp @@ -305,7 +305,6 @@ TAO_OutStream::print (const char *format, ...) format, ap), int, - -1, result); va_end (ap); |