diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-07-28 14:08:44 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-28 14:08:44 (GMT) |
| commit | 9ef2f993cfc7173712729fb40b34d1edae8509d9 (patch) | |
| tree | 937a98f4d50cf0cca08fa105ae37589aedb8975c /test/dt_arith.c | |
| parent | f563c2b926445f7a975553bc7742a38f42d3b6f4 (diff) | |
| download | hdf5-9ef2f993cfc7173712729fb40b34d1edae8509d9.zip hdf5-9ef2f993cfc7173712729fb40b34d1edae8509d9.tar.gz hdf5-9ef2f993cfc7173712729fb40b34d1edae8509d9.tar.bz2 | |
Sync test dir w/ develop (#3303)
Diffstat (limited to 'test/dt_arith.c')
| -rw-r--r-- | test/dt_arith.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/test/dt_arith.c b/test/dt_arith.c index 7c3ded6..ed80d5f 100644 --- a/test/dt_arith.c +++ b/test/dt_arith.c @@ -42,7 +42,7 @@ #endif #define SET_ALIGNMENT(TYPE, VAL) H5T_NATIVE_##TYPE##_ALIGN_g = MAX(H5T_NATIVE_##TYPE##_ALIGN_g, VAL) -const char *FILENAME[] = {"dt_arith1", "dt_arith2", NULL}; +static const char *FILENAME[] = {"dt_arith1", "dt_arith2", NULL}; /* * Count up or down depending on whether the machine is big endian or little @@ -103,7 +103,7 @@ static int without_hardware_g = 0; * This algorithm is mainly to avoid any casting and comparison between source and destination types * for compiler, because we're testing conversions. */ #define INIT_INTEGER(TYPE, SRC_MAX, SRC_MIN, SRC_SIZE, DST_SIZE, SRC_PREC, BUF, SAVED, NELMTS) \ - { \ + do { \ unsigned char *buf_p, *saved_p; \ unsigned int n; \ TYPE value1 = 1; \ @@ -157,13 +157,13 @@ static int without_hardware_g = 0; if (n < SRC_PREC - 1) \ value2 = (TYPE)(value2 << 1); \ } \ - } + } while (0) /* Change a buffer's byte order from big endian to little endian. It's mainly for library's * bit operations which handle only little endian order. */ #define CHANGE_ORDER(EBUF, EORDER, ESIZE) \ - { \ + do { \ unsigned int m; \ if (H5T_ORDER_BE == EORDER) { \ unsigned char mediator; \ @@ -187,14 +187,14 @@ static int without_hardware_g = 0; EBUF[(ESIZE - 1) - m] = mediator2; \ } \ } \ - } + } while (0) /* Allocate buffer and initialize it with floating-point normalized values. * It's for conversion test of floating-point as the source. */ #define INIT_FP_NORM(TYPE, SRC_MAX, SRC_MIN, SRC_MAX_10_EXP, SRC_MIN_10_EXP, SRC_SIZE, DST_SIZE, BUF, SAVED, \ NELMTS) \ - { \ + do { \ unsigned char *buf_p, *saved_p; \ size_t num_norm, factor, n; \ TYPE value1, value2; \ @@ -267,13 +267,13 @@ static int without_hardware_g = 0; memcpy(saved_p, &value2, SRC_SIZE); \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ - } + } while (0) /* Allocate buffer and initialize it with floating-point denormalized values. * It's for conversion test of floating-point as the source. */ #define INIT_FP_DENORM(TYPE, SRC_MANT_DIG, SRC_SIZE, SRC_PREC, SRC_ORDR, DST_SIZE, BUF, SAVED, NELMTS) \ - { \ + do { \ unsigned char *buf_p, *saved_p; \ unsigned char *tmp1, *tmp2; \ size_t n; \ @@ -319,13 +319,13 @@ static int without_hardware_g = 0; } \ free(tmp1); \ free(tmp2); \ - } + } while (0) /* Allocate buffer and initialize it with floating-point special values, +/-0, +/-infinity, * +/-QNaN, +/-SNaN. It's for conversion test of floating-point as the source. */ #define INIT_FP_SPECIAL(SRC_SIZE, SRC_PREC, SRC_ORDR, SRC_MANT_DIG, DST_SIZE, BUF, SAVED, NELMTS) \ - { \ + do { \ unsigned char *buf_p; \ unsigned char *value; \ int n; \ @@ -383,7 +383,7 @@ static int without_hardware_g = 0; \ memcpy(SAVED, BUF, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ free(value); \ - } + } while (0) static hbool_t overflows(unsigned char *origin_bits, hid_t src_id, size_t dst_num_bits); static int my_isnan(dtype_t type, void *val); @@ -745,7 +745,7 @@ error: { H5Pclose(dxpl_id); } - H5E_END_TRY; + H5E_END_TRY if (buf1) free(buf1); if (buf2) @@ -1199,7 +1199,7 @@ error: H5Pclose(dxpl_id); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY /* Restore the default error handler (set in h5_reset()) */ h5_restore_err(); @@ -1508,7 +1508,7 @@ error: H5Pclose(dxpl_id); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY /* Restore the default error handler (set in h5_reset()) */ h5_restore_err(); @@ -2785,12 +2785,12 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) */ fflush(stdout); fflush(stderr); - if ((child_pid = HDfork()) < 0) { + if ((child_pid = fork()) < 0) { HDperror("fork"); return 1; } else if (child_pid > 0) { - while (child_pid != HDwaitpid(child_pid, &status, 0)) /*void*/ + while (child_pid != waitpid(child_pid, &status, 0)) /*void*/ ; if (WIFEXITED(status) && 255 == WEXITSTATUS(status)) { return 0; /*child exit after catching SIGFPE*/ |