diff options
author | Sverker Eriksson <[email protected]> | 2017-01-03 16:08:45 +0100 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2017-01-03 16:08:45 +0100 |
commit | b60bdd762bc2f42b3e4eebf7256e7aa9e79dced1 (patch) | |
tree | 2b737bde7d12271e4de46766d071e91304e01a88 /erts/emulator/test/port_SUITE_data/port_test.c | |
parent | ae1c4b4dd1a4333727adb6875340e556a403a7fc (diff) | |
parent | 2a3dd48a0bfffbaf43622972a75bd733c23b31d4 (diff) | |
download | otp-b60bdd762bc2f42b3e4eebf7256e7aa9e79dced1.tar.gz otp-b60bdd762bc2f42b3e4eebf7256e7aa9e79dced1.tar.bz2 otp-b60bdd762bc2f42b3e4eebf7256e7aa9e79dced1.zip |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/test/port_SUITE_data/port_test.c')
-rw-r--r-- | erts/emulator/test/port_SUITE_data/port_test.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/erts/emulator/test/port_SUITE_data/port_test.c b/erts/emulator/test/port_SUITE_data/port_test.c index cc3ebdf0f8..e199a0fc13 100644 --- a/erts/emulator/test/port_SUITE_data/port_test.c +++ b/erts/emulator/test/port_SUITE_data/port_test.c @@ -10,6 +10,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> +#include <ctype.h> #ifndef __WIN32__ #include <unistd.h> @@ -33,7 +34,7 @@ exit(1); \ } -#define MAIN(argc, argv) main(argc, argv) +#define ASSERT(e) ((void) ((e) ? 1 : abort())) extern int errno; @@ -105,9 +106,7 @@ int err; #endif -MAIN(argc, argv) -int argc; -char *argv[]; +int main(int argc, char *argv[]) { int ret, fd_count; if((port_data = (PORT_TEST_DATA *) malloc(sizeof(PORT_TEST_DATA))) == NULL) { @@ -377,9 +376,11 @@ write_reply(buf, size) int size; /* Size of buffer to send. */ { int n; /* Temporary to hold size. */ + int rv; if (port_data->slow_writes <= 0) { /* Normal, "fast", write. */ - write(port_data->fd_to_erl, buf, size); + rv = write(port_data->fd_to_erl, buf, size); + ASSERT(rv == size); } else { /* * Write chunks with delays in between. @@ -387,7 +388,8 @@ write_reply(buf, size) while (size > 0) { n = size > port_data->slow_writes ? port_data->slow_writes : size; - write(port_data->fd_to_erl, buf, n); + rv = write(port_data->fd_to_erl, buf, n); + ASSERT(rv == n); size -= n; buf += n; if (size) @@ -558,7 +560,7 @@ char* spec; /* Specification for reply. */ buf = (char *) malloc(total_size); if (buf == NULL) { fprintf(stderr, "%s: insufficent memory for reply buffer of size %d\n", - port_data->progname, total_size); + port_data->progname, (int)total_size); exit(1); } |