summaryrefslogtreecommitdiffstats
path: root/fortran/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2006-11-02 04:54:19 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2006-11-02 04:54:19 (GMT)
commit19c9657f7c4029df52a804c7ed8b4d3b30cc6196 (patch)
tree6601816880f90040ae67df5bd27558c0f0670e86 /fortran/src
parent0f84d2fb15813c10fca48f95772626c34039619d (diff)
downloadhdf5-19c9657f7c4029df52a804c7ed8b4d3b30cc6196.zip
hdf5-19c9657f7c4029df52a804c7ed8b4d3b30cc6196.tar.gz
hdf5-19c9657f7c4029df52a804c7ed8b4d3b30cc6196.tar.bz2
[svn-r12842] Description:
Refactor generic property list initialization code to put property list specific routines in property list modules, instead of scattered to the four winds. Also, introduce property list class initialization objects, to make adding new property list classes in the library easier. Fix daily test failure by using H5Pget_elink_prefix() API routine instead of looking at the "raw" generic property list information. Tested on: Mac OS X/32 10.4.8 (amazon) FreeBSD/32 4.11 (sleipnir) w/threadsafe Linux/32 2.4 (heping) w/C++ & FORTRAN Linux/64 2.4 (mir) w/build-all & 1.6 compat
Diffstat (limited to 'fortran/src')
-rw-r--r--fortran/src/H5Pf.c8
-rw-r--r--fortran/src/H5Pff.f9016
-rw-r--r--fortran/src/H5_f.c4
-rw-r--r--fortran/src/H5f90global.f908
4 files changed, 18 insertions, 18 deletions
diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index 54f954d..3fd6259 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -123,12 +123,12 @@ nh5pequal_c ( hid_t_f *plist1_id , hid_t_f *plist2_id, int_f * c_flag)
* Purpose: Call H5Pget_class to determine property list class
* Inputs: prp_id - identifier of the dataspace
* Outputs: classtype - class type; possible values are:
- * H5P_NO_CLASS_F -1
+ * H5P_ROOT_F -1
* H5P_FILE_CREATE_F 0
* H5P_FILE_ACCESS_F 1
* H5P_DATASET_CREATE_F 2
* H5P_DATASET_XFER_F 3
- * H5P_MOUNT_F 4
+ * H5P_FILE_MOUNT_F 4
* Returns: 0 on success, -1 on failure
* Programmer: Elena Pourmal
* Saturday, August 14, 1999
@@ -144,8 +144,8 @@ nh5pget_class_c ( hid_t_f *prp_id , int_f *classtype)
c_prp_id = *prp_id;
c_classtype = H5Pget_class(c_prp_id);
- if (c_classtype == H5P_NO_CLASS ) {
- *classtype = H5P_NO_CLASS;
+ if (c_classtype == H5P_ROOT ) {
+ *classtype = H5P_ROOT;
ret_value = -1;
return ret_value;
}
diff --git a/fortran/src/H5Pff.f90 b/fortran/src/H5Pff.f90
index 70a3fc9..17b3061 100644
--- a/fortran/src/H5Pff.f90
+++ b/fortran/src/H5Pff.f90
@@ -94,7 +94,7 @@
! H5P_FILE_ACCESS_F
! H5P_DATASET_CREATE_F
! H5P_DATASET_XFER_F
-! H5P_MOUNT_F
+! H5P_FILE_MOUNT_F
! Outputs:
! prp_id - property list identifier
! hdferr: - error code
@@ -127,7 +127,7 @@
! H5P_FILE_ACCESS_F
! H5P_DATASET_CREATE_F
! H5P_DATASET_XFER_F
- ! H5P_MOUNT_F
+ ! H5P_FILE_MOUNT_F
INTEGER(HID_T), INTENT(OUT) :: prp_id ! Property list identifier
INTEGER, INTENT(OUT) :: hdferr ! Error code
@@ -284,12 +284,12 @@
! Outputs:
! classtype - property list class
! Possible values are:
-! H5P_NO_CLASS
+! H5P_ROOT_F
! H5P_FILE_CREATE_F
! H5P_FILE_ACCESS_F
! H5PE_DATASET_CREATE_F
! H5P_DATASET_XFER_F
-! H5P_MOUNT_F
+! H5P_FILE_MOUNT_F
! hdferr: - error code
! Success: 0
! Failure: -1
@@ -318,12 +318,12 @@
INTEGER, INTENT(OUT) :: classtype ! The type of the property list
! to be created. Possible values
! are:
- ! H5P_NO_CLASS
+ ! H5P_ROOT_F
! H5P_FILE_CREATE_F
! H5P_FILE_ACCESS_F
! H5PE_DATASET_CREATE_F
! H5P_DATASET_XFER_F
- ! H5P_MOUNT_F
+ ! H5P_FILE_MOUNT_F
INTEGER, INTENT(OUT) :: hdferr ! Error code
! INTEGER, EXTERNAL :: h5pget_class_c
@@ -5045,12 +5045,12 @@
! Inputs:
! parent - Property list identifier of the parent class
! Possible values include:
-! H5P_NO_CLASS_F
+! H5P_ROOT_F
! H5P_FILE_CREATE_F
! H5P_FILE_ACCESS_F
! H5P_DATASET_CREATE_F
! H5P_DATASET_XFER_F
-! H5P_MOUNT_F
+! H5P_FILE_MOUNT_F
! name - name of the class we are creating
! Outputs:
! class - porperty list class identifier
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c
index 1543e18..83a7ec8 100644
--- a/fortran/src/H5_f.c
+++ b/fortran/src/H5_f.c
@@ -326,9 +326,9 @@ nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags,
h5p_flags[1] = H5P_FILE_ACCESS;
h5p_flags[2] = H5P_DATASET_CREATE;
h5p_flags[3] = H5P_DATASET_XFER;
- h5p_flags[4] = H5P_MOUNT;
+ h5p_flags[4] = H5P_FILE_MOUNT;
h5p_flags[5] = H5P_DEFAULT;
- h5p_flags[6] = H5P_NO_CLASS;
+ h5p_flags[6] = H5P_ROOT;
/*
* H5R flags
diff --git a/fortran/src/H5f90global.f90 b/fortran/src/H5f90global.f90
index 9503e97..62ec274 100644
--- a/fortran/src/H5f90global.f90
+++ b/fortran/src/H5f90global.f90
@@ -379,17 +379,17 @@
INTEGER(HID_T) :: H5P_FILE_ACCESS_F
INTEGER(HID_T) :: H5P_DATASET_CREATE_F
INTEGER(HID_T) :: H5P_DATASET_XFER_F
- INTEGER(HID_T) :: H5P_MOUNT_F
+ INTEGER(HID_T) :: H5P_FILE_MOUNT_F
INTEGER(HID_T) :: H5P_DEFAULT_F
- INTEGER(HID_T) :: H5P_NO_CLASS_F
+ INTEGER(HID_T) :: H5P_ROOT_F
EQUIVALENCE(H5P_flags(1), H5P_FILE_CREATE_F)
EQUIVALENCE(H5P_flags(2), H5P_FILE_ACCESS_F)
EQUIVALENCE(H5P_flags(3), H5P_DATASET_CREATE_F)
EQUIVALENCE(H5P_flags(4), H5P_DATASET_XFER_F)
- EQUIVALENCE(H5P_flags(5), H5P_MOUNT_F)
+ EQUIVALENCE(H5P_flags(5), H5P_FILE_MOUNT_F)
EQUIVALENCE(H5P_flags(6), H5P_DEFAULT_F)
- EQUIVALENCE(H5P_flags(7), H5P_NO_CLASS_F)
+ EQUIVALENCE(H5P_flags(7), H5P_ROOT_F)
!
! H5P flags declaration