diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/.distdep | 64 | ||||
-rw-r--r-- | test/fillval.c | 12 | ||||
-rw-r--r-- | test/h5test.c | 10 | ||||
-rw-r--r-- | test/h5test.h | 2 |
4 files changed, 76 insertions, 12 deletions
diff --git a/test/.distdep b/test/.distdep index ea4b857..59fb5c4 100644 --- a/test/.distdep +++ b/test/.distdep @@ -974,3 +974,67 @@ enum.lo: \ ../src/H5Fprivate.h \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h +h5test.lo: \ + h5test.c \ + h5test.h \ + ../src/hdf5.h \ + ../src/H5public.h \ + ../src/H5config.h \ + ../src/H5api_adpt.h \ + ../src/H5Ipublic.h \ + ../src/H5Apublic.h \ + ../src/H5ACpublic.h \ + ../src/H5Bpublic.h \ + ../src/H5Dpublic.h \ + ../src/H5Epublic.h \ + ../src/H5Fpublic.h \ + ../src/H5Gpublic.h \ + ../src/H5HGpublic.h \ + ../src/H5HLpublic.h \ + ../src/H5MFpublic.h \ + ../src/H5MMpublic.h \ + ../src/H5Opublic.h \ + ../src/H5Ppublic.h \ + ../src/H5Zpublic.h \ + ../src/H5Rpublic.h \ + ../src/H5RApublic.h \ + ../src/H5Spublic.h \ + ../src/H5Tpublic.h \ + ../src/H5private.h \ + ../src/H5Tpkg.h \ + ../src/H5HGprivate.h \ + ../src/H5Fprivate.h \ + ../src/H5Rprivate.h \ + ../src/H5Tprivate.h +fillval.lo: \ + fillval.c \ + h5test.h \ + ../src/hdf5.h \ + ../src/H5public.h \ + ../src/H5config.h \ + ../src/H5api_adpt.h \ + ../src/H5Ipublic.h \ + ../src/H5Apublic.h \ + ../src/H5ACpublic.h \ + ../src/H5Bpublic.h \ + ../src/H5Dpublic.h \ + ../src/H5Epublic.h \ + ../src/H5Fpublic.h \ + ../src/H5Gpublic.h \ + ../src/H5HGpublic.h \ + ../src/H5HLpublic.h \ + ../src/H5MFpublic.h \ + ../src/H5MMpublic.h \ + ../src/H5Opublic.h \ + ../src/H5Ppublic.h \ + ../src/H5Zpublic.h \ + ../src/H5Rpublic.h \ + ../src/H5RApublic.h \ + ../src/H5Spublic.h \ + ../src/H5Tpublic.h \ + ../src/H5private.h \ + ../src/H5Tpkg.h \ + ../src/H5HGprivate.h \ + ../src/H5Fprivate.h \ + ../src/H5Rprivate.h \ + ../src/H5Tprivate.h diff --git a/test/fillval.c b/test/fillval.c index a4b0fd1..28fa576 100644 --- a/test/fillval.c +++ b/test/fillval.c @@ -168,7 +168,7 @@ test_getset(void) *------------------------------------------------------------------------- */ static int -test_create(hid_t fapl, const char *basename, H5D_layout_t layout) +test_create(hid_t fapl, const char *base_name, H5D_layout_t layout) { hid_t file=-1, space=-1, dcpl=-1, dset1=-1, dset2=-1, dset3=-1; hsize_t cur_size[5] = {32, 16, 8, 4, 2}; @@ -188,7 +188,7 @@ test_create(hid_t fapl, const char *basename, H5D_layout_t layout) * conversion paths: small to large, large to small, and no conversion. * They depend on `short' being smaller than `long'. */ - h5_fixname(basename, fapl, filename, sizeof filename); + h5_fixname(base_name, fapl, filename, sizeof filename); if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) goto error; if ((space=H5Screate_simple(5, cur_size, cur_size))<0) goto error; @@ -311,7 +311,7 @@ test_create(hid_t fapl, const char *basename, H5D_layout_t layout) *------------------------------------------------------------------------- */ static int -test_rdwr(hid_t fapl, const char *basename, H5D_layout_t layout) +test_rdwr(hid_t fapl, const char *base_name, H5D_layout_t layout) { hid_t file=-1, fspace=-1, mspace=-1, dcpl=-1, dset=-1; hsize_t cur_size[5] = {32, 16, 8, 4, 2}; @@ -335,7 +335,7 @@ test_rdwr(hid_t fapl, const char *basename, H5D_layout_t layout) } /* Create a file and dataset */ - h5_fixname(basename, fapl, filename, sizeof filename); + h5_fixname(base_name, fapl, filename, sizeof filename); if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) goto error; if ((fspace=H5Screate_simple(5, cur_size, cur_size))<0) goto error; @@ -454,7 +454,7 @@ test_rdwr(hid_t fapl, const char *basename, H5D_layout_t layout) *------------------------------------------------------------------------- */ static int -test_extend(hid_t fapl, const char *basename, H5D_layout_t layout) +test_extend(hid_t fapl, const char *base_name, H5D_layout_t layout) { hid_t file=-1, fspace=-1, mspace=-1, dcpl=-1, dset=-1; hsize_t cur_size[5] = {32, 16, 8, 4, 2}; @@ -539,7 +539,7 @@ test_extend(hid_t fapl, const char *basename, H5D_layout_t layout) #endif /* Create a file and dataset */ - h5_fixname(basename, fapl, filename, sizeof filename); + h5_fixname(base_name, fapl, filename, sizeof filename); if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) goto error; if ((fspace=H5Screate_simple(5, cur_size, max_size))<0) goto error; diff --git a/test/h5test.c b/test/h5test.c index 861b0f0..09b2f06 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -185,12 +185,12 @@ h5_reset(void) *------------------------------------------------------------------------- */ char * -h5_fixname(const char *basename, hid_t fapl, char *fullname, size_t size) +h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size) { const char *prefix=NULL, *suffix=NULL; H5F_driver_t driver; - if (!basename || !fullname || size<1) return NULL; + if (!base_name || !fullname || size<1) return NULL; /* First use the environment variable, then try the constant */ prefix = getenv("HDF5_PREFIX"); @@ -200,13 +200,13 @@ h5_fixname(const char *basename, hid_t fapl, char *fullname, size_t size) /* Prepend the prefix value to the base name */ if (prefix && *prefix) { - if (HDsnprintf(fullname, size, "%s/%s", prefix, basename)==(int)size) { + if (HDsnprintf(fullname, size, "%s/%s", prefix, base_name)==(int)size) { return NULL; /*buffer is too small*/ } - } else if (strlen(basename)>=size) { + } else if (strlen(base_name)>=size) { return NULL; /*buffer is too small*/ } else { - strcpy(fullname, basename); + strcpy(fullname, base_name); } /* Append a suffix */ diff --git a/test/h5test.h b/test/h5test.h index a5b81da..98f6060 100644 --- a/test/h5test.h +++ b/test/h5test.h @@ -56,7 +56,7 @@ extern "C" { int h5_cleanup(hid_t fapl); herr_t h5_errors(void *client_data); -char *h5_fixname(const char *basename, hid_t fapl, char *fullname, +char *h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size); hid_t h5_fileaccess(void); void h5_no_hwconv(void); |