summaryrefslogtreecommitdiffstats
path: root/src/H5FDfamily.c
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2004-11-18 16:52:12 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2004-11-18 16:52:12 (GMT)
commit7016b6e5ed1870eba265ac1a06b1683106a18420 (patch)
tree2285e668b05a78b92f038f79391f5e3610f97fc0 /src/H5FDfamily.c
parent1878ad9c2cc038e1739887b12a26512daf76eefc (diff)
downloadhdf5-7016b6e5ed1870eba265ac1a06b1683106a18420.zip
hdf5-7016b6e5ed1870eba265ac1a06b1683106a18420.tar.gz
hdf5-7016b6e5ed1870eba265ac1a06b1683106a18420.tar.bz2
[svn-r9539]
Purpose: Correction to previous bug fix. This checkin is mainly to let user test his program. Description: For family driver bug(#213), the previous fix was imperfect. The problem was when user create family file, the member size information wasn't saved in file. When the file was re-opened, the library simply use the size of 1st member file as member size. Solution: When file is re-opened, member size passed in from access property is checked to see if it's reasonable. If there is only 1 member file, member size can't be smaller than current member size. If there are at least 2 member files, member size can only be equal to the 1st member size. Platforms tested: h5committest and fuss
Diffstat (limited to 'src/H5FDfamily.c')
-rw-r--r--src/H5FDfamily.c37
1 files changed, 27 insertions, 10 deletions
diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c
index d22bc27..100e06c 100644
--- a/src/H5FDfamily.c
+++ b/src/H5FDfamily.c
@@ -567,6 +567,13 @@ done:
* Wednesday, August 4, 1999
*
* Modifications:
+ * Raymond Lu
+ * Thursday, November 18, 2004
+ * When file is re-opened, member size passed in from access property
+ * is checked to see if it's reasonable. If there is only 1 member
+ * file, member size can't be smaller than current member size.
+ * If there are at least 2 member files, member size can only be equal
+ * the 1st member size.
*
*-------------------------------------------------------------------------
*/
@@ -577,7 +584,7 @@ H5FD_family_open(const char *name, unsigned flags, hid_t fapl_id,
H5FD_family_t *file=NULL;
H5FD_t *ret_value=NULL;
char memb_name[4096], temp[4096];
- hsize_t eof;
+ hsize_t eof1=HADDR_UNDEF, eof2=HADDR_UNDEF;
unsigned t_flags = flags & ~H5F_ACC_CREAT;
H5P_genplist_t *plist; /* Property list pointer */
@@ -659,16 +666,26 @@ H5FD_family_open(const char *name, unsigned flags, hid_t fapl_id,
}
/*
- * Check if user sets member size smaller than existing first member file size.
- * Return failure if so. If the member size coming from access property list is
- * 0, then set the member size to be the current first member file size.
+ * Get file size of the first 2 member files if exist. Check if user sets
+ * reasonable member size.
*/
- if(HADDR_UNDEF==(eof = H5FD_get_eof(file->memb[0])))
- HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, NULL, "file get eof request failed")
- if(file->memb_size==0 && eof)
- file->memb_size = eof;
- if(eof && file->memb_size<eof)
- HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "trying to set member size smaller than existing member file size")
+ if(HADDR_UNDEF==(eof1 = H5FD_get_eof(file->memb[0])))
+ HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, NULL, "file get eof1 request failed")
+ if(file->memb[1] && (HADDR_UNDEF==(eof2 = H5FD_get_eof(file->memb[1]))))
+ HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, NULL, "file get eof2 request failed")
+
+ if(eof1 && (eof2==HADDR_UNDEF || !eof2)) {
+ /* If there is only 1 member file, new member size can't be smaller than
+ * current member size.
+ */
+ if(file->memb_size<eof1)
+ file->memb_size = eof1;
+ } else if(eof1 && eof2) {
+ /* If there are at least 2 member files, new member size can only be equal
+ * to the 1st member size
+ */
+ file->memb_size = eof1;
+ }
ret_value=(H5FD_t *)file;