From 4eefbc505a329d3c03d4470ce1240980a452beb9 Mon Sep 17 00:00:00 2001 From: HDF Tester Date: Fri, 12 Feb 2010 12:20:49 -0500 Subject: [svn-r18234] Snapshot version 1.8 release 4 (snap11) --- README.txt | 2 +- configure | 22 +++++++++++----------- configure.in | 2 +- release_docs/RELEASE.txt | 2 +- src/H5Groot.c | 3 ++- src/H5O.c | 1 + src/H5public.h | 4 ++-- vms/src/h5pubconf.h | 6 +++--- windows/src/H5pubconf.h | 6 +++--- 9 files changed, 25 insertions(+), 23 deletions(-) diff --git a/README.txt b/README.txt index 80bd148..932c5a5 100644 --- a/README.txt +++ b/README.txt @@ -1,4 +1,4 @@ -HDF5 version 1.8.4-snap11 currently under development +HDF5 version 1.8.4-snap12 currently under development Please refer to the release_docs/INSTALL file for installation instructions. ------------------------------------------------------------------------------ diff --git a/configure b/configure index 8a6e419..1d27901 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Id: configure.in 18203 2010-02-02 17:01:14Z hdftest . +# From configure.in Id: configure.in 18219 2010-02-08 01:21:03Z hdftest . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.64 for HDF5 1.8.4-snap11. +# Generated by GNU Autoconf 2.64 for HDF5 1.8.4-snap12. # # Report bugs to . # @@ -699,8 +699,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='HDF5' PACKAGE_TARNAME='hdf5' -PACKAGE_VERSION='1.8.4-snap11' -PACKAGE_STRING='HDF5 1.8.4-snap11' +PACKAGE_VERSION='1.8.4-snap12' +PACKAGE_STRING='HDF5 1.8.4-snap12' PACKAGE_BUGREPORT='help@hdfgroup.org' PACKAGE_URL='' @@ -1571,7 +1571,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures HDF5 1.8.4-snap11 to adapt to many kinds of systems. +\`configure' configures HDF5 1.8.4-snap12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1641,7 +1641,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of HDF5 1.8.4-snap11:";; + short | recursive ) echo "Configuration of HDF5 1.8.4-snap12:";; esac cat <<\_ACEOF @@ -1828,7 +1828,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -HDF5 configure 1.8.4-snap11 +HDF5 configure 1.8.4-snap12 generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2912,7 +2912,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by HDF5 $as_me 1.8.4-snap11, which was +It was created by HDF5 $as_me 1.8.4-snap12, which was generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -3725,7 +3725,7 @@ fi # Define the identity of the package. PACKAGE='hdf5' - VERSION='1.8.4-snap11' + VERSION='1.8.4-snap12' cat >>confdefs.h <<_ACEOF @@ -28848,7 +28848,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by HDF5 $as_me 1.8.4-snap11, which was +This file was extended by HDF5 $as_me 1.8.4-snap12, which was generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -28912,7 +28912,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -HDF5 config.status 1.8.4-snap11 +HDF5 config.status 1.8.4-snap12 configured by $0, generated by GNU Autoconf 2.64, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index c31a728..4ceb065 100644 --- a/configure.in +++ b/configure.in @@ -26,7 +26,7 @@ dnl dnl NOTE: Don't forget to change the version number here when we do a dnl release!!! dnl -AC_INIT([HDF5], [1.8.4-snap11], [help@hdfgroup.org]) +AC_INIT([HDF5], [1.8.4-snap12], [help@hdfgroup.org]) AC_CONFIG_SRCDIR([src/H5.c]) AM_CONFIG_HEADER([src/H5config.h]) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 9bf7733..9620c38 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -1,4 +1,4 @@ -HDF5 version 1.8.4-snap11 currently under development +HDF5 version 1.8.4-snap12 currently under development ================================================================================ INTRODUCTION diff --git a/src/H5Groot.c b/src/H5Groot.c index e4cdc46..f4a18ae 100644 --- a/src/H5Groot.c +++ b/src/H5Groot.c @@ -252,11 +252,12 @@ done: if(f->shared->root_grp) { if(f->shared->root_grp->shared) f->shared->root_grp->shared = H5FL_FREE(H5G_shared_t, f->shared->root_grp->shared); + H5G_name_free(root_loc.path); f->shared->root_grp = H5FL_FREE(H5G_t, f->shared->root_grp); } /* end if */ if(f->shared->sblock) f->shared->sblock->root_ent = (H5G_entry_t *)H5MM_xfree(f->shared->sblock->root_ent); - H5G_name_free(root_loc.path); + /* H5G_name_free(root_loc.path);*/ } /* end if */ /* Mark superblock dirty in cache, if necessary */ diff --git a/src/H5O.c b/src/H5O.c index 52db34f..402e7ee 100644 --- a/src/H5O.c +++ b/src/H5O.c @@ -555,6 +555,7 @@ H5Oexists_by_name(hid_t loc_id, const char *name, hid_t lapl_id) hid_t ret_value = FAIL; /* Return value */ FUNC_ENTER_API(H5Oexists_by_name, FAIL) + H5TRACE3("t", "i*si", loc_id, name, lapl_id); /* Check args */ if(H5G_loc(loc_id, &loc) < 0) diff --git a/src/H5public.h b/src/H5public.h index 70a0623..431c8e2 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -72,9 +72,9 @@ extern "C" { #define H5_VERS_MAJOR 1 /* For major interface/format changes */ #define H5_VERS_MINOR 8 /* For minor interface/format changes */ #define H5_VERS_RELEASE 4 /* For tweaks, bug-fixes, or development */ -#define H5_VERS_SUBRELEASE "snap11" /* For pre-releases like snap0 */ +#define H5_VERS_SUBRELEASE "snap12" /* For pre-releases like snap0 */ /* Empty string for real releases. */ -#define H5_VERS_INFO "HDF5 library version: 1.8.4-snap11" /* Full version string */ +#define H5_VERS_INFO "HDF5 library version: 1.8.4-snap12" /* Full version string */ #define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \ H5_VERS_RELEASE) diff --git a/vms/src/h5pubconf.h b/vms/src/h5pubconf.h index 72d1767..0e22e43 100644 --- a/vms/src/h5pubconf.h +++ b/vms/src/h5pubconf.h @@ -475,7 +475,7 @@ #define H5_PACKAGE_NAME "HDF5" /* Define to the full name and version of this package. */ -#define H5_PACKAGE_STRING "HDF5 1.8.4-snap11" +#define H5_PACKAGE_STRING "HDF5 1.8.4-snap12" /* Define to the one symbol short name of this package. */ #define H5_PACKAGE_TARNAME "hdf5" @@ -484,7 +484,7 @@ #define H5_PACKAGE_URL "" /* Define to the version of this package. */ -#define H5_PACKAGE_VERSION "1.8.4-snap11" +#define H5_PACKAGE_VERSION "1.8.4-snap12" /* Width for printf() for type `long long' or `__int64', use `ll' */ #define H5_PRINTF_LL_WIDTH "ll" @@ -637,7 +637,7 @@ /* #undef H5_USING_MEMCHECKER */ /* Version number of package */ -#define H5_VERSION "1.8.4-snap11" +#define H5_VERSION "1.8.4-snap12" /* Define if vsnprintf() returns the correct value for formatted strings that don't fit into size allowed */ diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h index c5358f4..e9b45a3 100755 --- a/windows/src/H5pubconf.h +++ b/windows/src/H5pubconf.h @@ -472,13 +472,13 @@ #define H5_PACKAGE_NAME "HDF5" /* Define to the full name and version of this package. */ -#define H5_PACKAGE_STRING "HDF5 1.8.4-snap11" +#define H5_PACKAGE_STRING "HDF5 1.8.4-snap12" /* Define to the one symbol short name of this package. */ #define H5_PACKAGE_TARNAME "hdf5" /* Define to the version of this package. */ -#define H5_PACKAGE_VERSION "1.8.4-snap11" +#define H5_PACKAGE_VERSION "1.8.4-snap12" /* Width for printf() for type `long long' or `__int64', use `ll' */ #define H5_PRINTF_LL_WIDTH "I64" @@ -635,7 +635,7 @@ /* #undef H5_USING_MEMCHECKER */ /* Version number of package */ -#define H5_VERSION "1.8.4-snap11" +#define H5_VERSION "1.8.4-snap12" /* Define if vsnprintf() returns the correct value for formatted strings that don't fit into size allowed */ -- cgit v0.12