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/CMakeLists.txt
View file

@ -121,10 +121,10 @@ list(APPEND sources
"${source_path}/strtol.c")
list(APPEND headers
"${source_path}/dds/ddsrt/avl.h"
"${source_path}/dds/ddsrt/fibheap.h"
"${source_path}/dds/ddsrt/hopscotch.h"
"${source_path}/dds/ddsrt/thread_pool.h")
"${include_path}/dds/ddsrt/avl.h"
"${include_path}/dds/ddsrt/fibheap.h"
"${include_path}/dds/ddsrt/hopscotch.h"
"${include_path}/dds/ddsrt/thread_pool.h")
list(APPEND sources
"${source_path}/avl.c"
@ -221,7 +221,7 @@ foreach(feature atomics cdtors environ heap ifaddrs random rusage
endif()
endforeach()
target_sources(ddsrt INTERFACE ${sources})
target_sources(ddsrt INTERFACE ${sources} ${headers})
set(HAVE_MULTI_PROCESS ${HAVE_MULTI_PROCESS} PARENT_SCOPE)

12
src/ddsrt/include/dds/ddsrt/environ.h
View file

@ -30,7 +30,7 @@ extern "C" {
* byte), or would have been written would @buf have been
* sufficiently large enough.
*
* @returns A dds_retcode_t indicating success or failure.
* @returns A dds_return_t indicating success or failure.
*
* @retval DDS_RETCODE_OK
* Environment variable written to @buf.
@ -43,7 +43,7 @@ extern "C" {
* @retval DDS_RETCODE_ERROR
* Unspecified error.
*/
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_getenv(
const char *name,
char **value)
@ -58,7 +58,7 @@ ddsrt_nonnull_all;
* @param[in] name Environment variable name.
* @param[in] value Value to set environment variable to.
*
* @returns A dds_retcode_t indicating success or failure.
* @returns A dds_return_t indicating success or failure.
*
* @retval DDS_RETCODE_OK
* Environment variable successfully set to @value.
@ -69,7 +69,7 @@ ddsrt_nonnull_all;
* @retval DDS_RETCODE_ERROR
* Unspecified system error.
*/
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_setenv(
const char *name,
const char *value)
@ -80,7 +80,7 @@ ddsrt_nonnull_all;
*
* @param[in] name Environment variable name.
*
* @returns A dds_retcode_t indicating success or failure.
* @returns A dds_return_t indicating success or failure.
*
* @retval DDS_RETCODE_OK
* Environment variable successfully unset.
@ -91,7 +91,7 @@ ddsrt_nonnull_all;
* @retval DDS_RETCODE_ERROR
* Unspecified system error.
*/
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_unsetenv(
const char *name)
ddsrt_nonnull_all;

2
src/ddsrt/include/dds/ddsrt/ifaddrs.h
View file

@ -30,7 +30,7 @@ struct ddsrt_ifaddrs {
typedef struct ddsrt_ifaddrs ddsrt_ifaddrs_t;
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_getifaddrs(
ddsrt_ifaddrs_t **ifap,
const int *afs);

20
src/ddsrt/include/dds/ddsrt/process.h
View file

@ -72,7 +72,7 @@ ddsrt_getpid(void);
* @param[in] argv Arguments array.
* @param[out] pid ID of the created process.
*
* @returns A dds_retcode_t indicating success or failure.
* @returns A dds_return_t indicating success or failure.
*
* @retval DDS_RETCODE_OK
* Process successfully created.
@ -85,7 +85,7 @@ ddsrt_getpid(void);
* @retval DDS_RETCODE_ERROR
* Process could not be created.
*/
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_proc_create(
const char *executable,
char *const argv[],
@ -109,7 +109,7 @@ ddsrt_proc_create(
* @param[in] timemout Time within the process is expected to finish.
* @param[out] code The exit code of the process.
*
* @returns A dds_retcode_t indicating success or failure.
* @returns A dds_return_t indicating success or failure.
*
* @retval DDS_RETCODE_OK
* Process has terminated and its exit code has been captured.
@ -124,7 +124,7 @@ ddsrt_proc_create(
* @retval DDS_RETCODE_ERROR
* Getting the exit code failed for an unknown reason.
*/
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_proc_waitpid(
ddsrt_pid_t pid,
dds_duration_t timeout,
@ -149,7 +149,7 @@ ddsrt_proc_waitpid(
* @param[out] pid Process ID (PID) of the finished process.
* @param[out] code The exit code of the process.
*
* @returns A dds_retcode_t indicating success or failure.
* @returns A dds_return_t indicating success or failure.
*
* @retval DDS_RETCODE_OK
* A process has terminated.
@ -165,7 +165,7 @@ ddsrt_proc_waitpid(
* @retval DDS_RETCODE_ERROR
* Getting the exit code failed for an unknown reason.
*/
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_proc_waitpids(
dds_duration_t timeout,
ddsrt_pid_t *pid,
@ -176,7 +176,7 @@ ddsrt_proc_waitpids(
*
* @param[in] pid Process ID (PID) to check if it exists.
*
* @returns A dds_retcode_t indicating success or failure.
* @returns A dds_return_t indicating success or failure.
*
* @retval DDS_RETCODE_OK
* The process exists.
@ -185,7 +185,7 @@ ddsrt_proc_waitpids(
* @retval DDS_RETCODE_ERROR
* Determining if a process exists or not, failed.
*/
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_proc_exists(
ddsrt_pid_t pid);
@ -202,7 +202,7 @@ ddsrt_proc_exists(
*
* @param[in] pid Process ID (PID) of the process to terminate.
*
* @returns A dds_retcode_t indicating success or failure.
* @returns A dds_return_t indicating success or failure.
*
* @retval DDS_RETCODE_OK
* Kill attempt has been started.
@ -213,7 +213,7 @@ ddsrt_proc_exists(
* @retval DDS_RETCODE_ERROR
* Kill failed for an unknown reason.
*/
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_proc_kill(
ddsrt_pid_t pid);

34
src/ddsrt/include/dds/ddsrt/retcode.h
View file

@ -9,7 +9,7 @@
extern "C" {
#endif
typedef int32_t dds_retcode_t;
typedef int32_t dds_return_t;
/*
State is unchanged following a function call returning an error
@ -29,25 +29,25 @@ typedef int32_t dds_retcode_t;
* @{
*/
#define DDS_RETCODE_OK 0 /**< Success */
#define DDS_RETCODE_ERROR 1 /**< Non specific error */
#define DDS_RETCODE_UNSUPPORTED 2 /**< Feature unsupported */
#define DDS_RETCODE_BAD_PARAMETER 3 /**< Bad parameter value */
#define DDS_RETCODE_PRECONDITION_NOT_MET 4 /**< Precondition for operation not met */
#define DDS_RETCODE_OUT_OF_RESOURCES 5 /**< When an operation fails because of a lack of resources */
#define DDS_RETCODE_NOT_ENABLED 6 /**< When a configurable feature is not enabled */
#define DDS_RETCODE_IMMUTABLE_POLICY 7 /**< When an attempt is made to modify an immutable policy */
#define DDS_RETCODE_INCONSISTENT_POLICY 8 /**< When a policy is used with inconsistent values */
#define DDS_RETCODE_ALREADY_DELETED 9 /**< When an attempt is made to delete something more than once */
#define DDS_RETCODE_TIMEOUT 10 /**< When a timeout has occurred */
#define DDS_RETCODE_NO_DATA 11 /**< When expected data is not provided */
#define DDS_RETCODE_ILLEGAL_OPERATION 12 /**< When a function is called when it should not be */
#define DDS_RETCODE_NOT_ALLOWED_BY_SECURITY 13 /**< When credentials are not enough to use the function */
#define DDS_RETCODE_ERROR -1 /**< Non specific error */
#define DDS_RETCODE_UNSUPPORTED -2 /**< Feature unsupported */
#define DDS_RETCODE_BAD_PARAMETER -3 /**< Bad parameter value */
#define DDS_RETCODE_PRECONDITION_NOT_MET -4 /**< Precondition for operation not met */
#define DDS_RETCODE_OUT_OF_RESOURCES -5 /**< When an operation fails because of a lack of resources */
#define DDS_RETCODE_NOT_ENABLED -6 /**< When a configurable feature is not enabled */
#define DDS_RETCODE_IMMUTABLE_POLICY -7 /**< When an attempt is made to modify an immutable policy */
#define DDS_RETCODE_INCONSISTENT_POLICY -8 /**< When a policy is used with inconsistent values */
#define DDS_RETCODE_ALREADY_DELETED -9 /**< When an attempt is made to delete something more than once */
#define DDS_RETCODE_TIMEOUT -10 /**< When a timeout has occurred */
#define DDS_RETCODE_NO_DATA -11 /**< When expected data is not provided */
#define DDS_RETCODE_ILLEGAL_OPERATION -12 /**< When a function is called when it should not be */
#define DDS_RETCODE_NOT_ALLOWED_BY_SECURITY -13 /**< When credentials are not enough to use the function */
/* Extended return codes are not in the DDS specification and are meant
exclusively for internal use and must not be returned by the C API. */
#define DDS_XRETCODE_BASE (50)
#define DDS_XRETCODE(x) (DDS_XRETCODE_BASE + (x))
#define DDS_XRETCODE_BASE (-50)
#define DDS_XRETCODE(x) (DDS_XRETCODE_BASE - (x))
/** Requested resource is busy */
#define DDS_RETCODE_IN_PROGRESS DDS_XRETCODE(1)
@ -88,7 +88,7 @@ typedef int32_t dds_retcode_t;
*
* @returns String corresponding to the error value
*/
DDS_EXPORT const char *dds_strretcode(dds_retcode_t ret);
DDS_EXPORT const char *dds_strretcode(dds_return_t ret);
#if defined (__cplusplus)
}

4
src/ddsrt/include/dds/ddsrt/rusage.h
View file

@ -52,7 +52,7 @@ typedef struct {
* @param[in] who DDSRT_RUSAGE_SELF or DDSRT_RUSAGE_THREAD.
* @param[in] usage Structure where resource usage is returned.
*
* @returns A dds_retcode_t indicating success or failure.
* @returns A dds_return_t indicating success or failure.
*
* @retval DDS_RETCODE_OK
* Resource usage successfully returned in @usage.
@ -61,7 +61,7 @@ typedef struct {
* @retval DDS_RETCODE_ERROR
* An unidentified error occurred.
*/
DDS_EXPORT dds_retcode_t ddsrt_getrusage(int who, ddsrt_rusage_t *usage);
DDS_EXPORT dds_return_t ddsrt_getrusage(int who, ddsrt_rusage_t *usage);
#if defined (__cplusplus)
}

40
src/ddsrt/include/dds/ddsrt/sockets.h
View file

@ -32,53 +32,53 @@ extern const struct in6_addr ddsrt_in6addr_loopback;
#define DDSRT_AF_TERM (-1)
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_gethostname(
char *hostname,
size_t buffersize);
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_socket(
ddsrt_socket_t *sockptr,
int domain,
int type,
int protocol);
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_close(
ddsrt_socket_t sock);
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_connect(
ddsrt_socket_t sock,
const struct sockaddr *addr,
socklen_t addrlen);
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_accept(
ddsrt_socket_t sock,
struct sockaddr *addr,
socklen_t *addrlen,
ddsrt_socket_t *connptr);
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_listen(
ddsrt_socket_t sock,
int backlog);
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_bind(
ddsrt_socket_t sock,
const struct sockaddr *addr,
socklen_t addrlen);
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_getsockname(
ddsrt_socket_t sock,
struct sockaddr *addr,
socklen_t *addrlen);
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_send(
ddsrt_socket_t sock,
const void *buf,
@ -86,14 +86,14 @@ ddsrt_send(
int flags,
ssize_t *sent);
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_sendmsg(
ddsrt_socket_t sock,
const ddsrt_msghdr_t *msg,
int flags,
ssize_t *sent);
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_recv(
ddsrt_socket_t sock,
void *buf,
@ -101,14 +101,14 @@ ddsrt_recv(
int flags,
ssize_t *rcvd);
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_recvmsg(
ddsrt_socket_t sock,
ddsrt_msghdr_t *msg,
int flags,
ssize_t *rcvd);
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_getsockopt(
ddsrt_socket_t sock,
int32_t level, /* SOL_SOCKET */
@ -116,7 +116,7 @@ ddsrt_getsockopt(
void *optval,
socklen_t *optlen);
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_setsockopt(
ddsrt_socket_t sock,
int32_t level, /* SOL_SOCKET */
@ -130,7 +130,7 @@ ddsrt_setsockopt(
* @param[in] sock Socket to set I/O mode for.
* @param[in] nonblock true for nonblocking, or false for blocking I/O.
*
* @returns A dds_retcode_t indicating success or failure.
* @returns A dds_return_t indicating success or failure.
*
* @retval DDS_RETCODE_OK
* I/O mode successfully set to (non)blocking.
@ -141,7 +141,7 @@ ddsrt_setsockopt(
* @retval DDS_RETCODE_ERROR
* An unknown error error occurred.
*/
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_setsocknonblocking(
ddsrt_socket_t sock,
bool nonblock);
@ -228,11 +228,11 @@ ddsrt_sockaddr_insamesubnet(
const struct sockaddr *mask)
ddsrt_nonnull_all;
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_sockaddrfromstr(
int af, const char *str, void *sa);
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_sockaddrtostr(
const void *sa, char *buf, size_t size);
@ -249,7 +249,7 @@ typedef struct {
* @param[in] af Address family, either AF_INET, AF_INET6 or AF_UNSPEC.
* @param[out] hent Structure of type ddsrt_hostent_t.
*
* @returns A dds_retcode_t indicating success or failure.
* @returns A dds_return_t indicating success or failure.
*
* @retval DDS_RETCODE_OK
* Host name successfully resolved to address(es).
@ -262,7 +262,7 @@ typedef struct {
* @retval DDS_RETCODE_TRY_AGAIN
* Nonauthoratitative host not found.
*/
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_gethostbyname(
const char *name,
int af,

4
src/ddsrt/include/dds/ddsrt/string.h
View file

@ -176,7 +176,7 @@ ddsrt_nonnull((1,2));
* @param[in] buf Buffer where description is copied to.
* @param[in] buflen Number of bytes available in @buf.
*
* @returns A dds_retcode_t indicating success or failure.
* @returns A dds_return_t indicating success or failure.
*
* @retval DDS_RETCODE_OK
* Description for @errnum was successfully copied to @buf.
@ -185,7 +185,7 @@ ddsrt_nonnull((1,2));
* @retval DDS_RETCODE_NOT_ENOUGH_SPACE
* Buffer was not large enough to hold the description.
*/
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_strerror_r(
int errnum,
char *buf,

8
src/ddsrt/include/dds/ddsrt/strtod.h
View file

@ -34,9 +34,9 @@ extern "C" {
* character is stored.
* @param[out] dblptr A double where the result is stored.
*
* @returns A dds_retcode_t indicating success or failure.
* @returns A dds_return_t indicating success or failure.
*/
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_strtod(const char *nptr, char **endptr, double *dblptr);
/**
@ -47,9 +47,9 @@ ddsrt_strtod(const char *nptr, char **endptr, double *dblptr);
* character is stored.
* @param[out] fltptr A float where the floating-point number is stored.
*
* @returns A dds_retcode_t indicating success or failure.
* @returns A dds_return_t indicating success or failure.
*/
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_strtof(const char *nptr, char **endptr, float *fltptr);
/**

16
src/ddsrt/include/dds/ddsrt/strtol.h
View file

@ -37,7 +37,7 @@ extern "C" {
* determine from @str.
* @param[out] llng A long long integer where the number is stored.
*
* @returns A dds_retcode_t indicating success or failure.
* @returns A dds_return_t indicating success or failure.
*
* @retval DDS_RETCODE_OK
* String successfully converted to an integer.
@ -46,7 +46,7 @@ extern "C" {
* @retval DDS_RETCODE_OUT_OF_RANGE
* String converted to an integer, but was out of range.
*/
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_strtoll(
const char *str,
char **endptr,
@ -69,7 +69,7 @@ ddsrt_strtoll(
* determine from @str.
* @param[out] ullng A long long integer where the number is stored.
*
* @returns A dds_retcode_t indicating success or failure.
* @returns A dds_return_t indicating success or failure.
*
* @retval DDS_RETCODE_OK
* String successfully converted to an integer.
@ -78,7 +78,7 @@ ddsrt_strtoll(
* @retval DDS_RETCODE_OUT_OF_RANGE
* String converted to an integer, but was out of range.
*/
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_strtoull(
const char *str,
char **endptr,
@ -91,7 +91,7 @@ ddsrt_strtoull(
* @param[in] str String to convert into a long long integer.
* @param[in] llng A long long integer where the number is stored.
*
* @returns A dds_retcode_t indicating success or failure.
* @returns A dds_return_t indicating success or failure.
*
* @retval DDS_RETCODE_OK
* String successfully converted to an integer.
@ -100,7 +100,7 @@ ddsrt_strtoull(
* @retval DDS_RETCODE_OUT_OF_RANGE
* String converted to an integer, but was out of range.
*/
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_atoll(
const char *str,
long long *llng);
@ -111,7 +111,7 @@ ddsrt_atoll(
* @param[in] str String to conver into an unsigned long long integer.
* @param[out] ullng An unsigned long long integer where the number is stored.
*
* @returns A dds_retcode_t indicating success or failure.
* @returns A dds_return_t indicating success or failure.
*
* @retval DDS_RETCODE_OK
* String successfully converted to an integer.
@ -120,7 +120,7 @@ ddsrt_atoll(
* @retval DDS_RETCODE_OUT_OF_RANGE
* String converted to an integer, but was out of range.
*/
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_atoull(
const char *str,
unsigned long long *ullng);

2
src/ddsrt/include/dds/ddsrt/thread_pool.h
View file

@ -55,7 +55,7 @@ DDS_EXPORT void ddsrt_thread_pool_purge (ddsrt_thread_pool pool);
Note that if the pool queue has reached it's maximum DDS_RETCODE_TRY_AGAIN is returned.
*/
DDS_EXPORT dds_retcode_t ddsrt_thread_pool_submit
DDS_EXPORT dds_return_t ddsrt_thread_pool_submit
(
ddsrt_thread_pool pool, /* Thread pool instance */
void (*fn) (void *arg), /* Function to be invoked by thread from pool */

12
src/ddsrt/include/dds/ddsrt/threads.h
View file

@ -121,14 +121,14 @@ ddsrt_nonnull_all;
* @param[in] start_routine Function to execute in created thread.
* @param[in] arg Argument passed to @start_routine.
*
* @returns A dds_retcode_t indicating success or failure.
* @returns A dds_return_t indicating success or failure.
*
* @retval DDS_RETCODE_OK
* Thread successfully created.
* @retval DDS_RETCODE_ERROR
* Thread could not be created.
*/
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_thread_create(
ddsrt_thread_t *thread,
const char *name,
@ -172,14 +172,14 @@ ddsrt_thread_equal(ddsrt_thread_t t1, ddsrt_thread_t t2);
* @param[in] thread Id of thread to wait for.
* @param[out] thread_result Location where thread result is stored.
*
* @returns A dds_retcode_t indicating success or failure.
* @returns A dds_return_t indicating success or failure.
*
* @retval DDS_RETCODE_OK
* Target thread terminated.
* @retval DDS_RETCODE_ERROR
* An error occurred while waiting for the thread to terminate.
*/
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_thread_join(
ddsrt_thread_t thread,
uint32_t *thread_result);
@ -224,7 +224,7 @@ ddsrt_thread_setname(
* @param[in] routine Cleanup handler to push onto the thread cleanup stack.
* @param[in] arg Argument that will be passed to the cleanup handler.
*/
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_thread_cleanup_push(
void (*routine)(void*),
void *arg);
@ -235,7 +235,7 @@ ddsrt_thread_cleanup_push(
* Remove routine at the top of the calling thread's cleanup stack and
* optionally invoke it (if execute is non-zero).
*/
DDS_EXPORT dds_retcode_t
DDS_EXPORT dds_return_t
ddsrt_thread_cleanup_pop(
int execute);

6
src/ddsrt/src/environ/posix/environ.c
View file

@ -23,7 +23,7 @@ isenvvar(const char *name)
return (*name == '\0' || strchr(name, '=') != NULL) == 0;
}
dds_retcode_t
dds_return_t
ddsrt_getenv(const char *name, char **value)
{
char *env;
@ -40,7 +40,7 @@ ddsrt_getenv(const char *name, char **value)
return DDS_RETCODE_NOT_FOUND;
}
dds_retcode_t
dds_return_t
ddsrt_setenv(const char *name, const char *value)
{
assert(name != NULL);
@ -65,7 +65,7 @@ ddsrt_setenv(const char *name, const char *value)
return DDS_RETCODE_ERROR;
}
dds_retcode_t
dds_return_t
ddsrt_unsetenv(const char *name)
{
assert(name != NULL);

6
src/ddsrt/src/environ/windows/environ.c
View file

@ -25,7 +25,7 @@ isenvvar(const char *name)
}
DDSRT_WARNING_MSVC_OFF(4996)
dds_retcode_t
dds_return_t
ddsrt_getenv(const char *name, char **value)
{
char *env;
@ -43,7 +43,7 @@ ddsrt_getenv(const char *name, char **value)
}
DDSRT_WARNING_MSVC_ON(4996)
dds_retcode_t
dds_return_t
ddsrt_setenv(const char *name, const char *value)
{
assert(name != NULL);
@ -65,7 +65,7 @@ ddsrt_setenv(const char *name, const char *value)
return DDS_RETCODE_ERROR;
}
dds_retcode_t
dds_return_t
ddsrt_unsetenv(const char *name)
{
assert(name != NULL);

8
src/ddsrt/src/ifaddrs/posix/ifaddrs.c
View file

@ -21,10 +21,10 @@
extern const int *const os_supp_afs;
static dds_retcode_t
static dds_return_t
copyaddr(ddsrt_ifaddrs_t **ifap, const struct ifaddrs *sys_ifa)
{
dds_retcode_t err = DDS_RETCODE_OK;
dds_return_t err = DDS_RETCODE_OK;
ddsrt_ifaddrs_t *ifa;
size_t sz;
@ -64,12 +64,12 @@ copyaddr(ddsrt_ifaddrs_t **ifap, const struct ifaddrs *sys_ifa)
return err;
}
dds_retcode_t
dds_return_t
ddsrt_getifaddrs(
ddsrt_ifaddrs_t **ifap,
const int *afs)
{
dds_retcode_t err = DDS_RETCODE_OK;
dds_return_t err = DDS_RETCODE_OK;
int use;
ddsrt_ifaddrs_t *ifa, *ifa_root, *ifa_next;
struct ifaddrs *sys_ifa, *sys_ifa_root;

12
src/ddsrt/src/ifaddrs/windows/ifaddrs.c
View file

@ -23,10 +23,10 @@
extern const int *const os_supp_afs;
static dds_retcode_t
static dds_return_t
getifaces(PIP_ADAPTER_ADDRESSES *ptr)
{
dds_retcode_t err = DDS_RETCODE_NOT_ENOUGH_SPACE;
dds_return_t err = DDS_RETCODE_NOT_ENOUGH_SPACE;
PIP_ADAPTER_ADDRESSES buf = NULL;
ULONG bufsz = 0; /* Size is determined on first iteration. */
ULONG ret;
@ -72,10 +72,10 @@ getifaces(PIP_ADAPTER_ADDRESSES *ptr)
return err;
}
static dds_retcode_t
static dds_return_t
getaddrtable(PMIB_IPADDRTABLE *ptr)
{
dds_retcode_t err = DDS_RETCODE_NOT_ENOUGH_SPACE;
dds_return_t err = DDS_RETCODE_NOT_ENOUGH_SPACE;
PMIB_IPADDRTABLE buf = NULL;
ULONG bufsz = 0;
DWORD ret;
@ -159,7 +159,7 @@ copyaddr(
const PMIB_IPADDRTABLE addrtable,
const PIP_ADAPTER_UNICAST_ADDRESS addr)
{
dds_retcode_t err = DDS_RETCODE_OK;
dds_return_t err = DDS_RETCODE_OK;
ddsrt_ifaddrs_t *ifa;
struct sockaddr *sa;
size_t sz;
@ -220,7 +220,7 @@ copyaddr(
return err;
}
dds_retcode_t
dds_return_t
ddsrt_getifaddrs(
ddsrt_ifaddrs_t **ifap,
const int *afs)

16
src/ddsrt/src/process/posix/process.c
View file

@ -72,7 +72,7 @@ static void no_op(int sig)
}
static dds_retcode_t
static dds_return_t
waitpids(
ddsrt_pid_t request_pid,
dds_duration_t timeout,
@ -81,7 +81,7 @@ waitpids(
{
struct sigaction sigactold;
struct sigaction sigact;
dds_retcode_t rv;
dds_return_t rv;
int options = 0;
int ret;
int s;
@ -148,13 +148,13 @@ waitpids(
dds_retcode_t
dds_return_t
ddsrt_proc_create(
const char *executable,
char *const argv[],
ddsrt_pid_t *pid)
{
dds_retcode_t rv;
dds_return_t rv;
char **exec_argv;
int exec_fds[2];
int exec_err;
@ -253,7 +253,7 @@ fail_pipe:
dds_retcode_t
dds_return_t
ddsrt_proc_waitpid(
ddsrt_pid_t pid,
dds_duration_t timeout,
@ -267,7 +267,7 @@ ddsrt_proc_waitpid(
dds_retcode_t
dds_return_t
ddsrt_proc_waitpids(
dds_duration_t timeout,
ddsrt_pid_t *pid,
@ -278,7 +278,7 @@ ddsrt_proc_waitpids(
dds_retcode_t
dds_return_t
ddsrt_proc_exists(
ddsrt_pid_t pid)
{
@ -294,7 +294,7 @@ ddsrt_proc_exists(
dds_retcode_t
dds_return_t
ddsrt_proc_kill(
ddsrt_pid_t pid)
{

42
src/ddsrt/src/process/windows/process.c
View file

@ -29,24 +29,24 @@ ddsrt_getpid(void)
static HANDLE pid_to_phdl (ddsrt_pid_t pid);
static dds_retcode_t process_get_exit_code(HANDLE phdl, int32_t *code);
static dds_retcode_t process_kill (HANDLE phdl);
static char* commandline (const char *exe, char *const argv_in[]);
static BOOL child_add (HANDLE phdl);
static void child_remove (HANDLE phdl);
static DWORD child_list (HANDLE *list, DWORD max);
static HANDLE child_handle (ddsrt_pid_t pid);
static HANDLE pid_to_phdl (ddsrt_pid_t pid);
static dds_return_t process_get_exit_code(HANDLE phdl, int32_t *code);
static dds_return_t process_kill (HANDLE phdl);
static char* commandline (const char *exe, char *const argv_in[]);
static BOOL child_add (HANDLE phdl);
static void child_remove (HANDLE phdl);
static DWORD child_list (HANDLE *list, DWORD max);
static HANDLE child_handle (ddsrt_pid_t pid);
dds_retcode_t
dds_return_t
ddsrt_proc_create(
const char *executable,
char *const argv[],
ddsrt_pid_t *pid)
{
dds_retcode_t rv = DDS_RETCODE_ERROR;
dds_return_t rv = DDS_RETCODE_ERROR;
PROCESS_INFORMATION process_info;
STARTUPINFO si;
char *cmd;
@ -111,13 +111,13 @@ ddsrt_proc_create(
dds_retcode_t
dds_return_t
ddsrt_proc_waitpid(
ddsrt_pid_t pid,
dds_duration_t timeout,
int32_t *code)
{
dds_retcode_t rv = DDS_RETCODE_OK;
dds_return_t rv = DDS_RETCODE_OK;
HANDLE phdl;
DWORD ret;
@ -155,13 +155,13 @@ ddsrt_proc_waitpid(
dds_retcode_t
dds_return_t
ddsrt_proc_waitpids(
dds_duration_t timeout,
ddsrt_pid_t *pid,
int32_t *code)
{
dds_retcode_t rv = DDS_RETCODE_OK;
dds_return_t rv = DDS_RETCODE_OK;
HANDLE hdls[MAXIMUM_WAIT_OBJECTS];
HANDLE phdl;
DWORD cnt;
@ -208,11 +208,11 @@ ddsrt_proc_waitpids(
dds_retcode_t
dds_return_t
ddsrt_proc_exists(
ddsrt_pid_t pid)
{
dds_retcode_t rv = DDS_RETCODE_NOT_FOUND;
dds_return_t rv = DDS_RETCODE_NOT_FOUND;
HANDLE phdl;
phdl = pid_to_phdl(pid);
@ -235,11 +235,11 @@ ddsrt_proc_exists(
dds_retcode_t
dds_return_t
ddsrt_proc_kill(
ddsrt_pid_t pid)
{
dds_retcode_t rv = DDS_RETCODE_BAD_PARAMETER;
dds_return_t rv = DDS_RETCODE_BAD_PARAMETER;
HANDLE phdl;
phdl = pid_to_phdl(pid);
@ -262,12 +262,12 @@ pid_to_phdl(ddsrt_pid_t pid)
static dds_retcode_t
static dds_return_t
process_get_exit_code(
HANDLE phdl,
int32_t *code)
{
dds_retcode_t rv = DDS_RETCODE_ERROR;
dds_return_t rv = DDS_RETCODE_ERROR;
DWORD tr;
assert(phdl != 0);
@ -289,7 +289,7 @@ process_get_exit_code(
/* Forcefully kill the given process. */
static dds_retcode_t
static dds_return_t
process_kill(HANDLE phdl)
{
assert(phdl != 0);

28
src/ddsrt/src/retcode.c
View file

@ -11,8 +11,7 @@
*/
#include "dds/ddsrt/retcode.h"
static const char *retcodes[] =
{
static const char *retcodes[] = {
"Success",
"Error",
"Unsupported",
@ -42,19 +41,20 @@ static const char *xretcodes[] = {
"Not found"
};
const char *
dds_strretcode (dds_retcode_t rc)
const char *dds_strretcode (dds_return_t rc)
{
if (rc >= 0 &&
rc < (dds_retcode_t)(sizeof(retcodes) / sizeof(retcodes[0])))
{
const dds_return_t nretcodes = (dds_return_t) (sizeof (retcodes) / sizeof (retcodes[0]));
const dds_return_t nxretcodes = (dds_return_t) (sizeof (xretcodes) / sizeof (xretcodes[0]));
/* Retcodes used to be positive, but return values from the API would be a negative
and so there are/were/may be places outside the core library where dds_strretcode
is called with a -N for N a API return value, so ... play it safe and use the
magnitude */
if (rc < 0)
rc = -rc;
if (rc >= 0 && rc < nretcodes)
return retcodes[rc];
} else if (rc >= (DDS_XRETCODE_BASE) &&
rc < (dds_retcode_t)(DDS_XRETCODE_BASE + (sizeof(xretcodes) / sizeof(xretcodes[0]))))
{
else if (rc >= DDS_XRETCODE_BASE && rc < DDS_XRETCODE_BASE + nxretcodes)
return xretcodes[rc - DDS_XRETCODE_BASE];
}
return "Unknown return code";
else
return "Unknown return code";
}

4
src/ddsrt/src/rusage/posix/rusage.c
View file

@ -23,12 +23,12 @@
#include "dds/ddsrt/rusage.h"
dds_retcode_t
dds_return_t
ddsrt_getrusage(int who, ddsrt_rusage_t *usage)
{
int err = 0;
struct rusage buf;
dds_retcode_t rc;
dds_return_t rc;
assert(who == DDSRT_RUSAGE_SELF || who == DDSRT_RUSAGE_THREAD);
assert(usage != NULL);

2
src/ddsrt/src/rusage/windows/rusage.c
View file

@ -24,7 +24,7 @@ filetime_to_time(const FILETIME *ft)
return ((ft->dwHighDateTime << 31) + (ft->dwLowDateTime)) * 100;
}
dds_retcode_t
dds_return_t
ddsrt_getrusage(int who, ddsrt_rusage_t *usage)
{
FILETIME stime, utime, ctime, etime;

6
src/ddsrt/src/sockets.c
View file

@ -177,7 +177,7 @@ ddsrt_sockaddr_insamesubnet(
return eq;
}
dds_retcode_t
dds_return_t
ddsrt_sockaddrfromstr(int af, const char *str, void *sa)
{
assert(str != NULL);
@ -213,7 +213,7 @@ ddsrt_sockaddrfromstr(int af, const char *str, void *sa)
return DDS_RETCODE_OK;
}
dds_retcode_t ddsrt_sockaddrtostr(const void *sa, char *buf, size_t size)
dds_return_t ddsrt_sockaddrtostr(const void *sa, char *buf, size_t size)
{
const char *ptr;
@ -249,7 +249,7 @@ DDSRT_WARNING_GNUC_ON(sign-conversion)
}
#if DDSRT_HAVE_DNS
dds_retcode_t
dds_return_t
ddsrt_gethostbyname(const char *name, int af, ddsrt_hostent_t **hentp)
{
int gai_err = 0;

4
src/ddsrt/src/sockets/posix/gethostname.c
View file

@ -34,7 +34,7 @@
#if LWIP_SOCKET
dds_retcode_t
dds_return_t
ddsrt_gethostname(
char *name,
size_t len)
@ -45,7 +45,7 @@ ddsrt_gethostname(
return DDS_RETCODE_OK;
}
#else
dds_retcode_t
dds_return_t
ddsrt_gethostname(
char *name,
size_t len)

34
src/ddsrt/src/sockets/posix/socket.c
View file

@ -37,7 +37,7 @@
#endif /* __APPLE__ */
#endif /* LWIP_SOCKET */
dds_retcode_t
dds_return_t
ddsrt_socket(ddsrt_socket_t *sockptr, int domain, int type, int protocol)
{
ddsrt_socket_t sock;
@ -68,7 +68,7 @@ ddsrt_socket(ddsrt_socket_t *sockptr, int domain, int type, int protocol)
return DDS_RETCODE_ERROR;
}
dds_retcode_t
dds_return_t
ddsrt_close(
ddsrt_socket_t sock)
{
@ -87,7 +87,7 @@ ddsrt_close(
return DDS_RETCODE_ERROR;
}
dds_retcode_t
dds_return_t
ddsrt_bind(
ddsrt_socket_t sock,
const struct sockaddr *addr,
@ -112,7 +112,7 @@ ddsrt_bind(
return DDS_RETCODE_ERROR;
}
dds_retcode_t
dds_return_t
ddsrt_listen(
ddsrt_socket_t sock,
int backlog)
@ -135,7 +135,7 @@ ddsrt_listen(
return DDS_RETCODE_ERROR;
}
dds_retcode_t
dds_return_t
ddsrt_connect(
ddsrt_socket_t sock,
const struct sockaddr *addr,
@ -177,7 +177,7 @@ ddsrt_connect(
return DDS_RETCODE_ERROR;
}
dds_retcode_t
dds_return_t
ddsrt_accept(
ddsrt_socket_t sock,
struct sockaddr *addr,
@ -224,7 +224,7 @@ ddsrt_accept(
return DDS_RETCODE_ERROR;
}
dds_retcode_t
dds_return_t
ddsrt_getsockname(
ddsrt_socket_t sock,
struct sockaddr *addr,
@ -248,7 +248,7 @@ ddsrt_getsockname(
return DDS_RETCODE_ERROR;
}
dds_retcode_t
dds_return_t
ddsrt_getsockopt(
ddsrt_socket_t sock,
int32_t level,
@ -282,7 +282,7 @@ ddsrt_getsockopt(
return DDS_RETCODE_ERROR;
}
dds_retcode_t
dds_return_t
ddsrt_setsockopt(
ddsrt_socket_t sock,
int32_t level,
@ -339,7 +339,7 @@ err_setsockopt:
return DDS_RETCODE_ERROR;
}
dds_retcode_t
dds_return_t
ddsrt_setsocknonblocking(
ddsrt_socket_t sock,
bool nonblock)
@ -377,7 +377,7 @@ err_fcntl:
return DDS_RETCODE_ERROR;
}
static inline dds_retcode_t
static inline dds_return_t
recv_error_to_retcode(int errnum)
{
switch (errnum) {
@ -406,7 +406,7 @@ recv_error_to_retcode(int errnum)
return DDS_RETCODE_ERROR;
}
dds_retcode_t
dds_return_t
ddsrt_recv(
ddsrt_socket_t sock,
void *buf,
@ -443,7 +443,7 @@ static ssize_t recvmsg(int sockfd, struct msghdr *msg, int flags)
}
#endif /* LWIP_SOCKET */
dds_retcode_t
dds_return_t
ddsrt_recvmsg(
ddsrt_socket_t sock,
ddsrt_msghdr_t *msg,
@ -461,7 +461,7 @@ ddsrt_recvmsg(
return recv_error_to_retcode(errno);
}
static inline dds_retcode_t
static inline dds_return_t
send_error_to_retcode(int errnum)
{
switch (errnum) {
@ -503,7 +503,7 @@ send_error_to_retcode(int errnum)
return DDS_RETCODE_ERROR;
}
dds_retcode_t
dds_return_t
ddsrt_send(
ddsrt_socket_t sock,
const void *buf,
@ -522,7 +522,7 @@ ddsrt_send(
return send_error_to_retcode(errno);
}
dds_retcode_t
dds_return_t
ddsrt_sendmsg(
ddsrt_socket_t sock,
const ddsrt_msghdr_t *msg,
@ -540,7 +540,7 @@ ddsrt_sendmsg(
return send_error_to_retcode(errno);
}
dds_retcode_t
dds_return_t
ddsrt_select(
int32_t nfds,
fd_set *readfds,

36
src/ddsrt/src/sockets/windows/socket.c
View file

@ -52,11 +52,11 @@ ddsrt_winsock_fini(void)
WSACleanup();
}
dds_retcode_t
dds_return_t
ddsrt_socket(ddsrt_socket_t *sockptr, int domain, int type, int protocol)
{
int err;
dds_retcode_t ret = DDS_RETCODE_OK;
dds_return_t ret = DDS_RETCODE_OK;
ddsrt_socket_t sock = DDSRT_INVALID_SOCKET;
assert(sockptr != NULL);
@ -93,7 +93,7 @@ ddsrt_socket(ddsrt_socket_t *sockptr, int domain, int type, int protocol)
return DDS_RETCODE_ERROR;
}
dds_retcode_t
dds_return_t
ddsrt_close(ddsrt_socket_t sock)
{
int err;
@ -120,7 +120,7 @@ ddsrt_close(ddsrt_socket_t sock)
return DDS_RETCODE_ERROR;
}
dds_retcode_t
dds_return_t
ddsrt_accept(
ddsrt_socket_t sock,
struct sockaddr *addr,
@ -162,7 +162,7 @@ ddsrt_accept(
return DDS_RETCODE_ERROR;
}
dds_retcode_t
dds_return_t
ddsrt_bind(ddsrt_socket_t sock, const struct sockaddr *addr, socklen_t addrlen)
{
int err;
@ -195,7 +195,7 @@ ddsrt_bind(ddsrt_socket_t sock, const struct sockaddr *addr, socklen_t addrlen)
return DDS_RETCODE_ERROR;
}
dds_retcode_t
dds_return_t
ddsrt_listen(
ddsrt_socket_t sock,
int backlog)
@ -227,7 +227,7 @@ ddsrt_listen(
return DDS_RETCODE_ERROR;
}
dds_retcode_t
dds_return_t
ddsrt_connect(
ddsrt_socket_t sock,
const struct sockaddr *addr,
@ -275,7 +275,7 @@ ddsrt_connect(
return DDS_RETCODE_ERROR;
}
dds_retcode_t
dds_return_t
ddsrt_getsockname(
ddsrt_socket_t sock,
struct sockaddr *addr,
@ -309,7 +309,7 @@ ddsrt_getsockname(
return DDS_RETCODE_ERROR;
}
dds_retcode_t
dds_return_t
ddsrt_getsockopt(
ddsrt_socket_t sock,
int32_t level,
@ -358,7 +358,7 @@ ddsrt_getsockopt(
return DDS_RETCODE_ERROR;
}
dds_retcode_t
dds_return_t
ddsrt_setsockopt(
ddsrt_socket_t sock,
int32_t level,
@ -404,7 +404,7 @@ ddsrt_setsockopt(
return DDS_RETCODE_ERROR;
}
dds_retcode_t
dds_return_t
ddsrt_setsocknonblocking(
ddsrt_socket_t sock,
bool nonblock)
@ -435,7 +435,7 @@ ddsrt_setsocknonblocking(
return DDS_RETCODE_ERROR;
}
static dds_retcode_t recv_error_to_retcode(int errnum)
static dds_return_t recv_error_to_retcode(int errnum)
{
assert(errnum != WSANOTINITIALISED);
switch (errnum) {
@ -470,7 +470,7 @@ static dds_retcode_t recv_error_to_retcode(int errnum)
return DDS_RETCODE_ERROR;
}
dds_retcode_t
dds_return_t
ddsrt_recv(
ddsrt_socket_t sock,
void *buf,
@ -490,7 +490,7 @@ ddsrt_recv(
return recv_error_to_retcode(WSAGetLastError());
}
dds_retcode_t
dds_return_t
ddsrt_recvmsg(
ddsrt_socket_t sock,
ddsrt_msghdr_t *msg,
@ -531,7 +531,7 @@ ddsrt_recvmsg(
return recv_error_to_retcode(err);
}
static dds_retcode_t
static dds_return_t
send_error_to_retcode(int errnum)
{
assert(errnum != WSANOTINITIALISED);
@ -577,7 +577,7 @@ send_error_to_retcode(int errnum)
return DDS_RETCODE_ERROR;
}
dds_retcode_t
dds_return_t
ddsrt_send(
ddsrt_socket_t sock,
const void *buf,
@ -608,7 +608,7 @@ struct iovec_matches_WSABUF {
char len_size_matches[sizeof(((ddsrt_iovec_t *)8)->iov_len) == sizeof(((WSABUF *)8)->len) ? 1 : -1];
};
dds_retcode_t
dds_return_t
ddsrt_sendmsg(
ddsrt_socket_t sock,
const ddsrt_msghdr_t *msg,
@ -639,7 +639,7 @@ ddsrt_sendmsg(
return send_error_to_retcode(WSAGetLastError());
}
dds_retcode_t
dds_return_t
ddsrt_select(
int32_t nfds,
fd_set *readfds,

2
src/ddsrt/src/string/posix/strerror.c
View file

@ -21,7 +21,7 @@
#include "dds/ddsrt/string.h"
dds_retcode_t
dds_return_t
ddsrt_strerror_r(int errnum, char *buf, size_t buflen)
{
assert(buf != NULL);

8
src/ddsrt/src/strtod.c
View file

@ -96,12 +96,12 @@ os_lcNumericReplace(char *str) {
}
}
dds_retcode_t
dds_return_t
ddsrt_strtod(const char *nptr, char **endptr, double *dblptr)
{
double dbl;
int orig_errno;
dds_retcode_t ret = DDS_RETCODE_OK;
dds_return_t ret = DDS_RETCODE_OK;
assert(nptr != NULL);
assert(dblptr != NULL);
@ -161,7 +161,7 @@ ddsrt_strtod(const char *nptr, char **endptr, double *dblptr)
return ret;
}
dds_retcode_t
dds_return_t
ddsrt_strtof(const char *nptr, char **endptr, float *fltptr)
{
/* Just use os_strtod(). */
@ -169,7 +169,7 @@ ddsrt_strtof(const char *nptr, char **endptr, float *fltptr)
point number is definitely not a double-precision floating point
number. */
double dbl = 0.0;
dds_retcode_t ret;
dds_return_t ret;
assert(nptr != NULL);
assert(fltptr != NULL);

16
src/ddsrt/src/strtol.c
View file

@ -29,7 +29,7 @@ int ddsrt_todigit(const int chr)
return -1;
}
static dds_retcode_t
static dds_return_t
ullfstr(
const char *str,
char **endptr,
@ -37,7 +37,7 @@ ullfstr(
unsigned long long *ullng,
unsigned long long max)
{
dds_retcode_t rc = DDS_RETCODE_OK;
dds_return_t rc = DDS_RETCODE_OK;
int num;
size_t cnt = 0;
unsigned long long tot = 0;
@ -86,14 +86,14 @@ ullfstr(
return rc;
}
dds_retcode_t
dds_return_t
ddsrt_strtoll(
const char *str,
char **endptr,
int32_t base,
long long *llng)
{
dds_retcode_t rc = DDS_RETCODE_OK;
dds_return_t rc = DDS_RETCODE_OK;
size_t cnt = 0;
long long tot = 1;
unsigned long long ullng = 0, max = INT64_MAX;
@ -122,14 +122,14 @@ ddsrt_strtoll(
return rc;
}
dds_retcode_t
dds_return_t
ddsrt_strtoull(
const char *str,
char **endptr,
int32_t base,
unsigned long long *ullng)
{
dds_retcode_t rc = DDS_RETCODE_OK;
dds_return_t rc = DDS_RETCODE_OK;
size_t cnt = 0;
unsigned long long tot = 1;
unsigned long long max = UINT64_MAX;
@ -157,7 +157,7 @@ ddsrt_strtoull(
return rc;
}
dds_retcode_t
dds_return_t
ddsrt_atoll(
const char *str,
long long *llng)
@ -165,7 +165,7 @@ ddsrt_atoll(
return ddsrt_strtoll(str, NULL, 10, llng);
}
dds_retcode_t
dds_return_t
ddsrt_atoull(
const char *str,
unsigned long long *ullng)

8
src/ddsrt/src/thread_pool.c
View file

@ -88,13 +88,13 @@ static uint32_t ddsrt_thread_start_fn (void * arg)
return 0;
}
static dds_retcode_t ddsrt_thread_pool_new_thread (ddsrt_thread_pool pool)
static dds_return_t ddsrt_thread_pool_new_thread (ddsrt_thread_pool pool)
{
static unsigned char pools = 0; /* Pool counter - TODO make atomic */
char name [64];
ddsrt_thread_t id;
dds_retcode_t res;
dds_return_t res;
(void) snprintf (name, sizeof (name), "OSPL-%u-%u", pools++, pool->m_count++);
res = ddsrt_thread_create (&id, name, &pool->m_attr, &ddsrt_thread_start_fn, pool);
@ -205,9 +205,9 @@ void ddsrt_thread_pool_free (ddsrt_thread_pool pool)
ddsrt_free (pool);
}
dds_retcode_t ddsrt_thread_pool_submit (ddsrt_thread_pool pool, void (*fn) (void *arg), void * arg)
dds_return_t ddsrt_thread_pool_submit (ddsrt_thread_pool pool, void (*fn) (void *arg), void * arg)
{
dds_retcode_t res = DDS_RETCODE_OK;
dds_return_t res = DDS_RETCODE_OK;
ddsi_work_queue_job_t job;
ddsrt_mutex_lock (&pool->m_mutex);

8
src/ddsrt/src/threads/posix/threads.c
View file

@ -187,7 +187,7 @@ static void *os_startRoutineWrapper (void *threadContext)
return (void *)resultValue;
}
dds_retcode_t
dds_return_t
ddsrt_thread_create (
ddsrt_thread_t *threadptr,
const char *name,
@ -346,7 +346,7 @@ bool ddsrt_thread_equal(ddsrt_thread_t a, ddsrt_thread_t b)
return (pthread_equal(a.v, b.v) != 0);
}
dds_retcode_t
dds_return_t
ddsrt_thread_join(ddsrt_thread_t thread, uint32_t *thread_result)
{
int err;
@ -386,7 +386,7 @@ static void thread_init(void)
(void)pthread_once(&thread_once, &thread_init_once);
}
dds_retcode_t ddsrt_thread_cleanup_push (void (*routine) (void *), void *arg)
dds_return_t ddsrt_thread_cleanup_push (void (*routine) (void *), void *arg)
{
int err;
thread_cleanup_t *prev, *tail;
@ -408,7 +408,7 @@ dds_retcode_t ddsrt_thread_cleanup_push (void (*routine) (void *), void *arg)
return DDS_RETCODE_OUT_OF_RESOURCES;
}
dds_retcode_t ddsrt_thread_cleanup_pop (int execute)
dds_return_t ddsrt_thread_cleanup_pop (int execute)
{
int err;
thread_cleanup_t *tail;

8
src/ddsrt/src/threads/windows/threads.c
View file

@ -43,7 +43,7 @@ os_startRoutineWrapper(
return resultValue;
}
dds_retcode_t
dds_return_t
ddsrt_thread_create(
ddsrt_thread_t *thrptr,
const char *name,
@ -139,7 +139,7 @@ bool ddsrt_thread_equal(ddsrt_thread_t a, ddsrt_thread_t b)
* should not be closed until the os_threadWaitExit(...) call is called.
* CloseHandle (threadHandle);
*/
dds_retcode_t
dds_return_t
ddsrt_thread_join(
ddsrt_thread_t thread,
uint32_t *thread_result)
@ -248,7 +248,7 @@ ddsrt_thread_setname(
static ddsrt_thread_local thread_cleanup_t *thread_cleanup = NULL;
dds_retcode_t ddsrt_thread_cleanup_push(void (*routine)(void *), void *arg)
dds_return_t ddsrt_thread_cleanup_push(void (*routine)(void *), void *arg)
{
thread_cleanup_t *tail;
@ -265,7 +265,7 @@ dds_retcode_t ddsrt_thread_cleanup_push(void (*routine)(void *), void *arg)
return DDS_RETCODE_OUT_OF_RESOURCES;
}
dds_retcode_t ddsrt_thread_cleanup_pop(int execute)
dds_return_t ddsrt_thread_cleanup_pop(int execute)
{
thread_cleanup_t *tail;

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;