diff --git a/src/core/xtests/symbol_export/symbol_export.c b/src/core/xtests/symbol_export/symbol_export.c index f9f4fe59ab..ef86d00222 100644 --- a/src/core/xtests/symbol_export/symbol_export.c +++ b/src/core/xtests/symbol_export/symbol_export.c @@ -848,7 +848,6 @@ int main (int argc, char **argv) ddsrt_getpid (); ddsrt_getprocessname (); ddsrt_abort (); - ddsrt_exit(0); // ddsrt/time.h ddsrt_mtime_t mt = { .v = 0}; diff --git a/src/ddsrt/include/dds/ddsrt/process.h b/src/ddsrt/include/dds/ddsrt/process.h index a4b6928e4e..cb38483187 100644 --- a/src/ddsrt/include/dds/ddsrt/process.h +++ b/src/ddsrt/include/dds/ddsrt/process.h @@ -79,15 +79,6 @@ ddsrt_getprocessname(void); DDS_EXPORT void ddsrt_abort (void) ddsrt_attribute_noreturn; -/** - * @brief Performs a normal process termination. - * - * @param status - * @returns The least significant byte of `status` is returned to the parent. - */ -DDS_EXPORT void -ddsrt_exit(int status) ddsrt_attribute_noreturn; - #if defined (__cplusplus) } #endif diff --git a/src/ddsrt/src/process/posix/process.c b/src/ddsrt/src/process/posix/process.c index 9455c21a8e..b80b676ec3 100644 --- a/src/ddsrt/src/process/posix/process.c +++ b/src/ddsrt/src/process/posix/process.c @@ -90,8 +90,3 @@ ddsrt_abort(void) abort(); } -void -ddsrt_exit(int status) -{ - exit(status); -} diff --git a/src/tools/ddsperf/ddsperf.c b/src/tools/ddsperf/ddsperf.c index 07516a8e75..8df98517c4 100644 --- a/src/tools/ddsperf/ddsperf.c +++ b/src/tools/ddsperf/ddsperf.c @@ -391,7 +391,7 @@ static void verrorx (int exitcode, const char *fmt, va_list ap) { vprintf (fmt, ap); fflush (stdout); - ddsrt_exit (exitcode); + exit (exitcode); } static void error2 (const char *fmt, ...) @@ -728,7 +728,7 @@ static uint32_t pubthread (void *varg) { printf ("dds_register_instance failed: %d\n", result); fflush (stdout); - ddsrt_exit (2); + exit (2); } } } @@ -751,7 +751,7 @@ static uint32_t pubthread (void *varg) { printf ("request loan error: %d\n", result); fflush (stdout); - ddsrt_exit (2); + exit (2); } else { @@ -765,7 +765,7 @@ static uint32_t pubthread (void *varg) printf ("write error: %d\n", result); fflush (stdout); if (result != DDS_RETCODE_TIMEOUT) - ddsrt_exit (2); + exit (2); /* retry with original timestamp, it really is just a way of reporting blocking for an exceedingly long time, but do force a fresh time stamp for the next sample */ @@ -976,7 +976,7 @@ static int check_eseq (struct eseq_admin *ea, uint32_t seq, uint32_t keyval, uin if (keyval >= ea->nkeys) { printf ("received key %"PRIu32" >= nkeys %u\n", keyval, ea->nkeys); - ddsrt_exit (3); + exit (3); } ddsrt_mutex_lock (&ea->lock); for (uint32_t i = 0; i < ea->nph; i++) @@ -1970,7 +1970,7 @@ EXAMPLES:\n\ running for 10s\n\ ", argv0, argv0, argv0); fflush (stdout); - ddsrt_exit (3); + exit (3); } struct string_int_map_elem {