Skip to content

Commit 743e592

Browse files
committed
remove ddsrt_exit
From feedback comment, it really is unnecessary.
1 parent db375be commit 743e592

File tree

4 files changed

+6
-21
lines changed

4 files changed

+6
-21
lines changed

src/core/xtests/symbol_export/symbol_export.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,6 @@ int main (int argc, char **argv)
848848
ddsrt_getpid ();
849849
ddsrt_getprocessname ();
850850
ddsrt_abort ();
851-
ddsrt_exit(0);
852851

853852
// ddsrt/time.h
854853
ddsrt_mtime_t mt = { .v = 0};

src/ddsrt/include/dds/ddsrt/process.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,6 @@ ddsrt_getprocessname(void);
7979
DDS_EXPORT void
8080
ddsrt_abort (void) ddsrt_attribute_noreturn;
8181

82-
/**
83-
* @brief Performs a normal process termination.
84-
*
85-
* @param status
86-
* @returns The least significant byte of `status` is returned to the parent.
87-
*/
88-
DDS_EXPORT void
89-
ddsrt_exit(int status) ddsrt_attribute_noreturn;
90-
9182
#if defined (__cplusplus)
9283
}
9384
#endif

src/ddsrt/src/process/posix/process.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,3 @@ ddsrt_abort(void)
9090
abort();
9191
}
9292

93-
void
94-
ddsrt_exit(int status)
95-
{
96-
exit(status);
97-
}

src/tools/ddsperf/ddsperf.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ static void verrorx (int exitcode, const char *fmt, va_list ap)
391391
{
392392
vprintf (fmt, ap);
393393
fflush (stdout);
394-
ddsrt_exit (exitcode);
394+
exit (exitcode);
395395
}
396396

397397
static void error2 (const char *fmt, ...)
@@ -728,7 +728,7 @@ static uint32_t pubthread (void *varg)
728728
{
729729
printf ("dds_register_instance failed: %d\n", result);
730730
fflush (stdout);
731-
ddsrt_exit (2);
731+
exit (2);
732732
}
733733
}
734734
}
@@ -751,7 +751,7 @@ static uint32_t pubthread (void *varg)
751751
{
752752
printf ("request loan error: %d\n", result);
753753
fflush (stdout);
754-
ddsrt_exit (2);
754+
exit (2);
755755
}
756756
else
757757
{
@@ -765,7 +765,7 @@ static uint32_t pubthread (void *varg)
765765
printf ("write error: %d\n", result);
766766
fflush (stdout);
767767
if (result != DDS_RETCODE_TIMEOUT)
768-
ddsrt_exit (2);
768+
exit (2);
769769
/* retry with original timestamp, it really is just a way of reporting
770770
blocking for an exceedingly long time, but do force a fresh time stamp
771771
for the next sample */
@@ -976,7 +976,7 @@ static int check_eseq (struct eseq_admin *ea, uint32_t seq, uint32_t keyval, uin
976976
if (keyval >= ea->nkeys)
977977
{
978978
printf ("received key %"PRIu32" >= nkeys %u\n", keyval, ea->nkeys);
979-
ddsrt_exit (3);
979+
exit (3);
980980
}
981981
ddsrt_mutex_lock (&ea->lock);
982982
for (uint32_t i = 0; i < ea->nph; i++)
@@ -1970,7 +1970,7 @@ EXAMPLES:\n\
19701970
running for 10s\n\
19711971
", argv0, argv0, argv0);
19721972
fflush (stdout);
1973-
ddsrt_exit (3);
1973+
exit (3);
19741974
}
19751975

19761976
struct string_int_map_elem {

0 commit comments

Comments
 (0)