Merge branch 'develop' into hdf5_1_10.sync

This commit is contained in:
M. Scot Breitenfeld 2018-05-23 17:15:13 -05:00
commit e8eb130ce6
3 changed files with 41 additions and 48 deletions

View File

@ -62,9 +62,6 @@ For more information see USING_CMake_Examples.txt in the install folder.
===========================================================================
Documentation for this release can be found at the following URL:
http://www.hdfgroup.org/HDF5/doc/.
See the HDF5 home page for further details:
http://hdfgroup.org/HDF5/
https://portal.hdfgroup.org/display/support
Bugs should be reported to help@hdfgroup.org.

View File

@ -15,9 +15,9 @@ NOTE: Building applications with the dynamic/shared hdf5 libraries requires
The following two sections are helpful if you do not use CMake to build
your applications.
========================================================================
Using Visual Studio 2010 with HDF5 Libraries built with Visual Studio 2010
========================================================================
==============================================================================================
Using Visual Studio 2010 and above with HDF5 Libraries built with Visual Studio 2010 and above
==============================================================================================
1. Set up path for external libraries and headers
@ -79,13 +79,9 @@ Using Visual Studio 2008 with HDF5 Libraries built with Visual Studio 2008
3.1 FAQ
Many other common questions and hints are located online and being updated
in the HDF5 FAQ. For Windows-specific questions, please see:
in the HDF Knowledge Base, please see:
https://support.hdfgroup.org/HDF5/faq/windows.html
For all other general questions, you can look in the general FAQ:
https://support.hdfgroup.org/HDF5/HDF5-FAQ.html
https://portal.hdfgroup.org/display/knowledge/HDF+Knowledge+Base
************************************************************************
Please send email to help@hdfgroup.org for further assistance.

View File

@ -510,7 +510,7 @@ H5F__build_name(const char *prefix, const char *file_name, char **full_name/*out
/* Compose the full file name */
HDsnprintf(*full_name, (prefix_len + fname_len + 2), "%s%s%s", prefix,
(H5_CHECK_DELIMITER(prefix[prefix_len - 1]) ? "" : H5_DIR_SEPS), file_name);
((prefix_len == 0 || H5_CHECK_DELIMITER(prefix[prefix_len - 1])) ? "" : H5_DIR_SEPS), file_name);
done:
FUNC_LEAVE_NOAPI(ret_value)