summaryrefslogtreecommitdiffstats
path: root/test/external.c
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1998-04-08 21:43:02 (GMT)
committerRobb Matzke <matzke@llnl.gov>1998-04-08 21:43:02 (GMT)
commitc01750fa740943c0083711b353278143c79d50a3 (patch)
treefd475b7c7a3639c05b30625b43547850d687b948 /test/external.c
parent68fa66bf8130d6a6e607e233da8cc61a154bf172 (diff)
downloadhdf5-c01750fa740943c0083711b353278143c79d50a3.zip
hdf5-c01750fa740943c0083711b353278143c79d50a3.tar.gz
hdf5-c01750fa740943c0083711b353278143c79d50a3.tar.bz2
[svn-r338] Changes since 19980407
---------------------- ./src/H5B.c ./src/H5D.c ./src/H5Dprivate.h ./src/H5Dpublic.h ./src/H5F.c ./src/H5Farray.c ./src/H5Fcore.c ./src/H5Ffamily.c ./src/H5Fistore.c ./src/H5Flow.c ./src/H5Fprivate.h ./src/H5Fpublic.h ./src/H5Fsec2.c ./src/H5Fsplit.c ./src/H5Fstdio.c ./src/H5G.c ./src/H5Gent.c ./src/H5Gnode.c ./src/H5HG.c ./src/H5HL.c ./src/H5MF.c ./src/H5MFprivate.h ./src/H5O.c ./src/H5Ocont.c ./src/H5Odtype.c ./src/H5Oefl.c ./src/H5Olayout.c ./src/H5Oname.c ./src/H5Oprivate.h ./src/H5Osdspace.c ./src/H5Oshared.c ./src/H5Ostab.c ./src/H5P.c ./src/H5Ppublic.h ./src/H5S.c ./src/H5Sprivate.h ./src/H5Spublic.h ./src/H5Ssimp.c ./src/H5Tconv.c ./src/H5Tpkg.h ./src/H5V.c ./src/H5Vprivate.h ./src/H5private.h ./src/H5public.h ./src/h5ls.c ./test/cmpd_dset.c ./test/dsets.c ./test/extend.c ./test/external.c ./test/hyperslab.c ./test/iopipe.c ./test/istore.c ./test/shtype.c ./test/tfile.c ./test/th5s.c Anything having to do with the size of a dataset now uses the types `hsize_t' and `hssize_t' which must be the same size and at least as large as `size_t'. This isn't fully tested yet, so hsize_t and hssize_t are defined as size_t and ssize_t in H5public.h. Setting them to larger values will trip up gcc versions less than 2.8.1 on x86 platforms. Documented unused function formals with `__unused__' before the formal name. This also has the effect of supressing warning messages for gcc since it's defined to be `__attribute__((unused))' in the H5private.h file. ./src/debug.c ./src/h5ls.c If the file name contains a `%' then the file is opened as a file family with H5P_DEFAULT for the file member access property list. ./src/h5ls.c The group name is optional, defaulting to `/'. ./src/hdf5.h Added some missing public header files.
Diffstat (limited to 'test/external.c')
-rw-r--r--test/external.c80
1 files changed, 46 insertions, 34 deletions
diff --git a/test/external.c b/test/external.c
index 7f0ff23..0694430 100644
--- a/test/external.c
+++ b/test/external.c
@@ -19,6 +19,9 @@
#ifndef HAVE_ATTRIBUTE
# undef __attribute__
# define __attribute__(X) /*void*/
+# define __unused__ /*void*/
+#else
+# define __unused__ __attribute__((unused))
#endif
static int nerrors_g = 0;
@@ -41,7 +44,7 @@ static int nerrors_g = 0;
*-------------------------------------------------------------------------
*/
static herr_t
-display_error_cb (void *client_data __attribute__((unused)))
+display_error_cb (void __unused__ *client_data)
{
puts ("*FAILED*");
H5Eprint (stdout);
@@ -117,7 +120,7 @@ test_1 (void)
{
hid_t file, plist, space, dset, grp;
herr_t status;
- size_t size[2], max_size[2];
+ hsize_t size[2], max_size[2];
herr_t (*func)(void*) = NULL;
void *client_data = NULL;
int n;
@@ -141,7 +144,7 @@ test_1 (void)
fflush (stdout);
plist = H5Pcreate (H5P_DATASET_CREATE);
assert (plist>=0);
- status = H5Pset_external (plist, "ext1.data", 0, 400);
+ status = H5Pset_external (plist, "ext1.data", 0, (hsize_t)400);
assert (status>=0);
size[0] = max_size[0] = 100;
@@ -165,7 +168,7 @@ test_1 (void)
fflush (stdout);
plist = H5Pcreate (H5P_DATASET_CREATE);
assert (plist>=0);
- status = H5Pset_external (plist, "ext1.data", 0, 399);
+ status = H5Pset_external (plist, "ext1.data", 0, (hsize_t)399);
assert (status>=0);
size[0] = max_size[0] = 100;
@@ -198,7 +201,7 @@ test_1 (void)
fflush (stdout);
plist = H5Pcreate (H5P_DATASET_CREATE);
assert (plist>=0);
- status = H5Pset_external (plist, "ext1.data", 0, 800);
+ status = H5Pset_external (plist, "ext1.data", 0, (hsize_t)800);
assert (status>=0);
size[0] = 100;
@@ -225,7 +228,7 @@ test_1 (void)
fflush (stdout);
plist = H5Pcreate (H5P_DATASET_CREATE);
assert (plist>=0);
- status = H5Pset_external (plist, "ext1.data", 0, 799);
+ status = H5Pset_external (plist, "ext1.data", 0, (hsize_t)799);
assert (status>=0);
size[0] = 100;
@@ -281,8 +284,8 @@ test_1 (void)
*/
do {
char name[256];
- size_t file_offset;
- size_t file_size;
+ off_t file_offset;
+ hsize_t file_size;
printf ("%-70s", "...opening a dataset and reading the storage info");
fflush (stdout);
@@ -328,8 +331,8 @@ test_1 (void)
*/
do {
char name[256];
- size_t file_offset;
- size_t file_size;
+ off_t file_offset;
+ hsize_t file_size;
printf ("%-70s", "...opening an unlimited dataset and reading the "
"storage info");
@@ -378,13 +381,13 @@ test_1 (void)
fflush (stdout);
plist = H5Pcreate (H5P_DATASET_CREATE);
assert (plist>=0);
- status = H5Pset_external (plist, "ext1.data", 0, 100);
+ status = H5Pset_external (plist, "ext1.data", 0, (hsize_t)100);
assert (status>=0);
- status = H5Pset_external (plist, "ext2.data", 0, 100);
+ status = H5Pset_external (plist, "ext2.data", 0, (hsize_t)100);
assert (status>=0);
- status = H5Pset_external (plist, "ext3.data", 0, 100);
+ status = H5Pset_external (plist, "ext3.data", 0, (hsize_t)100);
assert (status>=0);
- status = H5Pset_external (plist, "ext4.data", 0, 100);
+ status = H5Pset_external (plist, "ext4.data", 0, (hsize_t)100);
assert (status>=0);
size[0] = max_size[0] = 100;
@@ -414,7 +417,7 @@ test_1 (void)
/* Next function should fail */
H5Eget_auto (&func, &client_data);
H5Eset_auto (NULL, NULL);
- status = H5Pset_external (plist, "ext2.data", 0, 100);
+ status = H5Pset_external (plist, "ext2.data", 0, (hsize_t)100);
H5Eset_auto (func, client_data);
if (status>=0) {
puts ("*FAILED*");
@@ -451,7 +454,7 @@ test_1 (void)
/* Next function should fail */
H5Eget_auto (&func, &client_data);
H5Eset_auto (NULL, NULL);
- status = H5Pset_external (plist, "ext2.data", 0, 100);
+ status = H5Pset_external (plist, "ext2.data", 0, (hsize_t)100);
H5Eset_auto (func, client_data);
if (status>=0) {
puts ("*FAILED*");
@@ -490,22 +493,22 @@ test_2 (void)
hid_t file, plist, space, dset, grp;
herr_t status;
int fd;
- unsigned i, j;
- ssize_t n;
+ hsize_t i, j;
+ hssize_t n;
char fname[64];
int part[25], whole[100];
- size_t size;
+ hsize_t size;
/* Write the data to external files */
for (i=0; i<4; i++) {
for (j=0; j<25; j++) {
- part[j] = i*25+j;
+ part[j] = (int)(i*25+j);
}
- sprintf (fname, "extern_%d.raw", i+1);
+ sprintf (fname, "extern_%lu.raw", (unsigned long)i+1);
fd = open (fname, O_RDWR|O_CREAT|O_TRUNC, 0666);
assert (fd>=0);
- n = lseek (fd, (ssize_t)(i*10), SEEK_SET);
+ n = lseek (fd, (off_t)(i*10), SEEK_SET);
assert (n>=0 && (size_t)n==i*10);
n = write (fd, part, sizeof(part));
assert (n==sizeof(part));
@@ -525,13 +528,17 @@ test_2 (void)
/* Create the external file list */
plist = H5Pcreate (H5P_DATASET_CREATE);
assert (plist>=0);
- status = H5Pset_external (plist, "extern_1.raw", 0, sizeof(part));
+ status = H5Pset_external (plist, "extern_1.raw", 0,
+ (hsize_t)sizeof(part));
assert (status>=0);
- status = H5Pset_external (plist, "extern_2.raw", 10, sizeof(part));
+ status = H5Pset_external (plist, "extern_2.raw", 10,
+ (hsize_t)sizeof(part));
assert (status>=0);
- status = H5Pset_external (plist, "extern_3.raw", 20, sizeof(part));
+ status = H5Pset_external (plist, "extern_3.raw", 20,
+ (hsize_t)sizeof(part));
assert (status>=0);
- status = H5Pset_external (plist, "extern_4.raw", 30, sizeof(part));
+ status = H5Pset_external (plist, "extern_4.raw", 30,
+ (hsize_t)sizeof(part));
assert (status>=0);
/* Create the data space */
@@ -577,8 +584,8 @@ test_2 (void)
*/
do {
hid_t hs_space;
- int hs_start = 30;
- size_t hs_count = 25;
+ hssize_t hs_start = 30;
+ hsize_t hs_count = 25;
/* Read from the dataset */
printf ("%-70s", "...reading partial dataset");
@@ -644,8 +651,9 @@ test_3 (void)
herr_t status;
unsigned i;
int fd;
- int part[25], whole[100], hs_start=100;
- size_t size=100, max_size=200, hs_count=100;
+ int part[25], whole[100];
+ hssize_t hs_start=100;
+ hsize_t size=100, max_size=200, hs_count=100;
/*
* Create another file
@@ -656,13 +664,17 @@ test_3 (void)
/* Create the external file list */
plist = H5Pcreate (H5P_DATASET_CREATE);
assert (plist>=0);
- status = H5Pset_external (plist, "extern_1b.raw", 0, sizeof(part));
+ status = H5Pset_external (plist, "extern_1b.raw", 0,
+ (hsize_t)sizeof(part));
assert (status>=0);
- status = H5Pset_external (plist, "extern_2b.raw", 10, sizeof(part));
+ status = H5Pset_external (plist, "extern_2b.raw", 10,
+ (hsize_t)sizeof(part));
assert (status>=0);
- status = H5Pset_external (plist, "extern_3b.raw", 20, sizeof(part));
+ status = H5Pset_external (plist, "extern_3b.raw", 20,
+ (hsize_t)sizeof(part));
assert (status>=0);
- status = H5Pset_external (plist, "extern_4b.raw", 30, H5F_UNLIMITED);
+ status = H5Pset_external (plist, "extern_4b.raw", 30,
+ H5F_UNLIMITED);
assert (status>=0);
/* Make sure the output files are fresh*/