diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2014-07-30 20:56:40 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2014-07-30 20:56:40 (GMT) |
commit | e8c162613b75fb3b269830defa769728f439db72 (patch) | |
tree | 7c02108c8d1012fb7e8a2b54c5503a5c2f5c019c /test/h5test.c | |
parent | ff1a9ae0e74ded0274729313ba24df578ffaf678 (diff) | |
download | hdf5-e8c162613b75fb3b269830defa769728f439db72.zip hdf5-e8c162613b75fb3b269830defa769728f439db72.tar.gz hdf5-e8c162613b75fb3b269830defa769728f439db72.tar.bz2 |
[svn-r25497] Description:
Merge changes that correspond to the 64-bit ID changes (without the actual
switch to 64-bit IDs) to the 1.8 release branch. (Plus a few minor cleanups
and alignments with the trunk that aren't on the branch)
Tested on:
Mac OSX/64 10.9.4 (amazon) w/C++ & FORTRAN
(h5committested on branch already for a week)
Diffstat (limited to 'test/h5test.c')
-rw-r--r-- | test/h5test.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/h5test.c b/test/h5test.c index 2afda36..fce8c9b 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -623,7 +623,7 @@ h5_fileaccess(void) void h5_no_hwconv(void) { - H5Tunregister(H5T_PERS_HARD, NULL, -1, -1, NULL); + H5Tunregister(H5T_PERS_HARD, NULL, (hid_t)-1, (hid_t)-1, NULL); } @@ -745,7 +745,7 @@ h5_set_info_object(void) /* copy key/value pair into temporary buffer */ len = strcspn(valp, ";"); next = &valp[len]; - key_val = (char *)calloc(1, len + 1); + key_val = (char *)HDcalloc(1, len + 1); /* increment the next pointer past the terminating semicolon */ if (*next == ';') @@ -1113,7 +1113,7 @@ getenv_all(MPI_Comm comm, int root, const char* name) * *------------------------------------------------------------------------- */ -hid_t +int h5_make_local_copy(const char *origfilename, const char *local_copy_name) { int fd_old = (-1), fd_new = (-1); /* File descriptors for copying data */ |