summaryrefslogtreecommitdiffstats
path: root/test/file_image.c
diff options
context:
space:
mode:
Diffstat (limited to 'test/file_image.c')
-rw-r--r--test/file_image.c70
1 files changed, 35 insertions, 35 deletions
diff --git a/test/file_image.c b/test/file_image.c
index 2b4e481..81b49d6 100644
--- a/test/file_image.c
+++ b/test/file_image.c
@@ -79,8 +79,8 @@ typedef struct {
static int
test_properties(void)
{
- hid_t fapl_1 = -1;
- hid_t fapl_2 = -1;
+ hid_t fapl_1 = H5I_INVALID_HID;
+ hid_t fapl_2 = H5I_INVALID_HID;
char *buffer = 0;
int count = 10;
void *temp = 0;
@@ -552,10 +552,10 @@ test_core(void)
VERIFY(tmp != NULL, "h5_fixname failed");
/* Append ".copy" to the filename from the source directory */
- VERIFY(HDstrlen(filename) < (1023 - 5), "file name too long.");
- HDstrncpy(copied_filename, filename, (size_t)1023);
+ VERIFY(strlen(filename) < (1023 - 5), "file name too long.");
+ strncpy(copied_filename, filename, (size_t)1023);
copied_filename[1023] = '\0';
- HDstrcat(copied_filename, ".copy");
+ strcat(copied_filename, ".copy");
/* Make a copy of the data file from svn. */
ret = h5_make_local_copy(filename, copied_filename);
@@ -676,31 +676,31 @@ error:
*/
H5_GCC_CLANG_DIAG_OFF("format-nonliteral")
static int
-test_get_file_image(const char *test_banner, const int file_name_num, hid_t fapl, hbool_t user)
+test_get_file_image(const char *test_banner, const int file_name_num, hid_t fapl, bool user)
{
char file_name[1024] = "\0";
void *insertion_ptr = NULL;
void *image_ptr = NULL;
void *file_image_ptr = NULL;
- hbool_t is_family_file = FALSE;
- hbool_t identical;
+ bool is_family_file = false;
+ bool identical;
int data[100];
int i;
int fd = -1;
int result;
- hid_t driver = -1;
- hid_t file_id = -1;
- hid_t dset_id = -1;
- hid_t space_id = -1;
- hid_t core_fapl_id = -1;
- hid_t core_file_id = -1;
+ hid_t driver = H5I_INVALID_HID;
+ hid_t file_id = H5I_INVALID_HID;
+ hid_t dset_id = H5I_INVALID_HID;
+ hid_t space_id = H5I_INVALID_HID;
+ hid_t core_fapl_id = H5I_INVALID_HID;
+ hid_t core_file_id = H5I_INVALID_HID;
herr_t err;
hsize_t dims[2];
ssize_t bytes_read;
ssize_t image_size;
ssize_t file_size;
h5_stat_t stat_buf;
- hid_t fcpl = -1;
+ hid_t fcpl = H5I_INVALID_HID;
herr_t ret;
TESTING(test_banner);
@@ -710,11 +710,11 @@ test_get_file_image(const char *test_banner, const int file_name_num, hid_t fapl
VERIFY(driver >= 0, "H5Pget_driver(fapl) failed");
if (driver == H5FD_FAMILY)
- is_family_file = TRUE;
+ is_family_file = true;
/* setup the file name */
h5_fixname(FILENAME2[file_name_num], fapl, file_name, sizeof(file_name));
- VERIFY(HDstrlen(file_name) > 0, "h5_fixname failed");
+ VERIFY(strlen(file_name) > 0, "h5_fixname failed");
fcpl = H5Pcreate(H5P_FILE_CREATE);
VERIFY(fcpl >= 0, "H5Pcreate");
@@ -783,7 +783,7 @@ test_get_file_image(const char *test_banner, const int file_name_num, hid_t fapl
file_size = 0;
do {
- HDsnprintf(member_file_name, (size_t)1024, file_name, i);
+ snprintf(member_file_name, (size_t)1024, file_name, i);
/* get the size of the member file */
result = HDstat(member_file_name, &stat_buf);
@@ -811,7 +811,7 @@ test_get_file_image(const char *test_banner, const int file_name_num, hid_t fapl
while (size_remaining > 0) {
/* construct the member file name */
- HDsnprintf(member_file_name, 1024, file_name, i);
+ snprintf(member_file_name, 1024, file_name, i);
/* open the test file using standard I/O calls */
fd = HDopen(member_file_name, O_RDONLY);
@@ -871,7 +871,7 @@ test_get_file_image(const char *test_banner, const int file_name_num, hid_t fapl
HDoff_t off;
/* Position at userblock */
- off = HDlseek(fd, (off_t)USERBLOCK_SIZE, SEEK_SET);
+ off = HDlseek(fd, (HDoff_t)USERBLOCK_SIZE, SEEK_SET);
VERIFY(off >= 0, "HDlseek() failed.");
}
@@ -885,11 +885,11 @@ test_get_file_image(const char *test_banner, const int file_name_num, hid_t fapl
}
/* verify that the file and the image contain the same data */
- identical = TRUE;
+ identical = true;
i = 0;
while ((i < (int)image_size) && identical) {
if (((char *)image_ptr)[i] != ((char *)file_image_ptr)[i])
- identical = FALSE;
+ identical = false;
i++;
}
VERIFY(identical, "file and image differ.");
@@ -901,7 +901,7 @@ test_get_file_image(const char *test_banner, const int file_name_num, hid_t fapl
VERIFY(core_fapl_id >= 0, "H5Pcreate() failed");
/* setup core_fapl_id to use the core file driver */
- err = H5Pset_fapl_core(core_fapl_id, (size_t)(64 * 1024), FALSE);
+ err = H5Pset_fapl_core(core_fapl_id, (size_t)(64 * 1024), false);
VERIFY(err == SUCCEED, "H5Pset_fapl_core() failed.");
/* Set file image in core fapl */
@@ -958,10 +958,10 @@ test_get_file_image_error_rejection(void)
void *image_ptr = NULL;
int data[100];
int i;
- hid_t fapl_id = -1;
- hid_t file_id = -1;
- hid_t dset_id = -1;
- hid_t space_id = -1;
+ hid_t fapl_id = H5I_INVALID_HID;
+ hid_t file_id = H5I_INVALID_HID;
+ hid_t dset_id = H5I_INVALID_HID;
+ hid_t space_id = H5I_INVALID_HID;
herr_t err;
hsize_t dims[2];
ssize_t bytes_read;
@@ -994,7 +994,7 @@ test_get_file_image_error_rejection(void)
/* setup the file name */
h5_fixname(FILENAME2[6], fapl_id, file_name, sizeof(file_name));
- VERIFY(HDstrlen(file_name) > 0, "h5_fixname failed");
+ VERIFY(strlen(file_name) > 0, "h5_fixname failed");
/* create the file */
file_id = H5Fcreate(file_name, 0, H5P_DEFAULT, fapl_id);
@@ -1121,12 +1121,12 @@ test_get_file_image_error_rejection(void)
VERIFY(fapl_id >= 0, "H5Pcreate(2) failed");
/* setup the fapl for the multi file driver */
- err = H5Pset_fapl_multi(fapl_id, memb_map, memb_fapl, memb_name, memb_addr, FALSE);
+ err = H5Pset_fapl_multi(fapl_id, memb_map, memb_fapl, memb_name, memb_addr, false);
VERIFY(err >= 0, "H5Pset_fapl_multi failed");
/* setup the file name */
h5_fixname(FILENAME2[4], fapl_id, file_name, sizeof(file_name));
- VERIFY(HDstrlen(file_name) > 0, "h5_fixname failed");
+ VERIFY(strlen(file_name) > 0, "h5_fixname failed");
/* create the file */
file_id = H5Fcreate(file_name, 0, H5P_DEFAULT, fapl_id);
@@ -1188,7 +1188,7 @@ test_get_file_image_error_rejection(void)
/* setup the file name */
h5_fixname(FILENAME2[5], fapl_id, file_name, sizeof(file_name));
- VERIFY(HDstrlen(file_name) > 0, "h5_fixname failed");
+ VERIFY(strlen(file_name) > 0, "h5_fixname failed");
/* create the file */
file_id = H5Fcreate(file_name, 0, H5P_DEFAULT, fapl_id);
@@ -1248,7 +1248,7 @@ test_get_file_image_error_rejection(void)
VERIFY(err >= 0, "H5Pset_fapl_family failed");
h5_fixname(FILENAME2[3], fapl_id, file_name, sizeof(file_name));
- VERIFY(HDstrlen(file_name) > 0, "h5_fixname failed");
+ VERIFY(strlen(file_name) > 0, "h5_fixname failed");
/* create the file */
file_id = H5Fcreate(file_name, 0, H5P_DEFAULT, fapl_id);
@@ -1308,7 +1308,7 @@ main(void)
{
int errors = 0;
hid_t fapl;
- hbool_t driver_is_default_compatible;
+ bool driver_is_default_compatible;
unsigned user;
h5_reset();
@@ -1325,7 +1325,7 @@ main(void)
}
/* Perform tests with/without user block */
- for (user = FALSE; user <= TRUE; user++) {
+ for (user = false; user <= true; user++) {
/* test H5Fget_file_image() with sec2 driver */
fapl = H5Pcreate(H5P_FILE_ACCESS);
@@ -1343,7 +1343,7 @@ main(void)
/* test H5Fget_file_image() with core driver */
fapl = H5Pcreate(H5P_FILE_ACCESS);
- if (H5Pset_fapl_core(fapl, (size_t)(64 * 1024), TRUE) < 0)
+ if (H5Pset_fapl_core(fapl, (size_t)(64 * 1024), true) < 0)
errors++;
else
errors += test_get_file_image("H5Fget_file_image() with core driver", 2, fapl, user);