From 324f087d050863aee2ab0222b4ed1a56301a3185 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Thu, 22 Jan 2015 16:53:30 -0500 Subject: [svn-r26009] Code Comment cleanup: ----------------------- Remove the numbers in the comments associated with: H5G_UNKNOWN_F (-1) H5G_LINK_F 0 H5G_GROUP_F 1 H5G_DATASET_F 2 H5G_TYPE_F 3 These should not be defined as a number since they can changed. They should be considered named parameters, not actual values. HDFFV-9040 h5rget_object_type_f returns different types than indicated by API --- fortran/src/H5Rf.c | 9 +++------ fortran/src/H5Rff.f90 | 18 ++++++++---------- fortran/src/H5Rff_F03.f90 | 9 ++++----- 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/fortran/src/H5Rf.c b/fortran/src/H5Rf.c index a4fb0b5..0d04dd4 100644 --- a/fortran/src/H5Rf.c +++ b/fortran/src/H5Rf.c @@ -601,12 +601,9 @@ nh5rget_name_ptr_c (hid_t_f *loc_id, int_f *ref_type, void *ref, _fcd name, size * ref - Reference to query. * * OUTPUTS - * obj_type - Type of referenced object. - * H5G_UNKNOWN_F (-1) - * H5G_LINK_F 0 - * H5G_GROUP_F 1 - * H5G_DATASET_F 2 - * H5G_TYPE_F 3 + * obj_type - Type of referenced object. These are defined in H5Opublic.h, + * enum H5O_type_t + * * RETURNS * 0 on success, -1 on failure * AUTHOR diff --git a/fortran/src/H5Rff.f90 b/fortran/src/H5Rff.f90 index 64f1365..77a1ff8 100644 --- a/fortran/src/H5Rff.f90 +++ b/fortran/src/H5Rff.f90 @@ -75,11 +75,10 @@ CONTAINS ! ref - reference to open ! OUTPUTS ! obj_type - object_type, possible values: -! H5G_UNKNOWN_F (-1) -! H5G_GROUP_F 0 -! H5G_DATASET_F 1 -! H5G_TYPE_F 2 -! H5G_LINK_F 3 +! H5G_UNKNOWN_F +! H5G_GROUP_F +! H5G_DATASET_F +! H5G_TYPE_F ! hdferr - Returns 0 if successful and -1 if fails ! ! AUTHOR @@ -100,11 +99,10 @@ CONTAINS INTEGER(HID_T), INTENT(IN) :: dset_id ! Dataset identifier TYPE(hobj_ref_t_f), INTENT(IN) :: ref ! Object reference INTEGER, INTENT(OUT) :: obj_type ! Object type - ! H5G_UNKNOWN_F (-1) - ! H5G_GROUP_F 0 - ! H5G_DATASET_F 1 - ! H5G_TYPE_F 2 - ! H5G_LINK_F 3 + ! H5G_UNKNOWN_F + ! H5G_GROUP_F + ! H5G_DATASET_F + ! H5G_TYPE_F INTEGER, INTENT(OUT) :: hdferr ! Error code !***** INTEGER(HADDR_T) :: ref_f ! Local buffer to pass reference diff --git a/fortran/src/H5Rff_F03.f90 b/fortran/src/H5Rff_F03.f90 index e0ffa0a..42ba38b 100644 --- a/fortran/src/H5Rff_F03.f90 +++ b/fortran/src/H5Rff_F03.f90 @@ -689,11 +689,10 @@ CONTAINS ! ! Outputs: ! obj_type - Type of referenced object. - ! H5G_UNKNOWN_F (-1) - ! H5G_LINK_F 0 - ! H5G_GROUP_F 1 - ! H5G_DATASET_F 2 - ! H5G_TYPE_F 3 + ! H5G_UNKNOWN_F + ! H5G_GROUP_F + ! H5G_DATASET_F + ! H5G_TYPE_F ! ! hdferr - Returns 0 if successful and -1 if fails. ! -- cgit v0.12