niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up return code types

Browse source 
* Remove dds_return_t / dds_retcode_t distinction (now there is only
  dds_return_t and all error codes are always negative)

* Remove Q_ERR_... error codes and replace them by DDS_RETCODE_...
  ones so that there is only one set of error codes

* Replace a whole bunch "int" return types that were used to return
  Q_ERR_... codes by "dds_return_t" return types

Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2019-05-23 16:51:43 +02:00 • committed by eboasson
parent a652ecb78e
commit 19aec98b8a
126 changed files with 1565 additions and 1722 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/ddsrt/tests/environ.c
View file

@ -22,7 +22,7 @@ CU_TheoryDataPoints(ddsrt_environ, bad_name) = {
CU_Theory((const char *name), ddsrt_environ, bad_name)
{
dds_retcode_t rc;
dds_return_t rc;
static const char value[] = "bar";
static char dummy[] = "foobar";
char *ptr;
@ -40,7 +40,7 @@ CU_Theory((const char *name), ddsrt_environ, bad_name)
DDSRT_WARNING_MSVC_OFF(4996)
CU_Test(ddsrt_environ, setenv)
{
dds_retcode_t rc;
dds_return_t rc;
static const char name[] = "foo";
static char value[] = "bar";
char *ptr;
@ -64,7 +64,7 @@ DDSRT_WARNING_MSVC_ON(4996)
CU_Test(ddsrt_environ, getenv)
{
dds_retcode_t rc;
dds_return_t rc;
static const char name[] = "foo";
static const char value[] = "bar";
static char dummy[] = "foobar";
@ -111,7 +111,7 @@ CU_TheoryDataPoints(ddsrt_environ, expand) = {
};
CU_Theory((const char *var, const char *expect), ddsrt_environ, expand)
{
dds_retcode_t rc;
dds_return_t rc;
static const char x_name[] = "X";
static const char x_value[] = "TEST";
static const char y_name[] = "Y";
@ -163,7 +163,7 @@ CU_TheoryDataPoints(ddsrt_environ, expand_sh) = {
};
CU_Theory((const char *var, const char *expect), ddsrt_environ, expand_sh)
{
dds_retcode_t rc;
dds_return_t rc;
static const char x_name[] = "X";
static const char x_value[] = "TEST";
static const char y_name[] = "Y";

10
src/ddsrt/tests/ifaddrs.c
View file

@ -64,7 +64,7 @@ CU_Clean(ddsrt_getifaddrs)
IFF_LOOPBACK flags are properly set. */
CU_Test(ddsrt_getifaddrs, ipv4)
{
dds_retcode_t ret;
dds_return_t ret;
int seen = 0;
ddsrt_ifaddrs_t *ifa_root, *ifa;
const int afs[] = { AF_INET, DDSRT_AF_TERM };
@ -90,7 +90,7 @@ CU_Test(ddsrt_getifaddrs, ipv4)
CU_Test(ddsrt_getifaddrs, null_filter)
{
dds_retcode_t ret;
dds_return_t ret;
int cnt = 0;
ddsrt_ifaddrs_t *ifa_root, *ifa;
@ -107,7 +107,7 @@ CU_Test(ddsrt_getifaddrs, null_filter)
CU_Test(ddsrt_getifaddrs, empty_filter)
{
dds_retcode_t ret;
dds_return_t ret;
ddsrt_ifaddrs_t *ifa_root;
const int afs[] = { DDSRT_AF_TERM };
@ -121,7 +121,7 @@ CU_Test(ddsrt_getifaddrs, ipv6)
{
#ifdef DDSRT_HAVE_IPV6
if (ipv6_enabled == 1) {
dds_retcode_t ret;
dds_return_t ret;
int have_ipv6 = 0;
ddsrt_ifaddrs_t *ifa_root, *ifa;
const int afs[] = { AF_INET6, DDSRT_AF_TERM };
@ -160,7 +160,7 @@ CU_Test(ddsrt_getifaddrs, ipv4_n_ipv6)
{
#if DDSRT_HAVE_IPV6
if (ipv6_enabled == 1) {
dds_retcode_t ret;
dds_return_t ret;
int have_ipv4 = 0;
int have_ipv6 = 0;
ddsrt_ifaddrs_t *ifa_root, *ifa;

2
src/ddsrt/tests/log.c
View file

@ -349,7 +349,7 @@ CU_Test(dds_log, synchronous_sink_changes, .fini=reset)
struct arg arg;
ddsrt_thread_t tid;
ddsrt_threadattr_t tattr;
dds_retcode_t ret;
dds_return_t ret;
ddsrt_mutex_init(&mutex);
ddsrt_cond_init(&cond);

20
src/ddsrt/tests/process.c
View file

@ -26,7 +26,7 @@
*/
static void create_and_test_exit(const char *arg, int code)
{
dds_retcode_t ret;
dds_return_t ret;
ddsrt_pid_t pid;
int32_t status;
char *argv[] = { NULL, NULL };
@ -64,7 +64,7 @@ CU_Test(ddsrt_process, create)
*/
CU_Test(ddsrt_process, kill)
{
dds_retcode_t ret;
dds_return_t ret;
ddsrt_pid_t pid;
/* Sleep for 20 seconds. It should be killed before then. */
@ -98,7 +98,7 @@ CU_Test(ddsrt_process, kill)
*/
CU_Test(ddsrt_process, pid)
{
dds_retcode_t ret;
dds_return_t ret;
ddsrt_pid_t pid;
int32_t status;
char *argv[] = { TEST_PID_ARG, NULL };
@ -126,7 +126,7 @@ CU_Test(ddsrt_process, pid)
*/
CU_Test(ddsrt_process, env)
{
dds_retcode_t ret;
dds_return_t ret;
ret = ddsrt_setenv(TEST_ENV_VAR_NAME, TEST_ENV_VAR_VALUE);
CU_ASSERT_EQUAL_FATAL(ret, DDS_RETCODE_OK);
@ -141,7 +141,7 @@ CU_Test(ddsrt_process, env)
*/
CU_Test(ddsrt_process, invalid)
{
dds_retcode_t ret;
dds_return_t ret;
ddsrt_pid_t pid;
ret = ddsrt_proc_create("ProbablyNotAnValidExecutable", NULL, &pid);
@ -177,7 +177,7 @@ CU_Test(ddsrt_process, arg_dquote)
*/
CU_Test(ddsrt_process, waitpids)
{
dds_retcode_t ret;
dds_return_t ret;
ddsrt_pid_t child;
ddsrt_pid_t pid1 = 0;
ddsrt_pid_t pid2 = 0;
@ -225,7 +225,7 @@ CU_Test(ddsrt_process, waitpids)
*/
CU_Test(ddsrt_process, waitpid_timeout)
{
dds_retcode_t ret;
dds_return_t ret;
ddsrt_pid_t pid;
/* Sleep for 20 seconds. We should have a timeout before then. */
@ -238,7 +238,7 @@ CU_Test(ddsrt_process, waitpid_timeout)
ret = ddsrt_proc_waitpid(pid, 0, NULL);
CU_ASSERT_EQUAL(ret, DDS_RETCODE_PRECONDITION_NOT_MET);
/* Valid timeout should return DDS_RETCODE_TIMEOUT when alive. */
/* Valid timeout should return DDS_RETURN_TIMEOUT when alive. */
ret = ddsrt_proc_waitpid(pid, DDS_SECS(1), NULL);
CU_ASSERT_EQUAL(ret, DDS_RETCODE_TIMEOUT);
@ -257,7 +257,7 @@ CU_Test(ddsrt_process, waitpid_timeout)
*/
CU_Test(ddsrt_process, waitpids_timeout)
{
dds_retcode_t ret;
dds_return_t ret;
ddsrt_pid_t pid;
/* Sleep for 20 seconds. We should have a timeout before then. */
@ -270,7 +270,7 @@ CU_Test(ddsrt_process, waitpids_timeout)
ret = ddsrt_proc_waitpids(0, NULL, NULL);
CU_ASSERT_EQUAL(ret, DDS_RETCODE_PRECONDITION_NOT_MET);
/* Valid timeout should return DDS_RETCODE_TIMEOUT when alive. */
/* Valid timeout should return DDS_RETURN_TIMEOUT when alive. */
ret = ddsrt_proc_waitpids(DDS_SECS(1), NULL, NULL);
CU_ASSERT_EQUAL(ret, DDS_RETCODE_TIMEOUT);

10
src/ddsrt/tests/select.c
View file

@ -107,7 +107,7 @@ typedef struct {
static void
sockets_pipe(ddsrt_socket_t socks[2])
{
dds_retcode_t rc;
dds_return_t rc;
ddsrt_socket_t sock;
int reuseaddr = 1;
@ -140,7 +140,7 @@ static const char mesg[] = "foobar";
static uint32_t select_timeout_routine(void *ptr)
{
int32_t cnt = -1;
dds_retcode_t rc;
dds_return_t rc;
dds_time_t before, after;
dds_duration_t delay;
fd_set rdset;
@ -179,7 +179,7 @@ static uint32_t select_timeout_routine(void *ptr)
CU_Test(ddsrt_select, timeout)
{
dds_retcode_t rc;
dds_return_t rc;
ddsrt_socket_t socks[2];
ddsrt_thread_t thr;
ddsrt_threadattr_t attr;
@ -242,7 +242,7 @@ static uint32_t recv_routine(void *ptr)
CU_Test(ddsrt_select, send_recv)
{
dds_retcode_t rc;
dds_return_t rc;
ddsrt_socket_t socks[2];
ddsrt_thread_t thr;
ddsrt_threadattr_t attr;
@ -309,7 +309,7 @@ static uint32_t recvmsg_routine(void *ptr)
CU_Test(ddsrt_select, sendmsg_recvmsg)
{
dds_retcode_t rc;
dds_return_t rc;
ddsrt_socket_t socks[2];
ddsrt_thread_t thr;
ddsrt_threadattr_t attr;

36
src/ddsrt/tests/socket.c
View file

@ -48,15 +48,15 @@ static void teardown(void)
CU_Test(ddsrt_sockaddrfromstr, bad_family)
{
dds_retcode_t rc;
dds_return_t rc;
struct sockaddr_storage sa;
rc = ddsrt_sockaddrfromstr(AF_UNSPEC, "127.0.0.1", &sa);
CU_ASSERT_EQUAL(rc, DDS_RETCODE_BAD_PARAMETER);
}
static void sockaddrfromstr_test(char *str, int af, dds_retcode_t exp)
static void sockaddrfromstr_test(char *str, int af, dds_return_t exp)
{
dds_retcode_t rc;
dds_return_t rc;
struct sockaddr_storage ss;
rc = ddsrt_sockaddrfromstr(af, str, &ss);
CU_ASSERT_EQUAL(rc, exp);
@ -70,11 +70,11 @@ CU_TheoryDataPoints(ddsrt_sockaddrfromstr, ipv4) = {
"nip"),
CU_DataPoints(int, AF_INET, AF_INET,
AF_INET),
CU_DataPoints(dds_retcode_t, DDS_RETCODE_OK, DDS_RETCODE_OK,
CU_DataPoints(dds_return_t, DDS_RETCODE_OK, DDS_RETCODE_OK,
DDS_RETCODE_BAD_PARAMETER)
};
CU_Theory((char *str, int af, dds_retcode_t exp), ddsrt_sockaddrfromstr, ipv4, .init=setup, .fini=teardown)
CU_Theory((char *str, int af, dds_return_t exp), ddsrt_sockaddrfromstr, ipv4, .init=setup, .fini=teardown)
{
sockaddrfromstr_test(str, af, exp);
}
@ -87,13 +87,13 @@ CU_TheoryDataPoints(ddsrt_sockaddrfromstr, ipv6) = {
CU_DataPoints(int, AF_INET6, AF_INET6,
AF_INET, AF_INET6,
AF_INET6),
CU_DataPoints(dds_retcode_t, DDS_RETCODE_BAD_PARAMETER, DDS_RETCODE_OK,
CU_DataPoints(dds_return_t, DDS_RETCODE_BAD_PARAMETER, DDS_RETCODE_OK,
DDS_RETCODE_BAD_PARAMETER, DDS_RETCODE_OK,
DDS_RETCODE_BAD_PARAMETER)
#endif /* DDSRT_HAVE_IPV6 */
};
CU_Theory((char *str, int af, dds_retcode_t exp), ddsrt_sockaddrfromstr, ipv6, .init=setup, .fini=teardown)
CU_Theory((char *str, int af, dds_return_t exp), ddsrt_sockaddrfromstr, ipv6, .init=setup, .fini=teardown)
{
#if DDSRT_HAVE_IPV6
sockaddrfromstr_test(str, af, exp);
@ -107,7 +107,7 @@ CU_Theory((char *str, int af, dds_retcode_t exp), ddsrt_sockaddrfromstr, ipv6, .
CU_Test(ddsrt_sockaddrtostr, bad_sockaddr, .init=setup, .fini=teardown)
{
dds_retcode_t rc;
dds_return_t rc;
char buf[128] = { 0 };
struct sockaddr_in sa;
memcpy(&sa, &ipv4_loopback, sizeof(ipv4_loopback));
@ -118,7 +118,7 @@ CU_Test(ddsrt_sockaddrtostr, bad_sockaddr, .init=setup, .fini=teardown)
CU_Test(ddsrt_sockaddrtostr, no_space, .init=setup, .fini=teardown)
{
dds_retcode_t rc;
dds_return_t rc;
char buf[1] = { 0 };
rc = ddsrt_sockaddrtostr(&ipv4_loopback, buf, sizeof(buf));
CU_ASSERT_EQUAL(rc, DDS_RETCODE_NOT_ENOUGH_SPACE);
@ -126,7 +126,7 @@ CU_Test(ddsrt_sockaddrtostr, no_space, .init=setup, .fini=teardown)
CU_Test(ddsrt_sockaddrtostr, ipv4)
{
dds_retcode_t rc;
dds_return_t rc;
char buf[128] = { 0 };
rc = ddsrt_sockaddrtostr(&ipv4_loopback, buf, sizeof(buf));
CU_ASSERT_EQUAL(rc, DDS_RETCODE_OK);
@ -136,7 +136,7 @@ CU_Test(ddsrt_sockaddrtostr, ipv4)
CU_Test(ddsrt_sockaddrtostr, ipv6)
{
#if DDSRT_HAVE_IPV6
dds_retcode_t rc;
dds_return_t rc;
char buf[128] = { 0 };
rc = ddsrt_sockaddrtostr(&ipv6_loopback, buf, sizeof(buf));
CU_ASSERT_EQUAL(rc, DDS_RETCODE_OK);
@ -148,7 +148,7 @@ CU_Test(ddsrt_sockaddrtostr, ipv6)
CU_Test(ddsrt_sockets, gethostname)
{
dds_retcode_t rc;
dds_return_t rc;
char sysbuf[200], buf[200];
buf[0] = '\0';
@ -169,9 +169,9 @@ CU_Test(ddsrt_sockets, gethostname)
}
#if DDSRT_HAVE_DNS
static void gethostbyname_test(char *name, int af, dds_retcode_t exp)
static void gethostbyname_test(char *name, int af, dds_return_t exp)
{
dds_retcode_t rc;
dds_return_t rc;
ddsrt_hostent_t *hent = NULL;
rc = ddsrt_gethostbyname(name, af, &hent);
CU_ASSERT_EQUAL(rc, exp);
@ -188,10 +188,10 @@ static void gethostbyname_test(char *name, int af, dds_retcode_t exp)
CU_TheoryDataPoints(ddsrt_gethostbyname, ipv4) = {
CU_DataPoints(char *, "", "127.0.0.1", "127.0.0.1"),
CU_DataPoints(int, AF_UNSPEC, AF_INET, AF_UNSPEC),
CU_DataPoints(dds_retcode_t, DDS_RETCODE_HOST_NOT_FOUND, DDS_RETCODE_OK, DDS_RETCODE_OK)
CU_DataPoints(dds_return_t, DDS_RETCODE_HOST_NOT_FOUND, DDS_RETCODE_OK, DDS_RETCODE_OK)
};
CU_Theory((char *name, int af, dds_retcode_t exp), ddsrt_gethostbyname, ipv4, .init=setup, .fini=teardown)
CU_Theory((char *name, int af, dds_return_t exp), ddsrt_gethostbyname, ipv4, .init=setup, .fini=teardown)
{
#if DDSRT_HAVE_DNS
gethostbyname_test(name, af, exp);
@ -209,11 +209,11 @@ CU_TheoryDataPoints(ddsrt_gethostbyname, ipv6) = {
#if DDSRT_HAVE_IPV6 && DDSRT_HAVE_DNS
CU_DataPoints(char *, "::1", "::1", "::1"),
CU_DataPoints(int, AF_INET, AF_INET6, AF_UNSPEC),
CU_DataPoints(dds_retcode_t, DDS_RETCODE_HOST_NOT_FOUND, DDS_RETCODE_OK, DDS_RETCODE_OK)
CU_DataPoints(dds_return_t, DDS_RETCODE_HOST_NOT_FOUND, DDS_RETCODE_OK, DDS_RETCODE_OK)
#endif /* DDSRT_HAVE_IPV6 */
};
CU_Theory((char *name, int af, dds_retcode_t exp), ddsrt_gethostbyname, ipv6, .init=setup, .fini=teardown)
CU_Theory((char *name, int af, dds_return_t exp), ddsrt_gethostbyname, ipv6, .init=setup, .fini=teardown)
{
#if DDSRT_HAVE_IPV6 && DDSRT_HAVE_DNS
gethostbyname_test(name, af, exp);

8
src/ddsrt/tests/strtoll.c
View file

@ -52,7 +52,7 @@ CU_Clean(ddstr_strtoll)
CU_Test(ddsrt_strtoll, strtoll)
{
dds_retcode_t rc;
dds_return_t rc;
long long ll;
static char dummy[] = "dummy";
@ -248,7 +248,7 @@ CU_Test(ddsrt_strtoll, strtoll)
CU_Test(ddsrt_strtoll, strtoull)
{
dds_retcode_t rc;
dds_return_t rc;
unsigned long long ull;
str = "0xffffffffffffffff";
@ -272,7 +272,7 @@ CU_Test(ddsrt_strtoll, strtoull)
CU_Test(ddsrt_strtoll, atoll)
{
dds_retcode_t rc;
dds_return_t rc;
long long ll;
str = "10";
@ -284,7 +284,7 @@ CU_Test(ddsrt_strtoll, atoll)
CU_Test(ddsrt_strtoll, atoull)
{
dds_retcode_t rc;
dds_return_t rc;
unsigned long long ull;
str = "10";

12
src/ddsrt/tests/sync.c
View file

@ -55,7 +55,7 @@ static uint32_t mutex_lock_routine(void *ptr)
main thread before a lock operation is attempted by the second thread. */
CU_Test(ddsrt_sync, mutex_lock_conc)
{
dds_retcode_t ret;
dds_return_t ret;
ddsrt_thread_t thr;
ddsrt_threadattr_t attr;
thread_arg_t arg = { .cnt = DDSRT_ATOMIC_UINT32_INIT(0) };
@ -133,7 +133,7 @@ static uint32_t rwlock_trywrite_routine(void *ptr)
CU_Test(ddsrt_sync, mutex_trylock_conc)
{
dds_retcode_t ret;
dds_return_t ret;
ddsrt_thread_t thr;
ddsrt_threadattr_t attr;
thread_arg_t arg = { .cnt = DDSRT_ATOMIC_UINT32_INIT(1) };
@ -164,7 +164,7 @@ CU_TheoryDataPoints(ddsrt_sync, rwlock_trylock_conc) = {
CU_Theory((uint32_t lock, uint32_t trylock, uint32_t exp), ddsrt_sync, rwlock_trylock_conc)
{
dds_retcode_t ret;
dds_return_t ret;
ddsrt_thread_t thr;
ddsrt_threadattr_t attr;
ddsrt_thread_routine_t func;
@ -219,7 +219,7 @@ static uint32_t once_routine(void *ptr)
CU_Test(ddsrt_sync, once_conc)
{
dds_retcode_t ret;
dds_return_t ret;
ddsrt_thread_t thrs[ONCE_THREADS];
ddsrt_threadattr_t attr;
uint32_t res;
@ -284,7 +284,7 @@ static uint32_t waitfor_routine(void *ptr)
CU_Test(ddsrt_sync, cond_waitfor)
{
dds_retcode_t rc;
dds_return_t rc;
ddsrt_thread_t thr;
ddsrt_threadattr_t attr;
thread_arg_t arg = { .cnt = DDSRT_ATOMIC_UINT32_INIT(0), .reltime = DDS_MSECS(100) };
@ -333,7 +333,7 @@ static uint32_t waituntil_routine(void *ptr)
CU_Test(ddsrt_sync, cond_waituntil)
{
dds_retcode_t rc;
dds_return_t rc;
dds_duration_t delay = DDS_MSECS(100);
ddsrt_thread_t thr;
ddsrt_threadattr_t attr;

4
src/ddsrt/tests/thread.c
View file

@ -119,7 +119,7 @@ CU_Theory((ddsrt_sched_t sched, int32_t *prio, uint32_t exp), ddsrt_thread, crea
{
int skip = 0;
uint32_t res = 50505;
dds_retcode_t ret;
dds_return_t ret;
ddsrt_thread_t thr;
ddsrt_threadattr_t attr;
thread_arg_t arg;
@ -215,7 +215,7 @@ uint32_t thread_main_waitforit(void *ptr)
CU_Test(ddsrt_thread, stacked_join)
{
dds_retcode_t ret;
dds_return_t ret;
ddsrt_thread_t thrs[2];
ddsrt_threadattr_t attr;
uint32_t res = 0;

2
src/ddsrt/tests/thread_cleanup.c
View file

@ -122,7 +122,7 @@ static void
setup(
struct thread_argument *arg)
{
dds_retcode_t rc;
dds_return_t rc;
ddsrt_thread_t thr;
ddsrt_threadattr_t attr;