diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-07-20 16:51:49 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-07-20 16:51:49 (GMT) |
| commit | de3a870bcd4953a3654b3e9dc92edab86fe858cd (patch) | |
| tree | 8bf2fc6e0814f67b1388c23136aaff9e4a7cba96 /tools/lib | |
| parent | 98754fa9d12090f5e048fdb05cc5e9ce9111676f (diff) | |
| download | hdf5-de3a870bcd4953a3654b3e9dc92edab86fe858cd.zip hdf5-de3a870bcd4953a3654b3e9dc92edab86fe858cd.tar.gz hdf5-de3a870bcd4953a3654b3e9dc92edab86fe858cd.tar.bz2 | |
[svn-r19110] Description:
Bring r19049:19109 from trunk to revise_chunks branch
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, w/threadsafe, in production mode
Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
Mac OS X/32 10.6.4 (amazon) in debug mode
Mac OS X/32 10.6.4 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Mac OS X/32 10.6.4 (amazon) w/parallel, in debug mode
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/lib/h5tools_utils.c | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 7568a89..fe7fc52 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -131,6 +131,7 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CXX_VERSION = @CXX_VERSION@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ DEFAULT_API_VERSION = @DEFAULT_API_VERSION@ @@ -156,6 +157,7 @@ FC = @FC@ FCFLAGS = @FCFLAGS@ FCFLAGS_f90 = @FCFLAGS_f90@ FCLIBS = @FCLIBS@ +FC_VERSION = @FC_VERSION@ FGREP = @FGREP@ FILTERS = @FILTERS@ FSEARCH_DIRS = @FSEARCH_DIRS@ diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c index ca1caa1..04d375d 100644 --- a/tools/lib/h5tools_utils.c +++ b/tools/lib/h5tools_utils.c @@ -638,7 +638,6 @@ tmpfile(void) * Patameters: * - [IN] fileid : link file id * - [IN] linkpath : link path - * - [OUT] h5li : link's info (H5L_info_t) * - [OUT] link_info: returning target object info (h5tool_link_info_t) * * Return: @@ -656,7 +655,7 @@ tmpfile(void) *-------------------------------------------------------------------------*/ int H5tools_get_link_info(hid_t file_id, const char * linkpath, h5tool_link_info_t *link_info) { - int Ret = -1; /* init to fail */ + int ret = -1; /* init to fail */ htri_t l_ret; H5O_info_t trg_oinfo; hid_t fapl; @@ -684,7 +683,7 @@ int H5tools_get_link_info(hid_t file_id, const char * linkpath, h5tool_link_info /* given path is hard link (object) */ if (link_info->linfo.type == H5L_TYPE_HARD) { - Ret = 2; + ret = 2; goto out; } @@ -721,7 +720,7 @@ int H5tools_get_link_info(hid_t file_id, const char * linkpath, h5tool_link_info /* detect dangling link */ if(l_ret == FALSE) { - Ret = 0; + ret = 0; goto out; } /* function failed */ @@ -750,7 +749,7 @@ int H5tools_get_link_info(hid_t file_id, const char * linkpath, h5tool_link_info link_info->trg_type = trg_oinfo.type; /* succeed */ - Ret = 1; + ret = 1; out: if (link_info->linfo.type == H5L_TYPE_EXTERNAL) { @@ -758,7 +757,7 @@ out: H5Pclose(lapl); } - return Ret; + return ret; } /*------------------------------------------------------------------------- |