summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-08-01 15:24:09 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-08-01 15:24:09 (GMT)
commitdfb6d9a996679eb0b098db2181b703aa3609d1fa (patch)
treee413ff2b220360607fe5fe68d633c893d8bf14dd
parentbb8904a75e68c925162e77169a47d4eb2ac00bd3 (diff)
parentff8d8a9edb3b8012fa02d2b9fa3c823fee7575fa (diff)
downloadhdf5-dfb6d9a996679eb0b098db2181b703aa3609d1fa.zip
hdf5-dfb6d9a996679eb0b098db2181b703aa3609d1fa.tar.gz
hdf5-dfb6d9a996679eb0b098db2181b703aa3609d1fa.tar.bz2
Merge pull request #1827 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'ff8d8a9edb3b8012fa02d2b9fa3c823fee7575fa': Fix conflicting types for reset_raw_data_files() parameter in external_common.c changed from int to hbool_t. Change 0 and 1 to FALSE and TRUE in calls to reset_raw_data_files().
-rw-r--r--test/external.c12
-rw-r--r--test/external_common.c2
-rw-r--r--test/external_env.c2
3 files changed, 8 insertions, 8 deletions
diff --git a/test/external.c b/test/external.c
index 597878f..2a90711 100644
--- a/test/external.c
+++ b/test/external.c
@@ -636,7 +636,7 @@ test_read_file_set(hid_t fapl)
TEST_ERROR
/* Reset the raw data files */
- if(reset_raw_data_files(0) < 0)
+ if(reset_raw_data_files(FALSE) < 0)
TEST_ERROR
/* Create the file and an initial group. This causes messages about
@@ -776,7 +776,7 @@ test_write_file_set(hid_t fapl)
} /* end for */
/* Reset the raw data files */
- if(reset_raw_data_files(0) < 0)
+ if(reset_raw_data_files(FALSE) < 0)
TEST_ERROR
/* Create the dataset */
@@ -877,7 +877,7 @@ test_path_absolute(hid_t fapl)
FAIL_STACK_ERROR
/* Reset the raw data files */
- if(reset_raw_data_files(0) < 0)
+ if(reset_raw_data_files(FALSE) < 0)
TEST_ERROR
/* Create the dcpl */
@@ -973,7 +973,7 @@ test_path_relative(hid_t fapl)
FAIL_STACK_ERROR;
/* Reset the raw data files */
- if(reset_raw_data_files(0) < 0)
+ if(reset_raw_data_files(FALSE) < 0)
TEST_ERROR
/* Create the dataset */
@@ -1068,7 +1068,7 @@ test_path_relative_cwd(hid_t fapl)
FAIL_STACK_ERROR;
/* Reset the raw data files */
- if(reset_raw_data_files(0) < 0)
+ if(reset_raw_data_files(FALSE) < 0)
TEST_ERROR
/* Create the dataset */
@@ -1210,7 +1210,7 @@ test_h5d_get_access_plist(hid_t fapl_id)
TEST_ERROR
/* Reset the raw data files */
- if(reset_raw_data_files(0) < 0)
+ if(reset_raw_data_files(FALSE) < 0)
TEST_ERROR
/* Create the file */
diff --git a/test/external_common.c b/test/external_common.c
index c3aa455..c9b6584 100644
--- a/test/external_common.c
+++ b/test/external_common.c
@@ -35,7 +35,7 @@
*-------------------------------------------------------------------------
*/
herr_t
-reset_raw_data_files(int is_env)
+reset_raw_data_files(hbool_t is_env)
{
int fd = 0; /* external file descriptor */
size_t i, j; /* iterators */
diff --git a/test/external_env.c b/test/external_env.c
index 8ecebf6..0a96f8e 100644
--- a/test/external_env.c
+++ b/test/external_env.c
@@ -70,7 +70,7 @@ test_path_env(hid_t fapl)
FAIL_STACK_ERROR
/* Reset the raw data files */
- if(reset_raw_data_files(1) < 0)
+ if(reset_raw_data_files(TRUE) < 0)
TEST_ERROR
/* Create the dataset */