diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-02-03 18:52:27 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-02-03 18:52:27 (GMT) |
| commit | 5060fb1050c6b65bc67d04f7f7756deb7e1600d1 (patch) | |
| tree | 525129b18be5c6bc56227f22cc646233059acdd7 /fortran/src/H5_f.c | |
| parent | 3946ec882b8c405064f4008c4765f3894957c2a1 (diff) | |
| download | hdf5-5060fb1050c6b65bc67d04f7f7756deb7e1600d1.zip hdf5-5060fb1050c6b65bc67d04f7f7756deb7e1600d1.tar.gz hdf5-5060fb1050c6b65bc67d04f7f7756deb7e1600d1.tar.bz2 | |
[svn-r26122] Fix for HDFFV-9040 h5rget_object_type_f returns different types than indicated by API
Slight change of global variable definitions from C.
Tested: jam.
Diffstat (limited to 'fortran/src/H5_f.c')
| -rw-r--r-- | fortran/src/H5_f.c | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c index 05e525d..4e6edc3 100644 --- a/fortran/src/H5_f.c +++ b/fortran/src/H5_f.c @@ -471,27 +471,25 @@ nh5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags, /* * H5G flags */ - - h5g_flags[0] = (int_f)H5O_TYPE_UNKNOWN; - h5g_flags[1] = (int_f)H5O_TYPE_GROUP; - h5g_flags[2] = (int_f)H5O_TYPE_DATASET; - h5g_flags[3] = (int_f)H5O_TYPE_NAMED_DATATYPE; -/* This value can no longer be returned and all these flags should be updated - * to reflect the refinements between links and objects. -QAK */ -/* h5g_flags[4] = H5G_LINK; */ - h5g_flags[5] = (int_f)H5L_TYPE_ERROR; - h5g_flags[6] = (int_f)H5L_TYPE_HARD; - h5g_flags[7] = (int_f)H5L_TYPE_SOFT; - - h5g_flags[8] = (int_f)H5G_STORAGE_TYPE_UNKNOWN; - h5g_flags[9] = (int_f)H5G_STORAGE_TYPE_SYMBOL_TABLE; - h5g_flags[10] = (int_f)H5G_STORAGE_TYPE_COMPACT; - h5g_flags[11] = (int_f)H5G_STORAGE_TYPE_DENSE; + h5g_flags[0] = (int_f)H5G_UNKNOWN; + h5g_flags[1] = (int_f)H5G_GROUP; + h5g_flags[2] = (int_f)H5G_DATASET; + h5g_flags[3] = (int_f)H5G_TYPE; + h5g_flags[4] = (int_f)H5G_LINK; + h5g_flags[5] = (int_f)H5G_UDLINK; + h5g_flags[6] = (int_f)H5L_SAME_LOC; + h5g_flags[7] = (int_f)H5L_TYPE_ERROR; + h5g_flags[8] = (int_f)H5L_TYPE_HARD; + h5g_flags[9] = (int_f)H5L_TYPE_SOFT; + + h5g_flags[10] = (int_f)H5G_STORAGE_TYPE_UNKNOWN; + h5g_flags[11] = (int_f)H5G_STORAGE_TYPE_SYMBOL_TABLE; + h5g_flags[12] = (int_f)H5G_STORAGE_TYPE_COMPACT; + h5g_flags[13] = (int_f)H5G_STORAGE_TYPE_DENSE; /* * H5I flags */ - h5i_flags[0] = (int_f)H5I_FILE; h5i_flags[1] = (int_f)H5I_GROUP; h5i_flags[2] = (int_f)H5I_DATATYPE; @@ -551,10 +549,15 @@ nh5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags, h5o_flags[20] = (int_f)H5O_SHMESG_MAX_NINDEXES; h5o_flags[21] = (int_f)H5O_SHMESG_MAX_LIST_SIZE; +/* Types of objects in file */ + h5o_flags[22] = (int_f)H5O_TYPE_UNKNOWN; /* Unknown object type */ + h5o_flags[23] = (int_f)H5O_TYPE_GROUP; /* Object is a group */ + h5o_flags[24] = (int_f)H5O_TYPE_DATASET; /* Object is a dataset */ + h5o_flags[25] = (int_f)H5O_TYPE_NAMED_DATATYPE; /* Object is a named data type */ + h5o_flags[26] = (int_f)H5O_TYPE_NTYPES; /* Number of different object types */ /* * H5P flags */ - h5p_flags[0] = (hid_t_f)H5P_FILE_CREATE; h5p_flags[1] = (hid_t_f)H5P_FILE_ACCESS; h5p_flags[2] = (hid_t_f)H5P_DATASET_CREATE; |