diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2014-01-03 20:45:08 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2014-01-03 20:45:08 (GMT) |
| commit | 21eabe6753e0c8cc2e5b7f6e3f69181b0bff9d2a (patch) | |
| tree | 0309af908decdb4faec45bed6dd58d0b875169a0 /src | |
| parent | 2cbf8b46709eb67046e275c764f6b3e2256bcd35 (diff) | |
| download | hdf5-21eabe6753e0c8cc2e5b7f6e3f69181b0bff9d2a.zip hdf5-21eabe6753e0c8cc2e5b7f6e3f69181b0bff9d2a.tar.gz hdf5-21eabe6753e0c8cc2e5b7f6e3f69181b0bff9d2a.tar.bz2 | |
[svn-r24610] Bring revision #24608 from revise_chunks.
h5committested.
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Ocache.c | 2 | ||||
| -rw-r--r-- | src/H5Osdspace.c | 2 | ||||
| -rw-r--r-- | src/H5public.h | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Ocache.c b/src/H5Ocache.c index 7c896c1..f03dc55 100644 --- a/src/H5Ocache.c +++ b/src/H5Ocache.c @@ -1626,7 +1626,7 @@ H5O_chunk_proxy_dest(H5O_chunk_proxy_t *chk_proxy) HDassert(chk_proxy); /* Decrement reference count of object header */ - if(H5O_dec_rc(chk_proxy->oh) < 0) + if(chk_proxy->oh && H5O_dec_rc(chk_proxy->oh) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTDEC, FAIL, "can't decrement reference count on object header") /* Release the chunk proxy object */ diff --git a/src/H5Osdspace.c b/src/H5Osdspace.c index 905c4e9..9ca8436 100644 --- a/src/H5Osdspace.c +++ b/src/H5Osdspace.c @@ -526,7 +526,7 @@ H5O_sdspace_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *mesg, HDfprintf (stream, "{"); for(u = 0; u < sdim->rank; u++) { if(H5S_UNLIMITED==sdim->max[u]) - HDfprintf (stream, "%sINF", u?", ":""); + HDfprintf (stream, "%sUNLIM", u?", ":""); else HDfprintf (stream, "%s%Hu", u?", ":"", sdim->max[u]); } /* end for */ diff --git a/src/H5public.h b/src/H5public.h index d3e06fe..f8ebfb3 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 169 /* For tweaks, bug-fixes, or development */ +#define H5_VERS_RELEASE 170 /* For tweaks, bug-fixes, or development */ #define H5_VERS_SUBRELEASE "swmr_chksum2" /* For pre-releases like snap0 */ /* Empty string for real releases. */ -#define H5_VERS_INFO "HDF5 library version: 1.9.169-swmr_chksum2" /* Full version string */ +#define H5_VERS_INFO "HDF5 library version: 1.9.170-swmr_chksum2" /* 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 ecbcaa1..9da91c1 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 = 159 +LT_VERS_REVISION = 160 LT_VERS_AGE = 0 # Our main target, the HDF5 library |