summaryrefslogtreecommitdiffstats
path: root/test/ohdr.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@koziol.gov>2020-01-04 04:16:38 (GMT)
committerQuincey Koziol <koziol@koziol.gov>2020-01-04 04:16:38 (GMT)
commit0225e6d59698c9a720177766794619c7ad273f4a (patch)
tree7abfb57ae22f1b886bafb18294054386cdaba134 /test/ohdr.c
parent041b14c876cc7466da7868ef563563c879951ad6 (diff)
downloadhdf5-0225e6d59698c9a720177766794619c7ad273f4a.zip
hdf5-0225e6d59698c9a720177766794619c7ad273f4a.tar.gz
hdf5-0225e6d59698c9a720177766794619c7ad273f4a.tar.bz2
Small changes from the token_refactoring branch, to reduce the delta to develop
Diffstat (limited to 'test/ohdr.c')
-rw-r--r--test/ohdr.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/test/ohdr.c b/test/ohdr.c
index 9d2d414..53d2f59 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -50,7 +50,8 @@ const char *FILENAME[] = {
* To get this data file, define H5O_ENABLE_BOGUS in src/H5Oprivate, rebuild
* the library and simply compile gen_bogus.c with that HDF5 library and run it.
*/
-#define FILE_BOGUS "tbogus.h5"
+#define FILE_BOGUS "tbogus.h5"
+#define TESTFILE_LEN 256
/* */
#define FILE_OHDR_SWMR "ohdr_swmr.h5"
@@ -473,13 +474,13 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
hid_t fid_bogus = -1; /* bogus file ID */
hid_t gid_bogus = -1; /* bogus group ID */
hid_t loc_bogus = -1; /* location: bogus file or group ID */
- char testfile[256];
+ char testfile[TESTFILE_LEN];
/* create a different name for a local copy of the data file to be
opened with rd/wr file permissions in case build and test are
done in the source directory. */
- HDstrncpy(testfile, FILE_BOGUS, HDstrlen(FILE_BOGUS));
- testfile[HDstrlen(FILE_BOGUS)]='\0';
+ HDstrncpy(testfile, FILE_BOGUS, TESTFILE_LEN);
+ testfile[TESTFILE_LEN - 1]='\0';
HDstrncat(testfile, ".copy", 5);
/* Make a copy of the data file from svn. */
@@ -759,7 +760,7 @@ count_attributes(hid_t dset_id)
{
H5O_info_t info;
- if(H5Oget_info2(dset_id, &info, H5O_INFO_ALL) < 0)
+ if(H5Oget_info2(dset_id, &info, H5O_INFO_NUM_ATTRS) < 0)
return -1;
else
return (int)info.num_attrs; /* should never exceed int bounds */