summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2009-10-09 18:31:24 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2009-10-09 18:31:24 (GMT)
commit492da787dd6f21a159c3dfbd74ecf44653177cee (patch)
treef37c1ac1ec0b2798dee9ab6508a6ff94de9eccd0
parent96a099b0e1e9cefccafb5d28b1c9d9c071a439f5 (diff)
downloadhdf5-492da787dd6f21a159c3dfbd74ecf44653177cee.zip
hdf5-492da787dd6f21a159c3dfbd74ecf44653177cee.tar.gz
hdf5-492da787dd6f21a159c3dfbd74ecf44653177cee.tar.bz2
[svn-r17626] Description:
Correct error with initializing test file name in non-srcdir situation (like Windows) Tested on: Mac OS X/32 10.6.1 (amazon) FreeBSD/32 6.3 (duty) Windows
-rw-r--r--test/tfile.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/tfile.c b/test/tfile.c
index 454f339..342230f 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -2958,7 +2958,6 @@ test_filespace_compatible(void)
uint8_t buf[READ_OLD_BUFSIZE]; /* temporary buffer for reading */
ssize_t nread; /* Number of bytes read in */
char *srcdir = HDgetenv("srcdir"); /* where the src code is located */
- char filename[FILENAME_LEN] = ""; /* old test file name */
unsigned i, j; /* Local index variable */
hssize_t free_space; /* Amount of free space in the file */
hsize_t threshold; /* Free space section threshold */
@@ -2969,6 +2968,7 @@ test_filespace_compatible(void)
MESSAGE(5, ("Testing File space compatibility for 1.6 and 1.8 files\n"));
for(j = 0; j < NELMTS(OLD_FILENAME); j++) {
+ char filename[FILENAME_LEN] = ""; /* old test file name */
/* Generate correct name for test file by prepending the source path */
if(srcdir && ((HDstrlen(srcdir) + HDstrlen(OLD_FILENAME[j]) + 1) < sizeof(filename))) {
@@ -3123,7 +3123,7 @@ test_deprec(void)
CHECK(fcpl, FAIL, "H5Pcreate");
/* Set a property in the FCPL that will push the superblock version up */
- ret = H5Pset_file_space(fcpl, H5F_FILE_SPACE_VFD, 0);
+ ret = H5Pset_file_space(fcpl, H5F_FILE_SPACE_VFD, (hsize_t)0);
CHECK(ret, FAIL, "H5Pset_file_space");
/* Creating a file with the non-default file creation property list should