diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2014-06-10 16:22:12 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2014-06-10 16:22:12 (GMT) |
| commit | 720e0c7623be9847867b9d857329ab626ee8f3e8 (patch) | |
| tree | 87dc28bb5957fcc4f54f548d20b26cd7b3747761 /src | |
| parent | 519e23171052963775c47132ec0106727fdf5c41 (diff) | |
| download | hdf5-720e0c7623be9847867b9d857329ab626ee8f3e8.zip hdf5-720e0c7623be9847867b9d857329ab626ee8f3e8.tar.gz hdf5-720e0c7623be9847867b9d857329ab626ee8f3e8.tar.bz2 | |
[svn-r25250] Bring revisions #24670 - $24698 from trunk to revise_chunks.
Tested on jam, koala, ostrich, platypus.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/H5R.c | 13 | ||||
| -rw-r--r-- | src/H5public.h | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
4 files changed, 16 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bbd02e0..3ec7d7c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -879,8 +879,9 @@ ENDIF (NOT HDF5_INSTALL_NO_DEVELOPMENT) # Add Target(s) to CMake Install for import into other projects #----------------------------------------------------------------------------- IF (HDF5_EXPORTED_TARGETS) - - INSTALL_TARGET_PDB (${HDF5_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} libraries) + IF (BUILD_SHARED_LIBS) + INSTALL_TARGET_PDB (${HDF5_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} libraries) + ENDIF (BUILD_SHARED_LIBS) INSTALL ( TARGETS @@ -894,7 +894,6 @@ H5R_get_name(H5F_t *f, hid_t lapl_id, hid_t dxpl_id, hid_t id, H5R_type_t ref_ty /* Check args */ HDassert(f); HDassert(_ref); - HDassert(name); /* Initialize the object location */ H5O_loc_reset(&oloc); @@ -965,8 +964,10 @@ done: object that the dataset is located within. H5R_type_t ref_type; IN: Type of reference void *ref; IN: Reference to query. - char *name; OUT: Buffer to place name of object referenced - size_t size; IN: Size of name buffer + char *name; OUT: Buffer to place name of object referenced. If NULL + then this call will return the size in bytes of name. + size_t size; IN: Size of name buffer (user needs to include NULL terminator + when passing in the size) RETURNS Non-negative length of the path on success, Negative on failure @@ -978,6 +979,12 @@ done: This may not be the only path to that object. EXAMPLES REVISION LOG + M. Scot Breitenfeld + 22 January 2014 + Changed the behavior for the returned value of the function when name is NULL. + If name is NULL then size is ignored and the function returns the size + of the name buffer (not including the NULL terminator), it still returns + negative on failure. --------------------------------------------------------------------------*/ ssize_t H5Rget_name(hid_t id, H5R_type_t ref_type, const void *_ref, char *name, diff --git a/src/H5public.h b/src/H5public.h index e8657cc..6491ebf 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -75,10 +75,10 @@ extern "C" { /* Version numbers */ #define H5_VERS_MAJOR 1 /* For major interface/format changes */ #define H5_VERS_MINOR 9 /* For minor interface/format changes */ -#define H5_VERS_RELEASE 170 /* For tweaks, bug-fixes, or development */ +#define H5_VERS_RELEASE 172 /* For tweaks, bug-fixes, or development */ #define H5_VERS_SUBRELEASE "swmr0" /* For pre-releases like snap0 */ /* Empty string for real releases. */ -#define H5_VERS_INFO "HDF5 library version: 1.9.170-swmr0" /* Full version string */ +#define H5_VERS_INFO "HDF5 library version: 1.9.172-swmr0" /* Full version string */ #define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \ H5_VERS_RELEASE) diff --git a/src/Makefile.in b/src/Makefile.in index 9da91c1..f6e52c6 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -523,7 +523,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 160 +LT_VERS_REVISION = 162 LT_VERS_AGE = 0 # Our main target, the HDF5 library |