summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorNeil Fortner <nfortne2@hdfgroup.org>2015-04-10 23:00:48 (GMT)
committerNeil Fortner <nfortne2@hdfgroup.org>2015-04-10 23:00:48 (GMT)
commit6a27582a4488d4d18a0b6cd584b8950ab02b81a7 (patch)
tree01615f7679a3d3ef4b2d9caa487874aa421df506 /hl
parent7a4b02567e4de16d7478c10ffa07562b0daf320b (diff)
parent3875cc6960266775e8078c782c8864516865be67 (diff)
downloadhdf5-6a27582a4488d4d18a0b6cd584b8950ab02b81a7.zip
hdf5-6a27582a4488d4d18a0b6cd584b8950ab02b81a7.tar.gz
hdf5-6a27582a4488d4d18a0b6cd584b8950ab02b81a7.tar.bz2
[svn-r26781] Merge revisions 26305 through 26780 from trunk to vds branch.
Tested: ummon
Diffstat (limited to 'hl')
-rw-r--r--hl/CMakeLists.txt4
-rw-r--r--hl/Makefile.am2
-rw-r--r--hl/Makefile.in12
-rw-r--r--hl/c++/Makefile.in10
-rw-r--r--hl/c++/examples/CMakeLists.txt2
-rw-r--r--hl/c++/examples/Makefile.in10
-rw-r--r--hl/c++/examples/run-hlc++-ex.sh.in2
-rw-r--r--hl/c++/src/CMakeLists.txt2
-rw-r--r--hl/c++/src/Makefile.am6
-rw-r--r--hl/c++/src/Makefile.in17
-rw-r--r--hl/c++/test/CMakeLists.txt2
-rw-r--r--hl/c++/test/Makefile.am6
-rw-r--r--hl/c++/test/Makefile.in15
-rw-r--r--hl/examples/CMakeLists.txt2
-rw-r--r--hl/examples/Makefile.in10
-rw-r--r--hl/examples/ex_image1.c9
-rw-r--r--hl/examples/ex_image2.c10
-rw-r--r--hl/examples/ex_lite1.c5
-rw-r--r--hl/examples/ex_lite2.c7
-rw-r--r--hl/examples/ex_lite3.c11
-rw-r--r--hl/examples/ex_table_01.c5
-rw-r--r--hl/examples/ex_table_02.c7
-rw-r--r--hl/examples/ex_table_03.c7
-rw-r--r--hl/examples/ex_table_04.c9
-rw-r--r--hl/examples/ex_table_05.c19
-rw-r--r--hl/examples/ex_table_06.c5
-rw-r--r--hl/examples/ex_table_07.c7
-rw-r--r--hl/examples/ex_table_08.c9
-rw-r--r--hl/examples/ex_table_09.c11
-rw-r--r--hl/examples/ex_table_10.c11
-rw-r--r--hl/examples/ex_table_11.c9
-rw-r--r--hl/examples/ex_table_12.c7
-rw-r--r--hl/examples/run-hlc-ex.sh.in2
-rw-r--r--hl/fortran/Makefile.in10
-rw-r--r--hl/fortran/examples/CMakeLists.txt4
-rw-r--r--hl/fortran/examples/Makefile.in10
-rw-r--r--hl/fortran/examples/run-hlfortran-ex.sh.in2
-rw-r--r--hl/fortran/src/CMakeLists.txt48
-rw-r--r--hl/fortran/src/H5DSfc.c14
-rw-r--r--hl/fortran/src/H5DSff.f9010
-rw-r--r--hl/fortran/src/H5IMcc.c6
-rw-r--r--hl/fortran/src/H5IMfc.c106
-rw-r--r--hl/fortran/src/H5IMff.f9066
-rw-r--r--hl/fortran/src/H5LTf90proto.h375
-rw-r--r--hl/fortran/src/H5LTfc.c380
-rw-r--r--hl/fortran/src/H5LTff.f90788
-rw-r--r--hl/fortran/src/H5TBfc.c118
-rw-r--r--hl/fortran/src/H5TBff.f90186
-rw-r--r--hl/fortran/src/Makefile.in12
-rw-r--r--hl/fortran/test/CMakeLists.txt12
-rw-r--r--hl/fortran/test/Makefile.in10
-rw-r--r--hl/fortran/test/tstds.f902
-rw-r--r--hl/fortran/test/tstimage.f902
-rw-r--r--hl/fortran/test/tstlite.f9098
-rw-r--r--hl/src/CMakeLists.txt2
-rw-r--r--hl/src/H5DS.c79
-rw-r--r--hl/src/H5DSprivate.h2
-rw-r--r--hl/src/H5IM.c12
-rw-r--r--hl/src/H5LT.c19
-rw-r--r--hl/src/H5LTanalyze.c19
-rw-r--r--hl/src/H5LTparse.c19
-rw-r--r--hl/src/H5PT.c3
-rw-r--r--hl/src/Makefile.in12
-rw-r--r--hl/test/CMakeLists.txt6
-rw-r--r--hl/test/Makefile.in10
-rw-r--r--hl/test/h5hltest.h2
-rw-r--r--hl/test/test_ds.c2
-rw-r--r--hl/test/test_dset_opt.c14
-rw-r--r--hl/test/test_lite.c18
-rw-r--r--hl/test/test_packet.c107
-rw-r--r--hl/test/test_table.c84
-rw-r--r--hl/tools/CMakeLists.txt8
-rw-r--r--hl/tools/CMakeTests.cmake20
-rw-r--r--hl/tools/Makefile.in10
-rw-r--r--hl/tools/gif2h5/Makefile.in10
-rw-r--r--hl/tools/gif2h5/decompress.c2
-rw-r--r--hl/tools/gif2h5/gif.h2
-rw-r--r--hl/tools/gif2h5/gif2hdf.c2
-rw-r--r--hl/tools/gif2h5/gif2mem.c30
-rw-r--r--hl/tools/gif2h5/h52gifgentst.c8
-rw-r--r--hl/tools/gif2h5/h52giftest.sh.in75
-rw-r--r--hl/tools/gif2h5/hdf2gif.c21
-rw-r--r--hl/tools/gif2h5/hdfgifwr.c8
-rw-r--r--hl/tools/gif2h5/testfiles/REAMDE6
-rw-r--r--hl/tools/gif2h5/testfiles/ex_image2.h5bin0 -> 224533 bytes
85 files changed, 1518 insertions, 1605 deletions
diff --git a/hl/CMakeLists.txt b/hl/CMakeLists.txt
index 031b7d6..b5d4308 100644
--- a/hl/CMakeLists.txt
+++ b/hl/CMakeLists.txt
@@ -38,7 +38,3 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED)
add_subdirectory (${HDF5_HL_SOURCE_DIR}/test ${HDF5_HL_BINARY_DIR}/test)
endif (BUILD_TESTING)
endif (NOT HDF5_EXTERNALLY_CONFIGURED)
-
-if (HDF5_BUILD_CPP_LIB)
- add_subdirectory (${HDF5_HL_SOURCE_DIR}/c++ ${HDF5_HL_BINARY_DIR}/c++)
-endif (HDF5_BUILD_CPP_LIB)
diff --git a/hl/Makefile.am b/hl/Makefile.am
index 3271575..9f31719 100644
--- a/hl/Makefile.am
+++ b/hl/Makefile.am
@@ -43,7 +43,7 @@ DIST_SUBDIRS=src test tools c++ fortran examples
# Install examples
install-examples uninstall-examples:
- @@SETX@; for d in examples $(HDF5_INTERFACES); do \
+ for d in examples $(HDF5_INTERFACES); do \
(cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
done
diff --git a/hl/Makefile.in b/hl/Makefile.in
index f3d6c04..60c9453 100644
--- a/hl/Makefile.in
+++ b/hl/Makefile.in
@@ -409,7 +409,6 @@ AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@
AM_MAKEFLAGS = @AM_MAKEFLAGS@
AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -441,7 +440,6 @@ DIRECT_VFD = @DIRECT_VFD@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
-DYNAMIC_DIRS = @DYNAMIC_DIRS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -460,17 +458,14 @@ FCFLAGS_f90 = @FCFLAGS_f90@
FCLIBS = @FCLIBS@
FC_VERSION = @FC_VERSION@
FGREP = @FGREP@
-FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@
GREP = @GREP@
H5_CFLAGS = @H5_CFLAGS@
H5_CPPFLAGS = @H5_CPPFLAGS@
H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
H5_FCFLAGS = @H5_FCFLAGS@
H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
H5_VERSION = @H5_VERSION@
HADDR_T = @HADDR_T@
HAVE_DMALLOC = @HAVE_DMALLOC@
@@ -533,7 +528,6 @@ R_INTEGER = @R_INTEGER@
R_LARGE = @R_LARGE@
SEARCH = @SEARCH@
SED = @SED@
-SETX = @SETX@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIZE_T = @SIZE_T@
@@ -548,10 +542,6 @@ TR = @TR@
TRACE_API = @TRACE_API@
UNAME_INFO = @UNAME_INFO@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
-USE_FILTER_NBIT = @USE_FILTER_NBIT@
-USE_FILTER_SCALEOFFSET = @USE_FILTER_SCALEOFFSET@
-USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@
USE_FILTER_SZIP = @USE_FILTER_SZIP@
USINGMEMCHECKER = @USINGMEMCHECKER@
VERSION = @VERSION@
@@ -1168,7 +1158,7 @@ help:
# Install examples
install-examples uninstall-examples:
- @@SETX@; for d in examples $(HDF5_INTERFACES); do \
+ for d in examples $(HDF5_INTERFACES); do \
(cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
done
diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in
index 0367469..278f97b 100644
--- a/hl/c++/Makefile.in
+++ b/hl/c++/Makefile.in
@@ -405,7 +405,6 @@ AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@
AM_MAKEFLAGS = @AM_MAKEFLAGS@
AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -437,7 +436,6 @@ DIRECT_VFD = @DIRECT_VFD@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
-DYNAMIC_DIRS = @DYNAMIC_DIRS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -456,17 +454,14 @@ FCFLAGS_f90 = @FCFLAGS_f90@
FCLIBS = @FCLIBS@
FC_VERSION = @FC_VERSION@
FGREP = @FGREP@
-FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@
GREP = @GREP@
H5_CFLAGS = @H5_CFLAGS@
H5_CPPFLAGS = @H5_CPPFLAGS@
H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
H5_FCFLAGS = @H5_FCFLAGS@
H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
H5_VERSION = @H5_VERSION@
HADDR_T = @HADDR_T@
HAVE_DMALLOC = @HAVE_DMALLOC@
@@ -529,7 +524,6 @@ R_INTEGER = @R_INTEGER@
R_LARGE = @R_LARGE@
SEARCH = @SEARCH@
SED = @SED@
-SETX = @SETX@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIZE_T = @SIZE_T@
@@ -544,10 +538,6 @@ TR = @TR@
TRACE_API = @TRACE_API@
UNAME_INFO = @UNAME_INFO@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
-USE_FILTER_NBIT = @USE_FILTER_NBIT@
-USE_FILTER_SCALEOFFSET = @USE_FILTER_SCALEOFFSET@
-USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@
USE_FILTER_SZIP = @USE_FILTER_SZIP@
USINGMEMCHECKER = @USINGMEMCHECKER@
VERSION = @VERSION@
diff --git a/hl/c++/examples/CMakeLists.txt b/hl/c++/examples/CMakeLists.txt
index 12c1d50..e3fc3ae 100644
--- a/hl/c++/examples/CMakeLists.txt
+++ b/hl/c++/examples/CMakeLists.txt
@@ -12,7 +12,7 @@ INCLUDE_DIRECTORIES (${HDF5_HL_CPP_SRC_DIR}/src)
# --------------------------------------------------------------------
add_executable (ptExampleFL ${HDF5_HL_CPP_EXAMPLES_SOURCE_DIR}/ptExampleFL.cpp)
TARGET_NAMING (ptExampleFL ${LIB_TYPE})
-TARGET_C_PROPERTIES (ptExampleFL " " " ")
+TARGET_C_PROPERTIES (ptExampleFL ${LIB_TYPE} " " " ")
target_link_libraries (
ptExampleFL
${HDF5_HL_CPP_LIB_TARGET}
diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in
index a9ecd9e..a36886c 100644
--- a/hl/c++/examples/Makefile.in
+++ b/hl/c++/examples/Makefile.in
@@ -352,7 +352,6 @@ AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@
AM_MAKEFLAGS = @AM_MAKEFLAGS@
AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -384,7 +383,6 @@ DIRECT_VFD = @DIRECT_VFD@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
-DYNAMIC_DIRS = @DYNAMIC_DIRS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -403,17 +401,14 @@ FCFLAGS_f90 = @FCFLAGS_f90@
FCLIBS = @FCLIBS@
FC_VERSION = @FC_VERSION@
FGREP = @FGREP@
-FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@
GREP = @GREP@
H5_CFLAGS = @H5_CFLAGS@
H5_CPPFLAGS = @H5_CPPFLAGS@
H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
H5_FCFLAGS = @H5_FCFLAGS@
H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
H5_VERSION = @H5_VERSION@
HADDR_T = @HADDR_T@
HAVE_DMALLOC = @HAVE_DMALLOC@
@@ -476,7 +471,6 @@ R_INTEGER = @R_INTEGER@
R_LARGE = @R_LARGE@
SEARCH = @SEARCH@
SED = @SED@
-SETX = @SETX@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIZE_T = @SIZE_T@
@@ -491,10 +485,6 @@ TR = @TR@
TRACE_API = @TRACE_API@
UNAME_INFO = @UNAME_INFO@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
-USE_FILTER_NBIT = @USE_FILTER_NBIT@
-USE_FILTER_SCALEOFFSET = @USE_FILTER_SCALEOFFSET@
-USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@
USE_FILTER_SZIP = @USE_FILTER_SZIP@
USINGMEMCHECKER = @USINGMEMCHECKER@
VERSION = @VERSION@
diff --git a/hl/c++/examples/run-hlc++-ex.sh.in b/hl/c++/examples/run-hlc++-ex.sh.in
index 103dd76..5aa1032 100644
--- a/hl/c++/examples/run-hlc++-ex.sh.in
+++ b/hl/c++/examples/run-hlc++-ex.sh.in
@@ -33,7 +33,7 @@ EXIT_SUCCESS=0
EXIT_FAILURE=1
# Where the tool is installed.
# default is relative path to installed location of the tools
-prefix="${prefix:-../../../../}"
+prefix="${prefix:-@prefix@}"
AR="@AR@"
RANLIB="@RANLIB@"
H5TOOL="h5c++" # The tool name
diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt
index 0dee06f..640cb2d 100644
--- a/hl/c++/src/CMakeLists.txt
+++ b/hl/c++/src/CMakeLists.txt
@@ -11,7 +11,7 @@ set (HDF5_HL_CPP_SRCS ${HDF5_HL_CPP_SRC_SOURCE_DIR}/H5PacketTable.cpp)
set (HDF5_HL_CPP_HDRS ${HDF5_HL_CPP_SRC_SOURCE_DIR}/H5PacketTable.h)
add_library (${HDF5_HL_CPP_LIB_TARGET} ${LIB_TYPE} ${HDF5_HL_CPP_SRCS})
-TARGET_C_PROPERTIES (${HDF5_HL_CPP_LIB_TARGET} " " " ")
+TARGET_C_PROPERTIES (${HDF5_HL_CPP_LIB_TARGET} ${LIB_TYPE} " " " ")
target_link_libraries (
${HDF5_HL_CPP_LIB_TARGET}
${HDF5_HL_LIB_TARGET}
diff --git a/hl/c++/src/Makefile.am b/hl/c++/src/Makefile.am
index 9751e94..b268948 100644
--- a/hl/c++/src/Makefile.am
+++ b/hl/c++/src/Makefile.am
@@ -30,12 +30,6 @@ lib_LTLIBRARIES=libhdf5_hl_cpp.la
# Add libtool numbers to the HDF5 HL C++ library (from config/lt_vers.am)
libhdf5_hl_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
-# Shared C++ libraries aren't universally supported.
-if CXX_SHARED_CONDITIONAL
-else
- AM_LDFLAGS+=-static
-endif
-
# Source files for the library
# At the moment, only the H5PT Packet Table has a C++ API.
libhdf5_hl_cpp_la_SOURCES=H5PacketTable.cpp
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index 7e8c4ba..89b71cb 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -102,9 +102,6 @@ DIST_COMMON = $(top_srcdir)/config/commence.am \
$(srcdir)/Makefile.am $(top_srcdir)/bin/mkinstalldirs \
$(top_srcdir)/bin/depcomp $(include_HEADERS) \
$(top_srcdir)/bin/test-driver
-
-# Shared C++ libraries aren't universally supported.
-@CXX_SHARED_CONDITIONAL_FALSE@am__append_1 = -static
TESTS =
subdir = hl/c++/src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -408,10 +405,9 @@ AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@ -I$(top_srcdir)/src \
AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
-AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@ $(am__append_1)
+AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@
AM_MAKEFLAGS = @AM_MAKEFLAGS@
AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -443,7 +439,6 @@ DIRECT_VFD = @DIRECT_VFD@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
-DYNAMIC_DIRS = @DYNAMIC_DIRS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -462,17 +457,14 @@ FCFLAGS_f90 = @FCFLAGS_f90@
FCLIBS = @FCLIBS@
FC_VERSION = @FC_VERSION@
FGREP = @FGREP@
-FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@
GREP = @GREP@
H5_CFLAGS = @H5_CFLAGS@
H5_CPPFLAGS = @H5_CPPFLAGS@
H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
H5_FCFLAGS = @H5_FCFLAGS@
H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
H5_VERSION = @H5_VERSION@
HADDR_T = @HADDR_T@
HAVE_DMALLOC = @HAVE_DMALLOC@
@@ -535,7 +527,6 @@ R_INTEGER = @R_INTEGER@
R_LARGE = @R_LARGE@
SEARCH = @SEARCH@
SED = @SED@
-SETX = @SETX@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIZE_T = @SIZE_T@
@@ -550,10 +541,6 @@ TR = @TR@
TRACE_API = @TRACE_API@
UNAME_INFO = @UNAME_INFO@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
-USE_FILTER_NBIT = @USE_FILTER_NBIT@
-USE_FILTER_SCALEOFFSET = @USE_FILTER_SCALEOFFSET@
-USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@
USE_FILTER_SZIP = @USE_FILTER_SZIP@
USINGMEMCHECKER = @USINGMEMCHECKER@
VERSION = @VERSION@
@@ -675,7 +662,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
# After making changes, run bin/reconfigure to update other configure related
# files like Makefile.in.
LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 205
+LT_VERS_REVISION = 206
LT_VERS_AGE = 0
# This is our main target
diff --git a/hl/c++/test/CMakeLists.txt b/hl/c++/test/CMakeLists.txt
index d4e1157..ff06b22 100644
--- a/hl/c++/test/CMakeLists.txt
+++ b/hl/c++/test/CMakeLists.txt
@@ -16,7 +16,7 @@ INCLUDE_DIRECTORIES (${HDF5_HL_SRC_DIR}/test)
INCLUDE_DIRECTORIES (${HDF5_CPP_SRC_DIR}/src)
add_executable (hl_ptableTest ${HDF5_HL_CPP_TEST_SOURCE_DIR}/ptableTest.cpp)
-TARGET_C_PROPERTIES (hl_ptableTest " " " ")
+TARGET_C_PROPERTIES (hl_ptableTest ${LIB_TYPE} " " " ")
TARGET_NAMING (hl_ptableTest ${LIB_TYPE})
target_link_libraries (
hl_ptableTest
diff --git a/hl/c++/test/Makefile.am b/hl/c++/test/Makefile.am
index 105188f..c835843 100644
--- a/hl/c++/test/Makefile.am
+++ b/hl/c++/test/Makefile.am
@@ -23,12 +23,6 @@ include $(top_srcdir)/config/commence.am
# Include directories
AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/c++/src -I$(top_srcdir)/hl/src -I$(top_srcdir)/hl/c++/src -I$(top_srcdir)/test -I$(top_builddir)/hl/test -I$(top_srcdir)/hl/test
-# Shared C++ libraries aren't universally supported.
-if CXX_SHARED_CONDITIONAL
-else
- AM_LDFLAGS+=-static
-endif
-
# These are our main targets. They should be listed in the order to be
# executed, generally most specific tests to least specific tests.
TEST_PROG=ptableTest
diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in
index 1160548..b7d7d09 100644
--- a/hl/c++/test/Makefile.in
+++ b/hl/c++/test/Makefile.in
@@ -98,9 +98,6 @@ DIST_COMMON = $(top_srcdir)/config/commence.am \
$(top_srcdir)/config/conclude.am $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(top_srcdir)/bin/mkinstalldirs \
$(top_srcdir)/bin/depcomp $(top_srcdir)/bin/test-driver
-
-# Shared C++ libraries aren't universally supported.
-@CXX_SHARED_CONDITIONAL_FALSE@am__append_1 = -static
check_PROGRAMS = $(am__EXEEXT_1)
TESTS = $(am__EXEEXT_1)
subdir = hl/c++/test
@@ -405,10 +402,9 @@ AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@ -I$(top_srcdir)/src \
AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
-AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@ $(am__append_1)
+AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@
AM_MAKEFLAGS = @AM_MAKEFLAGS@
AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -440,7 +436,6 @@ DIRECT_VFD = @DIRECT_VFD@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
-DYNAMIC_DIRS = @DYNAMIC_DIRS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -459,17 +454,14 @@ FCFLAGS_f90 = @FCFLAGS_f90@
FCLIBS = @FCLIBS@
FC_VERSION = @FC_VERSION@
FGREP = @FGREP@
-FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@
GREP = @GREP@
H5_CFLAGS = @H5_CFLAGS@
H5_CPPFLAGS = @H5_CPPFLAGS@
H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
H5_FCFLAGS = @H5_FCFLAGS@
H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
H5_VERSION = @H5_VERSION@
HADDR_T = @HADDR_T@
HAVE_DMALLOC = @HAVE_DMALLOC@
@@ -532,7 +524,6 @@ R_INTEGER = @R_INTEGER@
R_LARGE = @R_LARGE@
SEARCH = @SEARCH@
SED = @SED@
-SETX = @SETX@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIZE_T = @SIZE_T@
@@ -547,10 +538,6 @@ TR = @TR@
TRACE_API = @TRACE_API@
UNAME_INFO = @UNAME_INFO@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
-USE_FILTER_NBIT = @USE_FILTER_NBIT@
-USE_FILTER_SCALEOFFSET = @USE_FILTER_SCALEOFFSET@
-USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@
USE_FILTER_SZIP = @USE_FILTER_SZIP@
USINGMEMCHECKER = @USINGMEMCHECKER@
VERSION = @VERSION@
diff --git a/hl/examples/CMakeLists.txt b/hl/examples/CMakeLists.txt
index edcb920..e264f75 100644
--- a/hl/examples/CMakeLists.txt
+++ b/hl/examples/CMakeLists.txt
@@ -29,7 +29,7 @@ set (examples
foreach (example ${examples})
add_executable (hl_ex_${example} ${HDF5_HL_EXAMPLES_SOURCE_DIR}/${example}.c)
TARGET_NAMING (hl_ex_${example} ${LIB_TYPE})
- TARGET_C_PROPERTIES (hl_ex_${example} " " " ")
+ TARGET_C_PROPERTIES (hl_ex_${example} ${LIB_TYPE} " " " ")
target_link_libraries (hl_ex_${example} ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
set_target_properties (hl_ex_${example} PROPERTIES FOLDER examples/hl)
endforeach (example ${examples})
diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in
index 92a8301..f0bf099 100644
--- a/hl/examples/Makefile.in
+++ b/hl/examples/Makefile.in
@@ -352,7 +352,6 @@ AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@
AM_MAKEFLAGS = @AM_MAKEFLAGS@
AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -384,7 +383,6 @@ DIRECT_VFD = @DIRECT_VFD@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
-DYNAMIC_DIRS = @DYNAMIC_DIRS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -403,17 +401,14 @@ FCFLAGS_f90 = @FCFLAGS_f90@
FCLIBS = @FCLIBS@
FC_VERSION = @FC_VERSION@
FGREP = @FGREP@
-FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@
GREP = @GREP@
H5_CFLAGS = @H5_CFLAGS@
H5_CPPFLAGS = @H5_CPPFLAGS@
H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
H5_FCFLAGS = @H5_FCFLAGS@
H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
H5_VERSION = @H5_VERSION@
HADDR_T = @HADDR_T@
HAVE_DMALLOC = @HAVE_DMALLOC@
@@ -476,7 +471,6 @@ R_INTEGER = @R_INTEGER@
R_LARGE = @R_LARGE@
SEARCH = @SEARCH@
SED = @SED@
-SETX = @SETX@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIZE_T = @SIZE_T@
@@ -491,10 +485,6 @@ TR = @TR@
TRACE_API = @TRACE_API@
UNAME_INFO = @UNAME_INFO@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
-USE_FILTER_NBIT = @USE_FILTER_NBIT@
-USE_FILTER_SCALEOFFSET = @USE_FILTER_SCALEOFFSET@
-USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@
USE_FILTER_SZIP = @USE_FILTER_SZIP@
USINGMEMCHECKER = @USINGMEMCHECKER@
VERSION = @VERSION@
diff --git a/hl/examples/ex_image1.c b/hl/examples/ex_image1.c
index 96bc7c7..18ad903 100644
--- a/hl/examples/ex_image1.c
+++ b/hl/examples/ex_image1.c
@@ -24,7 +24,6 @@ unsigned char buf [ WIDTH*HEIGHT ];
int main( void )
{
hid_t file_id;
- herr_t status;
hsize_t pal_dims[] = {PAL_ENTRIES,3};
size_t i, j;
int n, space;
@@ -56,16 +55,16 @@ int main( void )
file_id = H5Fcreate( "ex_image1.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
/* make the image */
- status = H5IMmake_image_8bit( file_id, "image1", (hsize_t)WIDTH, (hsize_t)HEIGHT, buf );
+ H5IMmake_image_8bit( file_id, "image1", (hsize_t)WIDTH, (hsize_t)HEIGHT, buf );
/* make a palette */
- status = H5IMmake_palette( file_id, "pallete", pal_dims, pal );
+ H5IMmake_palette( file_id, "pallete", pal_dims, pal );
/* attach the palette to the image */
- status = H5IMlink_palette( file_id, "image1", "pallete" );
+ H5IMlink_palette( file_id, "image1", "pallete" );
/* close the file. */
- status = H5Fclose( file_id );
+ H5Fclose( file_id );
return 0;
diff --git a/hl/examples/ex_image2.c b/hl/examples/ex_image2.c
index 3276f7c..b57f1b7 100644
--- a/hl/examples/ex_image2.c
+++ b/hl/examples/ex_image2.c
@@ -35,7 +35,7 @@ int main( void )
hsize_t height; /* height of image */
unsigned char pal[ PAL_ENTRIES * 3 ]; /* palette array */
hsize_t pal_dims[2] = {PAL_ENTRIES,3}; /* palette dimensions */
- herr_t status, i, n;
+ herr_t i, n;
/* create a new HDF5 file using default properties. */
file_id = H5Fcreate( "ex_image2.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
@@ -45,7 +45,7 @@ int main( void )
goto out;
/* make the image */
- status=H5IMmake_image_8bit( file_id, IMAGE1_NAME, width, height, gbuf );
+ H5IMmake_image_8bit( file_id, IMAGE1_NAME, width, height, gbuf );
if (gbuf) {
free(gbuf);
gbuf = NULL;
@@ -63,10 +63,10 @@ int main( void )
}
/* make a palette */
- status=H5IMmake_palette( file_id, PAL_NAME, pal_dims, pal );
+ H5IMmake_palette( file_id, PAL_NAME, pal_dims, pal );
/* attach the palette to the image */
- status=H5IMlink_palette( file_id, IMAGE1_NAME, PAL_NAME );
+ H5IMlink_palette( file_id, IMAGE1_NAME, PAL_NAME );
/*-------------------------------------------------------------------------
* True color image example with pixel interlace
@@ -78,7 +78,7 @@ int main( void )
goto out;
/* make dataset */
- status=H5IMmake_image_24bit( file_id, IMAGE2_NAME, width, height, "INTERLACE_PIXEL", gbuf );
+ H5IMmake_image_24bit( file_id, IMAGE2_NAME, width, height, "INTERLACE_PIXEL", gbuf );
/* close the file. */
H5Fclose( file_id );
diff --git a/hl/examples/ex_lite1.c b/hl/examples/ex_lite1.c
index 2a82fef..446c803 100644
--- a/hl/examples/ex_lite1.c
+++ b/hl/examples/ex_lite1.c
@@ -25,16 +25,15 @@ int main( void )
hid_t file_id;
hsize_t dims[RANK]={2,3};
int data[6]={1,2,3,4,5,6};
- herr_t status;
/* create a HDF5 file */
file_id = H5Fcreate ("ex_lite1.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
/* create and write an integer type dataset named "dset" */
- status = H5LTmake_dataset(file_id,"/dset",RANK,dims,H5T_NATIVE_INT,data);
+ H5LTmake_dataset(file_id,"/dset",RANK,dims,H5T_NATIVE_INT,data);
/* close file */
- status = H5Fclose (file_id);
+ H5Fclose (file_id);
return 0;
}
diff --git a/hl/examples/ex_lite2.c b/hl/examples/ex_lite2.c
index 98f92c8..a696a20 100644
--- a/hl/examples/ex_lite2.c
+++ b/hl/examples/ex_lite2.c
@@ -21,17 +21,16 @@ int main( void )
hid_t file_id;
int data[6];
hsize_t dims[2];
- herr_t status;
size_t i, j, nrow, n_values;
/* open file from ex_lite1.c */
file_id = H5Fopen ("ex_lite1.h5", H5F_ACC_RDONLY, H5P_DEFAULT);
/* read dataset */
- status = H5LTread_dataset_int(file_id,"/dset",data);
+ H5LTread_dataset_int(file_id,"/dset",data);
/* get the dimensions of the dataset */
- status = H5LTget_dataset_info(file_id,"/dset",dims,NULL,NULL);
+ H5LTget_dataset_info(file_id,"/dset",dims,NULL,NULL);
/* print it by rows */
n_values = (size_t)(dims[0] * dims[1]);
@@ -44,7 +43,7 @@ int main( void )
}
/* close file */
- status = H5Fclose (file_id);
+ H5Fclose (file_id);
return 0;
diff --git a/hl/examples/ex_lite3.c b/hl/examples/ex_lite3.c
index 9164c7b..f409ea4 100644
--- a/hl/examples/ex_lite3.c
+++ b/hl/examples/ex_lite3.c
@@ -26,7 +26,6 @@ int main( void )
hid_t space_id;
hsize_t dims[1] = { ATTR_SIZE };
int data[ATTR_SIZE] = {1,2,3,4,5};
- herr_t status;
int i;
/* create a file */
@@ -39,8 +38,8 @@ int main( void )
dset_id = H5Dcreate2(file_id, "dset", H5T_NATIVE_INT, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
/* close */
- status = H5Dclose(dset_id);
- status = H5Sclose(space_id);
+ H5Dclose(dset_id);
+ H5Sclose(space_id);
/*-------------------------------------------------------------------------
* example of H5LTset_attribute_int
@@ -48,7 +47,7 @@ int main( void )
*/
/* create and write the attribute "attr1" on the dataset "dset" */
- status = H5LTset_attribute_int(file_id, "dset", "attr1", data, ATTR_SIZE);
+ H5LTset_attribute_int(file_id, "dset", "attr1", data, ATTR_SIZE);
/*-------------------------------------------------------------------------
* example of H5LTget_attribute_int
@@ -56,14 +55,14 @@ int main( void )
*/
/* get the attribute "attr1" from the dataset "dset" */
- status = H5LTget_attribute_int(file_id, "dset", "attr1", data);
+ H5LTget_attribute_int(file_id, "dset", "attr1", data);
for(i = 0; i < ATTR_SIZE; i++ )
printf(" %d", data[i]);
printf("\n");
/* close file */
- status = H5Fclose(file_id);
+ H5Fclose(file_id);
return 0;
}
diff --git a/hl/examples/ex_table_01.c b/hl/examples/ex_table_01.c
index de304d9..1d381ae 100644
--- a/hl/examples/ex_table_01.c
+++ b/hl/examples/ex_table_01.c
@@ -80,7 +80,6 @@ int main( void )
hsize_t chunk_size = 10;
int *fill_data = NULL;
int compress = 0;
- herr_t status;
int i;
/* Initialize field_type */
@@ -100,7 +99,7 @@ int main( void )
*-------------------------------------------------------------------------
*/
- status=H5TBmake_table( "Table Title", file_id, TABLE_NAME,NFIELDS,NRECORDS,
+ H5TBmake_table( "Table Title", file_id, TABLE_NAME,NFIELDS,NRECORDS,
dst_size,field_names, dst_offset, field_type,
chunk_size, fill_data, compress, p_data );
@@ -109,7 +108,7 @@ int main( void )
*-------------------------------------------------------------------------
*/
- status=H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
+ H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
/* print it by rows */
for (i=0; i<NRECORDS; i++) {
diff --git a/hl/examples/ex_table_02.c b/hl/examples/ex_table_02.c
index 98e33d3..129f87d 100644
--- a/hl/examples/ex_table_02.c
+++ b/hl/examples/ex_table_02.c
@@ -78,7 +78,6 @@ int main( void )
hsize_t chunk_size = 10;
int *fill_data = NULL;
int compress = 0;
- herr_t status;
int i;
/* Append particles */
@@ -99,16 +98,16 @@ int main( void )
file_id = H5Fcreate( "ex_table_02.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
/* make a table */
- status=H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
+ H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
dst_size, field_names, dst_offset, field_type,
chunk_size, fill_data, compress, p_data );
/* append two records */
- status=H5TBappend_records(file_id, TABLE_NAME,NRECORDS_ADD, dst_size, dst_offset, dst_sizes,
+ H5TBappend_records(file_id, TABLE_NAME,NRECORDS_ADD, dst_size, dst_offset, dst_sizes,
&particle_in );
/* read the table */
- status=H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
+ H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
/* print it by rows */
for (i=0; i<NRECORDS+NRECORDS_ADD; i++) {
diff --git a/hl/examples/ex_table_03.c b/hl/examples/ex_table_03.c
index 7315fd3..c9f94ce 100644
--- a/hl/examples/ex_table_03.c
+++ b/hl/examples/ex_table_03.c
@@ -71,7 +71,6 @@ int main( void )
hsize_t chunk_size = 10;
hsize_t start; /* Record to start reading/writing */
hsize_t nrecords; /* Number of records to read/write */
- herr_t status;
int i;
/* Define 2 new particles to write */
@@ -92,7 +91,7 @@ int main( void )
file_id = H5Fcreate( "ex_table_03.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
/* Make the table */
- status=H5TBmake_table( "Table Title",
+ H5TBmake_table( "Table Title",
file_id,
TABLE_NAME,
NFIELDS,
@@ -110,11 +109,11 @@ int main( void )
/* Overwrite 2 records starting at record 0 */
start = 0;
nrecords = NRECORDS_WRITE;
- status=H5TBwrite_records( file_id, TABLE_NAME, start, nrecords, dst_size, dst_offset,
+ H5TBwrite_records( file_id, TABLE_NAME, start, nrecords, dst_size, dst_offset,
dst_sizes, particle_in);
/* read the table */
- status=H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
+ H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
/* print it by rows */
for (i=0; i<NRECORDS; i++) {
diff --git a/hl/examples/ex_table_04.c b/hl/examples/ex_table_04.c
index 0a01116..01f2869 100644
--- a/hl/examples/ex_table_04.c
+++ b/hl/examples/ex_table_04.c
@@ -81,7 +81,6 @@ int main( void )
hsize_t start; /* Record to start reading/writing */
hsize_t nrecords; /* Number of records to read/write */
int compress = 0;
- herr_t status;
int i;
Particle *p_data = NULL; /* Initially no data */
float pressure_in [NRECORDS_ADD] = /* Define new values for the field "Pressure" */
@@ -118,24 +117,24 @@ int main( void )
file_id = H5Fcreate( "ex_table_04.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
/* Make the table */
- status=H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
+ H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
dst_size,field_names, dst_offset, field_type,
chunk_size, fill_data, compress, p_data );
/* Write the pressure field starting at record 2 */
start = 2;
nrecords = NRECORDS_ADD;
- status=H5TBwrite_fields_name( file_id, TABLE_NAME, "Pressure", start, nrecords,
+ H5TBwrite_fields_name( file_id, TABLE_NAME, "Pressure", start, nrecords,
sizeof( float ), 0, field_sizes_pre, pressure_in );
/* Write the new longitude and latitude information starting at record 2 */
start = 2;
nrecords = NRECORDS_ADD;
- status=H5TBwrite_fields_name( file_id, TABLE_NAME, "Latitude,Longitude", start, nrecords,
+ H5TBwrite_fields_name( file_id, TABLE_NAME, "Latitude,Longitude", start, nrecords,
sizeof( Position ), field_offset_pos, field_sizes_pos, position_in );
/* read the table */
- status=H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
+ H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
/* print it by rows */
for (i=0; i<NRECORDS; i++) {
diff --git a/hl/examples/ex_table_05.c b/hl/examples/ex_table_05.c
index f0c96eb..7ed1fec 100644
--- a/hl/examples/ex_table_05.c
+++ b/hl/examples/ex_table_05.c
@@ -51,13 +51,6 @@ int main( void )
int longi;
} Position;
- /* Define a subset of Particle, with name and pressure fields */
- typedef struct NamePressure
- {
- char name[16];
- float pressure;
- } NamePressure;
-
/* Calculate the type_size and the offsets of our struct members */
Particle dst_buf[NRECORDS];
size_t dst_size = sizeof( Particle );
@@ -91,7 +84,6 @@ int main( void )
hsize_t nfields;
hsize_t start; /* Record to start reading/writing */
hsize_t nrecords; /* Number of records to read/write */
- herr_t status;
int i;
/* Define new values for the field "Pressure" */
@@ -129,7 +121,7 @@ int main( void )
file_id = H5Fcreate( "ex_table_05.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
/* Make the table */
- status=H5TBmake_table( "Table Title", file_id, TABLE_NAME,NFIELDS,NRECORDS,
+ H5TBmake_table( "Table Title", file_id, TABLE_NAME,NFIELDS,NRECORDS,
dst_size,field_names, dst_offset, field_type,
chunk_size, fill_data, compress, p_data );
@@ -137,7 +129,7 @@ int main( void )
nfields = 1;
start = 2;
nrecords = NRECORDS_ADD;
- status=H5TBwrite_fields_index( file_id, TABLE_NAME, nfields, field_index_pre, start, nrecords,
+ H5TBwrite_fields_index( file_id, TABLE_NAME, nfields, field_index_pre, start, nrecords,
sizeof( float ), 0, field_sizes_pre, pressure_in );
@@ -145,12 +137,12 @@ int main( void )
nfields = 2;
start = 2;
nrecords = NRECORDS_ADD;
- status=H5TBwrite_fields_index( file_id, TABLE_NAME, nfields, field_index_pos, start, nrecords,
+ H5TBwrite_fields_index( file_id, TABLE_NAME, nfields, field_index_pos, start, nrecords,
sizeof( Position ), field_offset_pos, field_sizes_pos, position_in );
/* read the table */
- status=H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
+ H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
/* print it by rows */
for (i=0; i<NRECORDS; i++) {
@@ -163,8 +155,7 @@ int main( void )
printf ("\n");
}
-
- /* close type */
+ /* close type */
H5Tclose( string_type );
/* close the file */
diff --git a/hl/examples/ex_table_06.c b/hl/examples/ex_table_06.c
index 261b23c..081347e 100644
--- a/hl/examples/ex_table_06.c
+++ b/hl/examples/ex_table_06.c
@@ -60,7 +60,6 @@ int main( void )
int compress = 0;
hsize_t nfields_out;
hsize_t nrecords_out;
- herr_t status;
/* Initialize field_type */
string_type = H5Tcopy( H5T_C_S1 );
@@ -75,12 +74,12 @@ int main( void )
file_id = H5Fcreate( "ex_table_06.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
/* Make a table */
- status=H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,dst_size,
+ H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,dst_size,
field_names, dst_offset, field_type,
chunk_size, fill_data, compress, NULL);
/* Get table info */
- status=H5TBget_table_info (file_id,TABLE_NAME, &nfields_out, &nrecords_out );
+ H5TBget_table_info (file_id,TABLE_NAME, &nfields_out, &nrecords_out );
/* print */
printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
diff --git a/hl/examples/ex_table_07.c b/hl/examples/ex_table_07.c
index 3479aa8..3be788f 100644
--- a/hl/examples/ex_table_07.c
+++ b/hl/examples/ex_table_07.c
@@ -73,7 +73,6 @@ int main( void )
hsize_t nrecords; /* Number of records to insert/delete */
hsize_t nfields_out;
hsize_t nrecords_out;
- herr_t status;
/* Initialize the field field_type */
string_type = H5Tcopy( H5T_C_S1 );
@@ -88,17 +87,17 @@ int main( void )
file_id = H5Fcreate( "ex_table_07.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
/* Make the table */
- status=H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
+ H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
dst_size,field_names, dst_offset, field_type,
chunk_size, fill_data, compress, p_data );
/* Delete records */
start = 3;
nrecords = 3;
- status=H5TBdelete_record( file_id, TABLE_NAME, start, nrecords );
+ H5TBdelete_record( file_id, TABLE_NAME, start, nrecords );
/* Get table info */
- status=H5TBget_table_info (file_id,TABLE_NAME, &nfields_out, &nrecords_out );
+ H5TBget_table_info (file_id,TABLE_NAME, &nfields_out, &nrecords_out );
/* print */
printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
diff --git a/hl/examples/ex_table_08.c b/hl/examples/ex_table_08.c
index bd3a3e1..5d3659f 100644
--- a/hl/examples/ex_table_08.c
+++ b/hl/examples/ex_table_08.c
@@ -84,7 +84,6 @@ int main( void )
int *fill_data = NULL;
hsize_t start; /* Record to start reading */
hsize_t nrecords; /* Number of records to insert/delete */
- herr_t status;
hsize_t nfields_out;
hsize_t nrecords_out;
int i;
@@ -102,21 +101,21 @@ int main( void )
file_id = H5Fcreate( "ex_table_08.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
/* Make the table */
- status=H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
+ H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
dst_size,field_names, dst_offset, field_type,
chunk_size, fill_data, compress, p_data );
/* Insert records */
start = 3;
nrecords = NRECORDS_INS;
- status=H5TBinsert_record( file_id, TABLE_NAME, start, nrecords, dst_size, dst_offset,
+ H5TBinsert_record( file_id, TABLE_NAME, start, nrecords, dst_size, dst_offset,
dst_sizes, p_data_insert );
/* read the table */
- status=H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
+ H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
/* get table info */
- status=H5TBget_table_info(file_id,TABLE_NAME, &nfields_out, &nrecords_out );
+ H5TBget_table_info(file_id,TABLE_NAME, &nfields_out, &nrecords_out );
/* print */
printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
diff --git a/hl/examples/ex_table_09.c b/hl/examples/ex_table_09.c
index c50e20d..a4ef611 100644
--- a/hl/examples/ex_table_09.c
+++ b/hl/examples/ex_table_09.c
@@ -81,7 +81,6 @@ int main( void )
hsize_t start1; /* Record to start reading from 1st table */
hsize_t nrecords; /* Number of records to insert */
hsize_t start2; /* Record to start writing in 2nd table */
- herr_t status;
int i;
hsize_t nfields_out;
hsize_t nrecords_out;
@@ -99,11 +98,11 @@ int main( void )
file_id = H5Fcreate( "ex_table_09.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
/* Make 2 tables: TABLE2_NAME is empty */
- status=H5TBmake_table( "Table Title",file_id,TABLE1_NAME,NFIELDS,NRECORDS,
+ H5TBmake_table( "Table Title",file_id,TABLE1_NAME,NFIELDS,NRECORDS,
dst_size,field_names, dst_offset, field_type,
chunk_size, fill_data, compress, p_data );
- status=H5TBmake_table( "Table Title",file_id,TABLE2_NAME,NFIELDS,NRECORDS,
+ H5TBmake_table( "Table Title",file_id,TABLE2_NAME,NFIELDS,NRECORDS,
dst_size,field_names, dst_offset, field_type,
chunk_size, fill_data, compress, NULL );
@@ -112,13 +111,13 @@ int main( void )
start1 = 3;
nrecords = NRECORDS_INS;
start2 = 6;
- status=H5TBadd_records_from( file_id, TABLE1_NAME, start1, nrecords, TABLE2_NAME, start2 );
+ H5TBadd_records_from( file_id, TABLE1_NAME, start1, nrecords, TABLE2_NAME, start2 );
/* read TABLE2_NAME: it should have 2 more records now */
- status=H5TBread_table( file_id, TABLE2_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
+ H5TBread_table( file_id, TABLE2_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
/* Get table info */
- status=H5TBget_table_info (file_id,TABLE2_NAME, &nfields_out, &nrecords_out );
+ H5TBget_table_info (file_id,TABLE2_NAME, &nfields_out, &nrecords_out );
/* print */
printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
diff --git a/hl/examples/ex_table_10.c b/hl/examples/ex_table_10.c
index 73a9431..059c7ea 100644
--- a/hl/examples/ex_table_10.c
+++ b/hl/examples/ex_table_10.c
@@ -77,7 +77,6 @@ int main( void )
hsize_t chunk_size = 10;
int compress = 0;
int *fill_data = NULL;
- herr_t status;
hsize_t nfields_out;
hsize_t nrecords_out;
int i;
@@ -95,22 +94,22 @@ int main( void )
file_id = H5Fcreate( "ex_table_10.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
/* Make two tables */
- status=H5TBmake_table( "Table Title",file_id,TABLE1_NAME,NFIELDS,NRECORDS,
+ H5TBmake_table( "Table Title",file_id,TABLE1_NAME,NFIELDS,NRECORDS,
dst_size,field_names, dst_offset, field_type,
chunk_size, fill_data, compress, p_data );
- status=H5TBmake_table( "Table Title",file_id,TABLE2_NAME,NFIELDS,NRECORDS,
+ H5TBmake_table( "Table Title",file_id,TABLE2_NAME,NFIELDS,NRECORDS,
dst_size,field_names, dst_offset, field_type,
chunk_size, fill_data, compress, p_data );
/* Combine the two tables into a third in the same file */
- status=H5TBcombine_tables( file_id, TABLE1_NAME, file_id, TABLE2_NAME, TABLE3_NAME );
+ H5TBcombine_tables( file_id, TABLE1_NAME, file_id, TABLE2_NAME, TABLE3_NAME );
/* read the combined table */
- status=H5TBread_table( file_id, TABLE3_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
+ H5TBread_table( file_id, TABLE3_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
/* Get table info */
- status=H5TBget_table_info (file_id,TABLE3_NAME, &nfields_out, &nrecords_out );
+ H5TBget_table_info (file_id,TABLE3_NAME, &nfields_out, &nrecords_out );
/* print */
printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
diff --git a/hl/examples/ex_table_11.c b/hl/examples/ex_table_11.c
index 6746945..687568c 100644
--- a/hl/examples/ex_table_11.c
+++ b/hl/examples/ex_table_11.c
@@ -67,10 +67,9 @@ int main( void )
hid_t file_id;
hsize_t chunk_size = 10;
int compress = 0;
- Particle1 fill_data[1] = { "no data",-1,-1, -99.0f, -99.0 };
+ Particle1 fill_data[1] = { {"no data",-1,-1, -99.0f, -99.0} };
int fill_data_new[1] = { -100 };
hsize_t position;
- herr_t status;
hsize_t nfields_out;
hsize_t nrecords_out;
@@ -91,17 +90,17 @@ int main( void )
file_id = H5Fcreate( "ex_table_11.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
/* Make the table */
- status=H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
+ H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
dst_size1,field_names, dst_offset1, field_type,
chunk_size, fill_data, compress, p_data );
/* Insert the new field at the end of the field list */
position = NFIELDS;
- status=H5TBinsert_field( file_id, TABLE_NAME, "New Field", field_type_new, position,
+ H5TBinsert_field( file_id, TABLE_NAME, "New Field", field_type_new, position,
fill_data_new, data );
/* Get table info */
- status=H5TBget_table_info (file_id,TABLE_NAME, &nfields_out, &nrecords_out );
+ H5TBget_table_info (file_id,TABLE_NAME, &nfields_out, &nrecords_out );
/* print */
printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
diff --git a/hl/examples/ex_table_12.c b/hl/examples/ex_table_12.c
index b6cc2b4..125b8be 100644
--- a/hl/examples/ex_table_12.c
+++ b/hl/examples/ex_table_12.c
@@ -70,7 +70,6 @@ int main( void )
int compress = 0;
Particle fill_data[1] =
{ {"no data",-1,-1, -99.0f, -99.0} };
- herr_t status;
hsize_t nfields_out;
hsize_t nrecords_out;
@@ -87,15 +86,15 @@ int main( void )
file_id = H5Fcreate( "ex_table_12.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
/* Make a table */
- status=H5TBmake_table( "Table Title", file_id, TABLE_NAME, NFIELDS, NRECORDS, dst_size,
+ H5TBmake_table( "Table Title", file_id, TABLE_NAME, NFIELDS, NRECORDS, dst_size,
field_names, dst_offset, field_type,
chunk_size, fill_data, compress, p_data );
/* Delete the field */
- status=H5TBdelete_field( file_id, TABLE_NAME, "Pressure" );
+ H5TBdelete_field( file_id, TABLE_NAME, "Pressure" );
/* Get table info */
- status=H5TBget_table_info (file_id,TABLE_NAME, &nfields_out, &nrecords_out );
+ H5TBget_table_info (file_id,TABLE_NAME, &nfields_out, &nrecords_out );
/* print */
printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
diff --git a/hl/examples/run-hlc-ex.sh.in b/hl/examples/run-hlc-ex.sh.in
index a79f67a..d897a02 100644
--- a/hl/examples/run-hlc-ex.sh.in
+++ b/hl/examples/run-hlc-ex.sh.in
@@ -33,7 +33,7 @@ EXIT_FAILURE=1
# Where the tool is installed.
# default is relative path to installed location of the tools
-prefix="${prefix:-../../../../}"
+prefix="${prefix:-@prefix@}"
PARALLEL=@PARALLEL@ # Am I in parallel mode?
AR="@AR@"
RANLIB="@RANLIB@"
diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in
index 7c6f2e2..4651579 100644
--- a/hl/fortran/Makefile.in
+++ b/hl/fortran/Makefile.in
@@ -409,7 +409,6 @@ AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@
AM_MAKEFLAGS = @AM_MAKEFLAGS@
AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -441,7 +440,6 @@ DIRECT_VFD = @DIRECT_VFD@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
-DYNAMIC_DIRS = @DYNAMIC_DIRS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -460,17 +458,14 @@ FCFLAGS_f90 = @FCFLAGS_f90@
FCLIBS = @FCLIBS@
FC_VERSION = @FC_VERSION@
FGREP = @FGREP@
-FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@
GREP = @GREP@
H5_CFLAGS = @H5_CFLAGS@
H5_CPPFLAGS = @H5_CPPFLAGS@
H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
H5_FCFLAGS = @H5_FCFLAGS@
H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
H5_VERSION = @H5_VERSION@
HADDR_T = @HADDR_T@
HAVE_DMALLOC = @HAVE_DMALLOC@
@@ -533,7 +528,6 @@ R_INTEGER = @R_INTEGER@
R_LARGE = @R_LARGE@
SEARCH = @SEARCH@
SED = @SED@
-SETX = @SETX@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIZE_T = @SIZE_T@
@@ -548,10 +542,6 @@ TR = @TR@
TRACE_API = @TRACE_API@
UNAME_INFO = @UNAME_INFO@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
-USE_FILTER_NBIT = @USE_FILTER_NBIT@
-USE_FILTER_SCALEOFFSET = @USE_FILTER_SCALEOFFSET@
-USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@
USE_FILTER_SZIP = @USE_FILTER_SZIP@
USINGMEMCHECKER = @USINGMEMCHECKER@
VERSION = @VERSION@
diff --git a/hl/fortran/examples/CMakeLists.txt b/hl/fortran/examples/CMakeLists.txt
index bf6a0ca..bded2d9 100644
--- a/hl/fortran/examples/CMakeLists.txt
+++ b/hl/fortran/examples/CMakeLists.txt
@@ -5,7 +5,6 @@ PROJECT (HDF5_HL_F90_EXAMPLES C CXX Fortran)
# Setup include Directories
#-----------------------------------------------------------------------------
INCLUDE_DIRECTORIES (
- ${CMAKE_Fortran_MODULE_DIRECTORY}
${HDF5_F90_BINARY_DIR}
${HDF5_F90_SRC_DIR}/src
)
@@ -18,12 +17,13 @@ set (examples
foreach (example ${examples})
add_executable (hl_f90_ex_${example} ${HDF5_HL_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
TARGET_NAMING (hl_f90_ex_${example} ${LIB_TYPE})
- TARGET_FORTRAN_PROPERTIES (hl_f90_ex_${example} " " " ")
+ TARGET_FORTRAN_PROPERTIES (hl_f90_ex_${example} ${LIB_TYPE} " " " ")
target_link_libraries (hl_f90_ex_${example}
${HDF5_HL_F90_LIB_TARGET}
${HDF5_F90_LIB_TARGET}
${HDF5_LIB_TARGET}
)
+ target_include_directories (hl_f90_ex_${example} PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY})
set_target_properties (hl_f90_ex_${example} PROPERTIES LINKER_LANGUAGE Fortran)
set_target_properties (hl_f90_ex_${example} PROPERTIES FOLDER examples/hl/fortran)
diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in
index af5a18a..c8878d5 100644
--- a/hl/fortran/examples/Makefile.in
+++ b/hl/fortran/examples/Makefile.in
@@ -352,7 +352,6 @@ AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@
AM_MAKEFLAGS = @AM_MAKEFLAGS@
AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -384,7 +383,6 @@ DIRECT_VFD = @DIRECT_VFD@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
-DYNAMIC_DIRS = @DYNAMIC_DIRS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -403,17 +401,14 @@ FCFLAGS_f90 = @FCFLAGS_f90@
FCLIBS = @FCLIBS@
FC_VERSION = @FC_VERSION@
FGREP = @FGREP@
-FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@
GREP = @GREP@
H5_CFLAGS = @H5_CFLAGS@
H5_CPPFLAGS = @H5_CPPFLAGS@
H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
H5_FCFLAGS = @H5_FCFLAGS@
H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
H5_VERSION = @H5_VERSION@
HADDR_T = @HADDR_T@
HAVE_DMALLOC = @HAVE_DMALLOC@
@@ -476,7 +471,6 @@ R_INTEGER = @R_INTEGER@
R_LARGE = @R_LARGE@
SEARCH = @SEARCH@
SED = @SED@
-SETX = @SETX@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIZE_T = @SIZE_T@
@@ -491,10 +485,6 @@ TR = @TR@
TRACE_API = @TRACE_API@
UNAME_INFO = @UNAME_INFO@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
-USE_FILTER_NBIT = @USE_FILTER_NBIT@
-USE_FILTER_SCALEOFFSET = @USE_FILTER_SCALEOFFSET@
-USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@
USE_FILTER_SZIP = @USE_FILTER_SZIP@
USINGMEMCHECKER = @USINGMEMCHECKER@
VERSION = @VERSION@
diff --git a/hl/fortran/examples/run-hlfortran-ex.sh.in b/hl/fortran/examples/run-hlfortran-ex.sh.in
index 2780bff..12f9fec 100644
--- a/hl/fortran/examples/run-hlfortran-ex.sh.in
+++ b/hl/fortran/examples/run-hlfortran-ex.sh.in
@@ -34,7 +34,7 @@ EXIT_FAILURE=1
# Where the tool is installed.
# default is relative path to installed location of the tools
-prefix="${prefix:-../../../../}"
+prefix="${prefix:-@prefix@}"
PARALLEL=@PARALLEL@ # Am I in parallel mode?
AR="@AR@"
RANLIB="@RANLIB@"
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index f188a53..6e6e44a 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -8,7 +8,6 @@ INCLUDE_DIRECTORIES (
${HDF5_HL_SRC_DIR}/src
${HDF5_F90_SRC_DIR}/src
${HDF5_F90_BINARY_DIR}
- ${CMAKE_Fortran_MODULE_DIRECTORY}
)
#-----------------------------------------------------------------------------
@@ -26,7 +25,7 @@ set_source_files_properties (${HDF5_HL_F90_C_SRCS} PROPERTIES LANGUAGE C)
set (HDF5_HL_F90_HEADERS ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5LTf90proto.h)
add_library (${HDF5_HL_F90_C_LIB_TARGET} ${LIB_TYPE} ${HDF5_HL_F90_C_SRCS} ${HDF5_HL_F90_HEADERS})
-TARGET_C_PROPERTIES (${HDF5_HL_F90_C_LIB_TARGET} " " " ")
+TARGET_C_PROPERTIES (${HDF5_HL_F90_C_LIB_TARGET} ${LIB_TYPE} " " " ")
target_link_libraries (${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_F90_C_LIB_TARGET} ${HDF5_HL_LIB_TARGET})
set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_F90_C_LIB_TARGET}")
H5_SET_LIB_OPTIONS (${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_HL_F90_C_LIB_NAME} ${LIB_TYPE})
@@ -66,8 +65,7 @@ if (WIN32)
HDF5F90_WINDOWS
)
endif (WIN32)
-TARGET_FORTRAN_PROPERTIES (${HDF5_HL_F90_LIB_TARGET} " " ${SHARED_LINK_FLAGS})
-set_target_properties (${HDF5_HL_F90_LIB_TARGET} PROPERTIES LINKER_LANGUAGE Fortran)
+TARGET_FORTRAN_PROPERTIES (${HDF5_HL_F90_LIB_TARGET} ${LIB_TYPE} " " ${SHARED_LINK_FLAGS})
target_link_libraries (${HDF5_HL_F90_LIB_TARGET} ${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_F90_LIB_TARGET})
set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_F90_LIB_TARGET}")
H5_SET_LIB_OPTIONS (${HDF5_HL_F90_LIB_TARGET} ${HDF5_HL_F90_LIB_NAME} ${LIB_TYPE})
@@ -75,37 +73,35 @@ set_target_properties (${HDF5_HL_F90_LIB_TARGET} PROPERTIES
FOLDER libraries/hl/fortran
LINKER_LANGUAGE Fortran
INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+ Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
)
#-----------------------------------------------------------------------------
# Add file(s) to CMake Install
#-----------------------------------------------------------------------------
+
if (WIN32)
- install (
- FILES
- ${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/h5ds.mod
- ${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/h5tb.mod
- ${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/h5lt.mod
- ${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/h5im.mod
- DESTINATION
- ${HDF5_INSTALL_INCLUDE_DIR}
- COMPONENT
- fortheaders
- )
+ set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE})
else (WIN32)
- install (
- FILES
- ${CMAKE_Fortran_MODULE_DIRECTORY}/h5ds.mod
- ${CMAKE_Fortran_MODULE_DIRECTORY}/h5tb.mod
- ${CMAKE_Fortran_MODULE_DIRECTORY}/h5lt.mod
- ${CMAKE_Fortran_MODULE_DIRECTORY}/h5im.mod
- DESTINATION
- ${HDF5_INSTALL_INCLUDE_DIR}
- COMPONENT
- fortheaders
- )
+ set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY})
endif (WIN32)
+set (mod_files
+ ${MOD_BUILD_DIR}/h5ds.mod
+ ${MOD_BUILD_DIR}/h5tb.mod
+ ${MOD_BUILD_DIR}/h5lt.mod
+ ${MOD_BUILD_DIR}/h5im.mod
+)
+
+install (
+ FILES
+ ${mod_files}
+ DESTINATION
+ ${HDF5_INSTALL_INCLUDE_DIR}
+ COMPONENT
+ fortheaders
+)
+
#-----------------------------------------------------------------------------
# Add Target(s) to CMake Install for import into other projects
#-----------------------------------------------------------------------------
diff --git a/hl/fortran/src/H5DSfc.c b/hl/fortran/src/H5DSfc.c
index 2e38939..1de3fff 100644
--- a/hl/fortran/src/H5DSfc.c
+++ b/hl/fortran/src/H5DSfc.c
@@ -35,7 +35,7 @@
*-------------------------------------------------------------------------
*/
int_f
-nh5dsset_scale_c(hid_t_f *dsid, _fcd dimname, int_f *dimnamelen)
+nh5dsset_scale_c(hid_t_f *dsid, _fcd dimname, size_t_f *dimnamelen)
{
char *c_dimname = NULL;
int_f ret_value = 0;
@@ -217,7 +217,7 @@ nh5dsis_scale_c( hid_t_f *did, int_f *is_scale)
*-------------------------------------------------------------------------
*/
int_f
-nh5dsset_label_c(hid_t_f *did, int_f *idx, _fcd label, int_f *labellen)
+nh5dsset_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *labellen)
{
char *c_label = NULL;
int_f ret_value = 0;
@@ -269,14 +269,14 @@ nh5dsget_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *size)
/*
* Allocate buffer to hold label
*/
- if ((c_label = HDmalloc((size_t)*size + 1)) == NULL)
+ if ((c_label = (char *)HDmalloc((size_t)*size + 1)) == NULL)
HGOTO_DONE(FAIL);
/*
* call H5DSget_label function.
*/
- if( (size_c = (size_t_f)H5DSget_label( (hid_t)*did, (unsigned)*idx, c_label, (size_t)*size+1)) < 0)
+ if( (size_c = H5DSget_label( (hid_t)*did, (unsigned)*idx, c_label, (size_t)*size+1)) < 0)
HGOTO_DONE(FAIL)
/*
@@ -287,7 +287,7 @@ nh5dsget_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *size)
done:
*size = (size_t_f)size_c; /* Don't subtract '1' because H5DSget_label doesn't include the
- * trailing NULL in the length calculation, Ref. HDFFV-7596 */
+ * trailing NULL in the length calculation, Ref. HDFFV-7596 */
if(c_label) HDfree(c_label);
return ret_value;
@@ -318,14 +318,14 @@ nh5dsget_scale_name_c(hid_t_f *did, _fcd name, size_t_f *size)
/*
* Allocate buffer to hold name
*/
- if ((c_scale_name = HDmalloc((size_t)*size + 1)) == NULL)
+ if ((c_scale_name = (char *)HDmalloc((size_t)*size + 1)) == NULL)
HGOTO_DONE(FAIL);
/*
* call H5DSget_scale_name function.
*/
- if( (size_c = (size_t_f)H5DSget_scale_name( (hid_t)*did, c_scale_name, (size_t)*size+1)) < 0)
+ if( (size_c = H5DSget_scale_name( (hid_t)*did, c_scale_name, (size_t)*size+1)) < 0)
HGOTO_DONE(FAIL)
/*
diff --git a/hl/fortran/src/H5DSff.f90 b/hl/fortran/src/H5DSff.f90
index 8cb568e..04540a6 100644
--- a/hl/fortran/src/H5DSff.f90
+++ b/hl/fortran/src/H5DSff.f90
@@ -57,7 +57,7 @@ CONTAINS
CHARACTER(LEN=*), INTENT(in), OPTIONAL :: dimname ! The dimension name
INTEGER :: errcode ! Error code
- INTEGER:: dimname_len ! length of dimname (if present)
+ INTEGER(SIZE_T) :: dimname_len ! length of dimname (if present)
INTERFACE
INTEGER FUNCTION H5DSset_scale_c(dsid, dimname, dimname_len )
@@ -70,7 +70,7 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dimname
INTEGER(hid_t), INTENT(in) :: dsid ! The dataset to be made a Dimension Scale
CHARACTER(LEN=*), INTENT(in) :: dimname ! The dimension name
- INTEGER, INTENT(in) :: dimname_len
+ INTEGER(SIZE_T), INTENT(in) :: dimname_len
END FUNCTION H5DSset_scale_c
END INTERFACE
@@ -78,7 +78,7 @@ CONTAINS
dimname_len = LEN(dimname)
errcode = H5DSset_scale_c(dsid, dimname, dimname_len )
ELSE
- errcode = H5DSset_scale_c(dsid, " ", 0 )
+ errcode = H5DSset_scale_c(dsid, " ", INT(0,SIZE_T) )
ENDIF
END SUBROUTINE H5DSset_scale_f
@@ -348,7 +348,7 @@ CONTAINS
CHARACTER(LEN=*), INTENT(in) :: label ! The label
INTEGER :: errcode ! Error code
- INTEGER :: label_len ! Length of label
+ INTEGER(SIZE_T) :: label_len ! Length of label
INTEGER :: c_idx
INTERFACE
@@ -363,7 +363,7 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: did ! The dataset
INTEGER , INTENT(in) :: idx ! The dimension
CHARACTER(LEN=*), INTENT(in) :: label ! The label
- INTEGER, INTENT(in) :: label_len ! Length of label
+ INTEGER(SIZE_T), INTENT(in) :: label_len ! Length of label
END FUNCTION H5DSset_label_c
END INTERFACE
diff --git a/hl/fortran/src/H5IMcc.c b/hl/fortran/src/H5IMcc.c
index b4ea067..ae58fab 100644
--- a/hl/fortran/src/H5IMcc.c
+++ b/hl/fortran/src/H5IMcc.c
@@ -470,7 +470,7 @@ herr_t H5IM_get_palette(hid_t loc_id,
hid_t attr_space_id;
hid_t attr_class;
hssize_t n_refs;
- hsize_t dim_ref;
+ size_t dim_ref;
hobj_ref_t *refbuf; /* buffer to read references */
hid_t pal_id;
@@ -503,9 +503,9 @@ herr_t H5IM_get_palette(hid_t loc_id,
n_refs = H5Sget_simple_extent_npoints(attr_space_id);
- dim_ref = n_refs;
+ dim_ref = (size_t)n_refs;
- refbuf = HDmalloc(sizeof(hobj_ref_t) * (int)dim_ref);
+ refbuf = (hobj_ref_t *)HDmalloc(sizeof(hobj_ref_t) * dim_ref);
if(H5Aread(attr_id, attr_type, refbuf) < 0)
goto out;
diff --git a/hl/fortran/src/H5IMfc.c b/hl/fortran/src/H5IMfc.c
index 39cb990..6acd410 100644
--- a/hl/fortran/src/H5IMfc.c
+++ b/hl/fortran/src/H5IMfc.c
@@ -40,7 +40,7 @@
int_f
nh5immake_image_8bit_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hsize_t_f *width,
hsize_t_f *height,
@@ -50,15 +50,13 @@ nh5immake_image_8bit_c (hid_t_f *loc_id,
herr_t ret;
hid_t c_loc_id;
char *c_name = NULL;
- int c_namelen;
hsize_t w = (hsize_t)*width;
hsize_t h = (hsize_t)*height;
/*
* convert FORTRAN name to C name
*/
- c_namelen = (int)*namelen;
- c_name = (char *)HD5f2cstring(name, c_namelen);
+ c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
if (c_name == NULL)
goto done;
@@ -103,30 +101,25 @@ done:
int_f
nh5imread_image_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *buf)
{
int ret_value = -1;
herr_t ret;
- hid_t c_loc_id;
char *c_name = NULL;
- int c_namelen;
/*
* convert FORTRAN name to C name
*/
- c_namelen = (int)*namelen;
- c_name = (char *)HD5f2cstring(name, c_namelen);
+ c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
if (c_name == NULL)
goto done;
/*
* call H5IMread_image function.
*/
- c_loc_id = (hid_t)*loc_id;
-
- ret = H5IMread_imagef(c_loc_id,c_name,buf);
+ ret = H5IMread_imagef((hid_t)*loc_id,c_name,buf);
if (ret < 0)
goto done;
@@ -161,9 +154,9 @@ done:
int_f
nh5immake_image_24bit_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *ilen,
+ size_t_f *ilen,
_fcd il,
hsize_t_f *width,
hsize_t_f *height,
@@ -173,22 +166,18 @@ nh5immake_image_24bit_c (hid_t_f *loc_id,
herr_t ret;
hid_t c_loc_id;
char *c_name = NULL;
- int c_namelen;
char *c_il = NULL;
- int c_ilen;
hsize_t w = (hsize_t)*width;
hsize_t h = (hsize_t)*height;
/*
* convert FORTRAN name to C name
*/
- c_namelen = *namelen;
- c_name = (char *)HD5f2cstring(name, c_namelen);
+ c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
if (c_name == NULL)
goto done;
- c_ilen = *ilen;
- c_il = (char *)HD5f2cstring(il, c_ilen);
+ c_il = (char *)HD5f2cstring(il, (size_t)*ilen);
if (c_il == NULL)
goto done;
@@ -197,7 +186,7 @@ nh5immake_image_24bit_c (hid_t_f *loc_id,
*/
c_loc_id = (hid_t)*loc_id;
- ret = H5IMmake_image_24bitf(c_loc_id,c_name,w,h,c_il,buf);
+ ret = H5IMmake_image_24bitf(c_loc_id,c_name,w,h,c_il,(int_f *)buf);
if (ret < 0)
goto done;
@@ -234,20 +223,19 @@ done:
int_f
nh5imget_image_info_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hsize_t_f *width,
hsize_t_f *height,
hsize_t_f *planes,
hsize_t_f *npals,
- int_f *ilen,
+ size_t_f *ilen,
_fcd interlace)
{
int ret_value = -1;
herr_t ret;
hid_t c_loc_id;
char *c_name = NULL;
- int c_namelen;
hsize_t c_width;
hsize_t c_height;
hsize_t c_planes;
@@ -257,15 +245,14 @@ nh5imget_image_info_c(hid_t_f *loc_id,
/*
* convert FORTRAN name to C name
*/
- c_namelen = *namelen;
- c_name = (char *)HD5f2cstring(name, c_namelen);
+ c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
if (c_name == NULL)
goto done;
/*
* allocate buffer to hold name of an attribute
*/
- if ((c_buf = HDmalloc((size_t)*ilen +1)) == NULL)
+ if ((c_buf = (char *)HDmalloc((size_t)*ilen +1)) == NULL)
goto done;
/*
@@ -321,19 +308,17 @@ done:
int_f
nh5imis_image_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name)
{
hid_t c_loc_id;
char *c_name = NULL;
- int c_namelen;
herr_t ret;
/*
* convert FORTRAN name to C name
*/
- c_namelen = *namelen;
- c_name = (char *)HD5f2cstring(name, c_namelen);
+ c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
if (c_name == NULL) return -1;
/*
@@ -372,7 +357,7 @@ nh5imis_image_c(hid_t_f *loc_id,
int_f
nh5immake_palette_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hsize_t_f *dims,
void *buf)
@@ -386,16 +371,16 @@ nh5immake_palette_c (hid_t_f *loc_id,
/*
* convert FORTRAN name to C name
*/
- if(NULL == (c_name = (char *)HD5f2cstring(name, (int)*namelen)))
+ if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
HGOTO_DONE(FAIL)
for(i = 0; i < rank ; i++)
- c_dims[i] = dims[i];
+ c_dims[i] = (hsize_t)dims[i];
/*
* call H5IMmake_palette function.
*/
- if(H5IMmake_palettef((hid_t)*loc_id, c_name, c_dims, buf) < 0)
+ if(H5IMmake_palettef((hid_t)*loc_id, c_name, c_dims, (int_f *)buf) < 0)
HGOTO_DONE(FAIL)
done:
@@ -427,9 +412,9 @@ done:
int_f
nh5imlink_palette_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *ilen,
+ size_t_f *ilen,
_fcd pal_name)
{
int ret_value = -1;
@@ -437,19 +422,15 @@ nh5imlink_palette_c (hid_t_f *loc_id,
hid_t c_loc_id;
char *c_name = NULL;
char *c_namepal = NULL;
- int c_namelen;
- int c_namelenpal;
/*
* convert FORTRAN name to C name
*/
- c_namelen = *namelen;
- c_name = (char *)HD5f2cstring(name, c_namelen);
+ c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
if (c_name == NULL)
goto done;
- c_namelenpal = *ilen;
- c_namepal = (char *)HD5f2cstring(pal_name, c_namelenpal);
+ c_namepal = (char *)HD5f2cstring(pal_name, (size_t)*ilen);
if (c_namepal == NULL)
goto done;
@@ -496,9 +477,9 @@ done:
int_f
nh5imunlink_palette_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *ilen,
+ size_t_f *ilen,
_fcd pal_name)
{
int ret_value = -1;
@@ -506,20 +487,15 @@ nh5imunlink_palette_c (hid_t_f *loc_id,
hid_t c_loc_id;
char *c_name = NULL;
char *c_namepal = NULL;
- int c_namelen;
- int c_namelenpal;
-
/*
* convert FORTRAN name to C name
*/
- c_namelen = *namelen;
- c_name = (char *)HD5f2cstring(name, c_namelen);
+ c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
if (c_name == NULL)
goto done;
- c_namelenpal = *ilen;
- c_namepal = (char *)HD5f2cstring(pal_name, c_namelenpal);
+ c_namepal = (char *)HD5f2cstring(pal_name, (size_t)*ilen);
if (c_namepal == NULL)
goto done;
@@ -567,7 +543,7 @@ done:
int_f
nh5imget_npalettes_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hsize_t_f *npals)
{
@@ -575,14 +551,12 @@ nh5imget_npalettes_c(hid_t_f *loc_id,
herr_t ret;
hid_t c_loc_id;
char *c_name = NULL;
- int c_namelen;
hssize_t c_npals;
/*
* convert FORTRAN name to C name
*/
- c_namelen = *namelen;
- c_name = (char *)HD5f2cstring(name, c_namelen);
+ c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
if (c_name == NULL)
goto done;
@@ -631,7 +605,7 @@ done:
int_f
nh5imget_palette_info_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *pal_number,
hsize_t_f *dims)
@@ -640,15 +614,13 @@ nh5imget_palette_info_c(hid_t_f *loc_id,
herr_t ret;
hid_t c_loc_id;
char *c_name = NULL;
- int c_namelen;
hsize_t c_dims[2];
int i;
/*
* convert FORTRAN name to C name
*/
- c_namelen = *namelen;
- c_name = (char *)HD5f2cstring(name, c_namelen);
+ c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
if (c_name == NULL)
goto done;
@@ -700,7 +672,7 @@ done:
int_f
nh5imget_palette_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *pal_number,
void *buf)
@@ -709,13 +681,11 @@ nh5imget_palette_c(hid_t_f *loc_id,
herr_t ret;
hid_t c_loc_id;
char *c_name = NULL;
- int c_namelen;
/*
* convert FORTRAN name to C name
*/
- c_namelen = *namelen;
- c_name = (char *)HD5f2cstring(name, c_namelen);
+ c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
if (c_name == NULL)
goto done;
@@ -724,7 +694,7 @@ nh5imget_palette_c(hid_t_f *loc_id,
*/
c_loc_id = (hid_t)*loc_id;
- ret = H5IMget_palettef(c_loc_id,c_name,*pal_number,buf);
+ ret = H5IMget_palettef(c_loc_id,c_name,*pal_number,(int_f *)buf);
if (ret < 0)
goto done;
@@ -760,19 +730,17 @@ done:
int_f
nh5imis_palette_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name)
{
hid_t c_loc_id;
char *c_name;
- int c_namelen;
herr_t ret;
/*
* convert FORTRAN name to C name
*/
- c_namelen = *namelen;
- c_name = (char *)HD5f2cstring(name, c_namelen);
+ c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
if (c_name == NULL) return -1;
/*
diff --git a/hl/fortran/src/H5IMff.f90 b/hl/fortran/src/H5IMff.f90
index 37030ac..50c6d8b 100644
--- a/hl/fortran/src/H5IMff.f90
+++ b/hl/fortran/src/H5IMff.f90
@@ -62,7 +62,7 @@ subroutine h5immake_image_8bit_f(loc_id,&
integer(hsize_t), intent(in) :: height ! height of image
integer, intent(in), dimension(*) :: buf ! buffer
integer :: errcode ! error code
- integer :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
interface
integer function h5immake_image_8bit_c(loc_id,namelen,dset_name,width,height,buf)
@@ -73,11 +73,11 @@ subroutine h5immake_image_8bit_f(loc_id,&
!DEC$ENDIF
!DEC$ATTRIBUTES reference :: dset_name
integer(hid_t), intent(in) :: loc_id ! file or group identifier
- integer :: namelen ! lenght of name buffer
+ integer(size_t) :: namelen ! length of name buffer
character(len=*), intent(in) :: dset_name ! name of the dataset
integer(hsize_t), intent(in) :: width ! width of image
integer(hsize_t), intent(in) :: height ! height of image
- integer , intent(in), dimension(*) :: buf ! buffer
+ integer , intent(in), dimension(*) :: buf ! buffer
end function h5immake_image_8bit_c
end interface
@@ -123,7 +123,7 @@ subroutine h5imread_image_f(loc_id,&
character(len=*), intent(in) :: dset_name ! name of the dataset
integer, intent(inout), dimension(*) :: buf ! buffer
integer :: errcode ! error code
- integer :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
interface
integer function h5imread_image_c(loc_id,namelen,dset_name,buf)
@@ -134,7 +134,7 @@ subroutine h5imread_image_f(loc_id,&
!DEC$ENDIF
!DEC$ATTRIBUTES reference :: dset_name
integer(hid_t), intent(in) :: loc_id ! file or group identifier
- integer :: namelen ! lenght of name buffer
+ integer(size_t) :: namelen ! length of name buffer
character(len=*), intent(in) :: dset_name ! name of the dataset
integer, intent(inout), dimension(*) :: buf ! buffer
end function h5imread_image_c
@@ -187,8 +187,8 @@ subroutine h5immake_image_24bit_f(loc_id,&
character(len=*), intent(in) :: il ! interlace
integer, intent(in), dimension(*) :: buf ! buffer
integer :: errcode ! error code
- integer :: namelen ! name length
- integer :: ilen ! name length
+ INTEGER(size_t) :: namelen ! name length
+ integer(size_t) :: ilen ! name length
interface
integer function h5immake_image_24bit_c(loc_id,namelen,dset_name,ilen,il,width,height,buf)
@@ -205,8 +205,8 @@ subroutine h5immake_image_24bit_f(loc_id,&
integer(hsize_t), intent(in) :: height ! height of image
character(len=*), intent(in) :: il ! interlace
integer, intent(in), dimension(*) :: buf ! buffer
- integer :: namelen ! lenght of name buffer
- integer :: ilen ! name length
+ integer(size_t) :: namelen ! length of name buffer
+ integer(size_t) :: ilen ! name length
end function h5immake_image_24bit_c
end interface
@@ -262,8 +262,8 @@ subroutine h5imget_image_info_f(loc_id,&
integer(hsize_t), intent(inout) :: npals ! palettes
character(len=*), intent(inout) :: interlace ! interlace
integer :: errcode ! error code
- integer :: namelen ! name length
- integer :: ilen ! name length
+ integer(size_t) :: namelen ! name length
+ integer(size_t) :: ilen ! name length
interface
integer function h5imget_image_info_c(loc_id,namelen,dset_name,width,height,planes,npals,ilen,interlace)
@@ -281,8 +281,8 @@ subroutine h5imget_image_info_f(loc_id,&
integer(hsize_t), intent(inout) :: planes ! color planes
integer(hsize_t), intent(inout) :: npals ! palettes
character(len=*), intent(inout) :: interlace ! interlace
- integer :: namelen ! name length
- integer :: ilen ! name length
+ integer(size_t) :: namelen ! name length
+ integer(size_t) :: ilen ! name length
end function h5imget_image_info_c
end interface
@@ -325,7 +325,7 @@ integer function h5imis_image_f(loc_id,&
integer(hid_t), intent(in) :: loc_id ! file or group identifier
character(len=*), intent(in) :: dset_name ! name of the dataset
integer :: errcode ! error code
- integer :: namelen ! name length
+ integer(size_t) :: namelen ! name length
interface
integer function h5imis_image_c(loc_id,namelen,dset_name)
@@ -336,7 +336,7 @@ integer function h5imis_image_f(loc_id,&
!DEC$ENDIF
!DEC$ATTRIBUTES reference :: dset_name
integer(hid_t), intent(in) :: loc_id ! file or group identifier
- integer :: namelen ! lenght of name buffer
+ integer(size_t) :: namelen ! length of name buffer
character(len=*), intent(in) :: dset_name ! name of the dataset
end function h5imis_image_c
end interface
@@ -385,7 +385,7 @@ subroutine h5immake_palette_f(loc_id,&
integer(hsize_t), intent(in), dimension(*) :: pal_dims ! dimensions
integer, intent(in), dimension(*) :: buf ! buffer
integer :: errcode ! error code
- integer :: namelen ! name length
+ integer(size_t) :: namelen ! name length
interface
integer function h5immake_palette_c(loc_id,namelen,dset_name,pal_dims,buf)
@@ -396,7 +396,7 @@ subroutine h5immake_palette_f(loc_id,&
!DEC$ENDIF
!DEC$ATTRIBUTES reference :: dset_name
integer(hid_t), intent(in) :: loc_id ! file or group identifier
- integer :: namelen ! lenght of name buffer
+ integer(size_t) :: namelen ! length of name buffer
character(len=*), intent(in) :: dset_name ! name of the dataset
integer(hsize_t), intent(in), dimension(*) :: pal_dims ! dimensions
integer, intent(in), dimension(*) :: buf ! buffer
@@ -444,8 +444,8 @@ subroutine h5imlink_palette_f(loc_id,&
character(len=*), intent(in) :: dset_name ! name of the dataset
character(len=*), intent(in) :: pal_name ! palette name
integer :: errcode ! error code
- integer :: namelen ! name length
- integer :: ilen ! name length
+ integer(size_t) :: namelen ! name length
+ integer(size_t) :: ilen ! name length
interface
integer function h5imlink_palette_c(loc_id,namelen,dset_name,ilen,pal_name)
@@ -459,8 +459,8 @@ subroutine h5imlink_palette_f(loc_id,&
integer(hid_t), intent(in) :: loc_id ! file or group identifier
character(len=*), intent(in) :: dset_name ! name of the dataset
character(len=*), intent(in) :: pal_name ! palette name
- integer :: namelen ! name length
- integer :: ilen ! name length
+ integer(size_t) :: namelen ! name length
+ integer(size_t) :: ilen ! name length
end function h5imlink_palette_c
end interface
@@ -507,8 +507,8 @@ subroutine h5imunlink_palette_f(loc_id,&
character(len=*), intent(in) :: dset_name ! name of the dataset
character(len=*), intent(in) :: pal_name ! palette name
integer :: errcode ! error code
- integer :: namelen ! name length
- integer :: ilen ! name length
+ integer(size_t) :: namelen ! name length
+ integer(size_t) :: ilen ! name length
interface
integer function h5imunlink_palette_c(loc_id,namelen,dset_name,ilen,pal_name)
@@ -522,8 +522,8 @@ subroutine h5imunlink_palette_f(loc_id,&
integer(hid_t), intent(in) :: loc_id ! file or group identifier
character(len=*), intent(in) :: dset_name ! name of the dataset
character(len=*), intent(in) :: pal_name ! palette name
- integer :: namelen ! name length
- integer :: ilen ! name length
+ integer(size_t) :: namelen ! name length
+ integer(size_t) :: ilen ! name length
end function h5imunlink_palette_c
end interface
@@ -570,7 +570,7 @@ subroutine h5imget_npalettes_f(loc_id,&
character(len=*), intent(in) :: dset_name ! name of the dataset
integer(hsize_t), intent(inout) :: npals ! palettes
integer :: errcode ! error code
- integer :: namelen ! name length
+ integer(size_t) :: namelen ! name length
interface
integer function h5imget_npalettes_c(loc_id,namelen,dset_name,npals)
@@ -583,7 +583,7 @@ subroutine h5imget_npalettes_f(loc_id,&
integer(hid_t), intent(in) :: loc_id ! file or group identifier
character(len=*), intent(in) :: dset_name ! name of the dataset
integer(hsize_t), intent(inout) :: npals ! palettes
- integer :: namelen ! name length
+ integer(size_t) :: namelen ! name length
end function h5imget_npalettes_c
end interface
@@ -631,7 +631,7 @@ subroutine h5imget_palette_info_f(loc_id,&
integer, intent(in) :: pal_number ! palette number
integer(hsize_t), dimension(*), intent(inout) :: dims ! dimensions
integer :: errcode ! error code
- integer :: namelen ! name length
+ integer(size_t) :: namelen ! name length
interface
integer function h5imget_palette_info_c(loc_id,namelen,dset_name,pal_number,dims)
@@ -645,7 +645,7 @@ subroutine h5imget_palette_info_f(loc_id,&
character(len=*), intent(in) :: dset_name ! name of the dataset
integer, intent(in) :: pal_number ! palette number
integer(hsize_t), dimension(*), intent(inout) :: dims ! dimensions
- integer :: namelen ! name length
+ integer(size_t) :: namelen ! name length
end function h5imget_palette_info_c
end interface
@@ -694,7 +694,7 @@ subroutine h5imget_palette_f(loc_id,&
integer, intent(in) :: pal_number ! palette number
integer, intent(inout), dimension(*) :: buf ! buffer
integer :: errcode ! error code
- integer :: namelen ! name length
+ integer(size_t) :: namelen ! name length
interface
integer function h5imget_palette_c(loc_id,namelen,dset_name,pal_number,buf)
@@ -705,7 +705,7 @@ subroutine h5imget_palette_f(loc_id,&
!DEC$ENDIF
!DEC$ATTRIBUTES reference :: dset_name
integer(hid_t), intent(in) :: loc_id ! file or group identifier
- integer :: namelen ! lenght of name buffer
+ integer(size_t) :: namelen ! length of name buffer
character(len=*), intent(in) :: dset_name ! name of the dataset
integer, intent(in) :: pal_number ! palette number
integer, intent(inout), dimension(*) :: buf ! buffer
@@ -750,7 +750,7 @@ integer function h5imis_palette_f(loc_id,&
integer(hid_t), intent(in) :: loc_id ! file or group identifier
character(len=*), intent(in) :: dset_name ! name of the dataset
integer :: errcode ! error code
- integer :: namelen ! name length
+ integer(size_t) :: namelen ! name length
interface
integer function h5imis_palette_c(loc_id,namelen,dset_name)
@@ -761,7 +761,7 @@ integer function h5imis_palette_f(loc_id,&
!DEC$ENDIF
!DEC$ATTRIBUTES reference :: dset_name
integer(hid_t), intent(in) :: loc_id ! file or group identifier
- integer :: namelen ! lenght of name buffer
+ integer(size_t) :: namelen ! length of name buffer
character(len=*), intent(in) :: dset_name ! name of the dataset
end function h5imis_palette_c
end interface
diff --git a/hl/fortran/src/H5LTf90proto.h b/hl/fortran/src/H5LTf90proto.h
index 332a7e2..532d9d8 100644
--- a/hl/fortran/src/H5LTf90proto.h
+++ b/hl/fortran/src/H5LTf90proto.h
@@ -22,8 +22,9 @@
#include <stdlib.h>
#include <string.h>
+/* These definitions should match those in fortran/src/H5f90kit.c */
-H5_FCDLL char* HD5f2cstring (_fcd fdesc, int len);
+H5_FCDLL char* HD5f2cstring (_fcd fdesc, size_t len);
H5_FCDLL void HD5packFstring (char *src, char *dest, size_t len);
/*
@@ -204,7 +205,7 @@ H5_FCDLL void HD5packFstring (char *src, char *dest, size_t len);
HDF5_HL_F90CSTUBDLL
int_f
-nh5dsset_scale_c(hid_t_f *dsid, _fcd dimname, int_f *dimnamelen);
+nh5dsset_scale_c(hid_t_f *dsid, _fcd dimname, size_t_f *dimnamelen);
HDF5_HL_F90CSTUBDLL
int_f
@@ -224,7 +225,7 @@ nh5dsis_scale_c(hid_t_f *did, int_f *is_scale);
HDF5_HL_F90CSTUBDLL
int_f
-nh5dsset_label_c(hid_t_f *did, int_f *idx, _fcd label, int_f *labellen);
+nh5dsset_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *labellen);
HDF5_HL_F90CSTUBDLL
int_f
@@ -242,7 +243,7 @@ nh5dsget_num_scales_c( hid_t_f *did, int_f *idx, int_f *num_scales);
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -252,7 +253,7 @@ nh5ltmake_dataset_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_int1_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -262,7 +263,7 @@ nh5ltmake_dataset_int1_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_int2_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -272,7 +273,7 @@ nh5ltmake_dataset_int2_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_int3_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -282,7 +283,7 @@ nh5ltmake_dataset_int3_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_int4_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -292,7 +293,7 @@ nh5ltmake_dataset_int4_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_int5_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -302,7 +303,7 @@ nh5ltmake_dataset_int5_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_int6_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -312,7 +313,7 @@ nh5ltmake_dataset_int6_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_int7_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -323,7 +324,7 @@ nh5ltmake_dataset_int7_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_fl1_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -333,7 +334,7 @@ nh5ltmake_dataset_fl1_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_fl2_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -343,7 +344,7 @@ nh5ltmake_dataset_fl2_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_fl3_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -353,7 +354,7 @@ nh5ltmake_dataset_fl3_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_fl4_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -363,7 +364,7 @@ nh5ltmake_dataset_fl4_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_fl5_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -373,7 +374,7 @@ nh5ltmake_dataset_fl5_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_fl6_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -383,7 +384,7 @@ nh5ltmake_dataset_fl6_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_fl7_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -394,7 +395,7 @@ nh5ltmake_dataset_fl7_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_dl1_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -404,7 +405,7 @@ nh5ltmake_dataset_dl1_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_dl2_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -414,7 +415,7 @@ nh5ltmake_dataset_dl2_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_dl3_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -424,7 +425,7 @@ nh5ltmake_dataset_dl3_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_dl4_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -434,7 +435,7 @@ nh5ltmake_dataset_dl4_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_dl5_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -444,7 +445,7 @@ nh5ltmake_dataset_dl5_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_dl6_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -454,7 +455,7 @@ nh5ltmake_dataset_dl6_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_dl7_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -464,7 +465,7 @@ nh5ltmake_dataset_dl7_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_nint1_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -474,7 +475,7 @@ nh5ltmake_dataset_nint1_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_nint2_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -484,7 +485,7 @@ nh5ltmake_dataset_nint2_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_nint3_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -494,7 +495,7 @@ nh5ltmake_dataset_nint3_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_nint4_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -504,7 +505,7 @@ nh5ltmake_dataset_nint4_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_nint5_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -514,7 +515,7 @@ nh5ltmake_dataset_nint5_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_nint6_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -524,7 +525,7 @@ nh5ltmake_dataset_nint6_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_nint7_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -534,7 +535,7 @@ nh5ltmake_dataset_nint7_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_nfl1_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -544,7 +545,7 @@ nh5ltmake_dataset_nfl1_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_nfl2_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -554,7 +555,7 @@ nh5ltmake_dataset_nfl2_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_nfl3_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -564,7 +565,7 @@ nh5ltmake_dataset_nfl3_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_nfl4_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -574,7 +575,7 @@ nh5ltmake_dataset_nfl4_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_nfl5_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -584,7 +585,7 @@ nh5ltmake_dataset_nfl5_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_nfl6_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -594,7 +595,7 @@ nh5ltmake_dataset_nfl6_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_nfl7_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -604,7 +605,7 @@ nh5ltmake_dataset_nfl7_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_ndl1_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -614,7 +615,7 @@ nh5ltmake_dataset_ndl1_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_ndl2_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -624,7 +625,7 @@ nh5ltmake_dataset_ndl2_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_ndl3_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -634,7 +635,7 @@ nh5ltmake_dataset_ndl3_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_ndl4_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -644,7 +645,7 @@ nh5ltmake_dataset_ndl4_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_ndl5_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -654,7 +655,7 @@ nh5ltmake_dataset_ndl5_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_ndl6_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -664,7 +665,7 @@ nh5ltmake_dataset_ndl6_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_ndl7_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -674,7 +675,7 @@ nh5ltmake_dataset_ndl7_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -684,7 +685,7 @@ nh5ltread_dataset_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_int1_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -693,7 +694,7 @@ nh5ltread_dataset_int1_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_int2_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -702,7 +703,7 @@ nh5ltread_dataset_int2_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_int3_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -711,7 +712,7 @@ nh5ltread_dataset_int3_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_int4_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -720,7 +721,7 @@ nh5ltread_dataset_int4_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_int5_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -729,7 +730,7 @@ nh5ltread_dataset_int5_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_int6_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -738,7 +739,7 @@ nh5ltread_dataset_int6_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_int7_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -747,7 +748,7 @@ nh5ltread_dataset_int7_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_fl1_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -756,7 +757,7 @@ nh5ltread_dataset_fl1_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_fl2_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -765,7 +766,7 @@ nh5ltread_dataset_fl2_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_fl3_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -774,7 +775,7 @@ nh5ltread_dataset_fl3_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_fl4_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -783,7 +784,7 @@ nh5ltread_dataset_fl4_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_fl5_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -792,7 +793,7 @@ nh5ltread_dataset_fl5_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_fl6_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -802,7 +803,7 @@ nh5ltread_dataset_fl6_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_fl7_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -811,7 +812,7 @@ nh5ltread_dataset_fl7_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_dl1_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -820,7 +821,7 @@ nh5ltread_dataset_dl1_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_dl2_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -829,7 +830,7 @@ nh5ltread_dataset_dl2_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_dl3_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -838,7 +839,7 @@ nh5ltread_dataset_dl3_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_dl4_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -847,7 +848,7 @@ nh5ltread_dataset_dl4_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_dl5_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -856,7 +857,7 @@ nh5ltread_dataset_dl5_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_dl6_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -865,7 +866,7 @@ nh5ltread_dataset_dl6_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_dl7_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -874,7 +875,7 @@ nh5ltread_dataset_dl7_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_nint1_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -883,7 +884,7 @@ nh5ltread_dataset_nint1_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_nint2_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -892,7 +893,7 @@ nh5ltread_dataset_nint2_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_nint3_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -901,7 +902,7 @@ nh5ltread_dataset_nint3_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_nint4_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -910,7 +911,7 @@ nh5ltread_dataset_nint4_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_nint5_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -919,7 +920,7 @@ nh5ltread_dataset_nint5_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_nint6_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -928,7 +929,7 @@ nh5ltread_dataset_nint6_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_nint7_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -937,7 +938,7 @@ nh5ltread_dataset_nint7_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_nfl1_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -946,7 +947,7 @@ nh5ltread_dataset_nfl1_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_nfl2_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -955,7 +956,7 @@ nh5ltread_dataset_nfl2_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_nfl3_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -964,7 +965,7 @@ nh5ltread_dataset_nfl3_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_nfl4_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -973,7 +974,7 @@ nh5ltread_dataset_nfl4_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_nfl5_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -982,7 +983,7 @@ nh5ltread_dataset_nfl5_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_nfl6_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -991,7 +992,7 @@ nh5ltread_dataset_nfl6_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_nfl7_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -1000,7 +1001,7 @@ nh5ltread_dataset_nfl7_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_ndl1_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -1009,7 +1010,7 @@ nh5ltread_dataset_ndl1_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_ndl2_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -1018,7 +1019,7 @@ nh5ltread_dataset_ndl2_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_ndl3_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -1027,7 +1028,7 @@ nh5ltread_dataset_ndl3_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_ndl4_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -1036,7 +1037,7 @@ nh5ltread_dataset_ndl4_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_ndl5_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -1045,7 +1046,7 @@ nh5ltread_dataset_ndl5_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_ndl6_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -1054,7 +1055,7 @@ nh5ltread_dataset_ndl6_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_ndl7_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -1063,9 +1064,9 @@ nh5ltread_dataset_ndl7_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltset_attribute_int_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd dsetname,
- int_f *attrnamelen,
+ size_t_f *attrnamelen,
_fcd attrname,
size_t_f *size,
void *buf);
@@ -1073,9 +1074,9 @@ nh5ltset_attribute_int_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltset_attribute_float_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd dsetname,
- int_f *attrnamelen,
+ size_t_f *attrnamelen,
_fcd attrname,
size_t_f *size,
void *buf);
@@ -1083,9 +1084,9 @@ nh5ltset_attribute_float_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltset_attribute_double_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd dsetname,
- int_f *attrnamelen,
+ size_t_f *attrnamelen,
_fcd attrname,
size_t_f *size,
void *buf);
@@ -1093,68 +1094,68 @@ nh5ltset_attribute_double_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltset_attribute_string_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd dsetname,
- int_f *attrnamelen,
+ size_t_f *attrnamelen,
_fcd attrname,
- int_f *buflen,
+ size_t_f *buflen,
void *buf);
HDF5_HL_F90CSTUBDLL
int_f
nh5ltget_attribute_int_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd dsetname,
- int_f *attrnamelen,
+ size_t_f *attrnamelen,
_fcd attrname,
void *buf);
HDF5_HL_F90CSTUBDLL
int_f
nh5ltget_attribute_float_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd dsetname,
- int_f *attrnamelen,
+ size_t_f *attrnamelen,
_fcd attrname,
void *buf);
HDF5_HL_F90CSTUBDLL
int_f
nh5ltget_attribute_double_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd dsetname,
- int_f *attrnamelen,
+ size_t_f *attrnamelen,
_fcd attrname,
void *buf);
HDF5_HL_F90CSTUBDLL
int_f
nh5ltget_attribute_string_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd dsetname,
- int_f *attrnamelen,
+ size_t_f *attrnamelen,
_fcd attrname,
_fcd buf,
- size_t_f *buf_size);
+ size_t_f *buf_size);
HDF5_HL_F90CSTUBDLL
int_f
nh5ltget_dataset_ndims_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank);
HDF5_HL_F90CSTUBDLL
int_f
nh5ltfind_dataset_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name);
HDF5_HL_F90CSTUBDLL
int_f
nh5ltget_dataset_info_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hsize_t_f *dims,
int_f *type_class,
@@ -1163,17 +1164,17 @@ nh5ltget_dataset_info_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltget_attribute_ndims_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd dsetname,
- int_f *attrnamelen,
+ size_t_f *attrnamelen,
_fcd attrname,
int_f *rank);
HDF5_HL_F90CSTUBDLL
int_f
nh5ltget_attribute_info_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *attrnamelen,
+ size_t_f *attrnamelen,
_fcd attrname,
hsize_t_f *dims,
int_f *type_class,
@@ -1182,24 +1183,24 @@ nh5ltget_attribute_info_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5ltmake_dataset_string_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *buflen,
+ size_t_f *buflen,
char *buf);
HDF5_HL_F90CSTUBDLL
int_f
nh5ltread_dataset_string_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
char *buf);
HDF5_HL_F90CSTUBDLL
int_f
nh5ltpath_valid_c(hid_t_f *loc_id,
- _fcd path,
- int_f *pathlen,
- int_f *check_object_valid_c);
+ _fcd path,
+ size_t_f *pathlen,
+ int_f *check_object_valid_c);
/*-------------------------------------------------------------------------
* Image
@@ -1209,7 +1210,7 @@ nh5ltpath_valid_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5immake_image_8bit_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hsize_t_f *width,
hsize_t_f *height,
@@ -1217,16 +1218,16 @@ nh5immake_image_8bit_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5imread_image_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *buf);
HDF5_HL_F90CSTUBDLL
int_f
nh5immake_image_24bit_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *ilen,
+ size_t_f *ilen,
_fcd il,
hsize_t_f *width,
hsize_t_f *height,
@@ -1234,27 +1235,27 @@ nh5immake_image_24bit_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5imget_image_info_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hsize_t_f *width,
hsize_t_f *height,
hsize_t_f *planes,
hsize_t_f *npals,
- int_f *ilen,
+ size_t_f *ilen,
_fcd interlace);
HDF5_HL_F90CSTUBDLL
int_f
nh5imis_image_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name);
HDF5_HL_F90CSTUBDLL
int_f
nh5immake_palette_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hsize_t_f *dims,
void *buf);
@@ -1262,23 +1263,23 @@ nh5immake_palette_c (hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5imlink_palette_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *ilen,
+ size_t_f *ilen,
_fcd pal_name);
HDF5_HL_F90CSTUBDLL
int_f
nh5imunlink_palette_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *ilen,
+ size_t_f *ilen,
_fcd pal_name);
HDF5_HL_F90CSTUBDLL
int_f
nh5imget_npalettes_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hsize_t_f *npals);
@@ -1286,7 +1287,7 @@ nh5imget_npalettes_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5imget_palette_info_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *pal_number,
hsize_t_f *dims);
@@ -1294,7 +1295,7 @@ nh5imget_palette_info_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5imget_palette_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *pal_number,
void *buf);
@@ -1302,7 +1303,7 @@ nh5imget_palette_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5imis_palette_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name);
@@ -1314,10 +1315,10 @@ nh5imis_palette_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
-nh5tbmake_table_c(int_f *namelen1,
+nh5tbmake_table_c(size_t_f *namelen1,
_fcd name1,
hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hsize_t_f *nfields,
hsize_t_f *nrecords,
@@ -1326,16 +1327,16 @@ nh5tbmake_table_c(int_f *namelen1,
hid_t_f *field_types,
hsize_t_f *chunk_size,
int_f *compress,
- int_f *char_len_field_names, /* field_names lenghts */
- int_f *max_char_size_field_names, /* char len of fields */
+ size_t_f *char_len_field_names, /* field_names lenghts */
+ size_t_f *max_char_size_field_names, /* char len of fields */
_fcd buf); /* field_names */
HDF5_HL_F90CSTUBDLL
int_f
nh5tbwrite_field_name_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hsize_t_f *start,
hsize_t_f *nrecords,
@@ -1345,9 +1346,9 @@ nh5tbwrite_field_name_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5tbwrite_field_name_int_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hsize_t_f *start,
hsize_t_f *nrecords,
@@ -1357,9 +1358,9 @@ nh5tbwrite_field_name_int_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5tbwrite_field_name_fl_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hsize_t_f *start,
hsize_t_f *nrecords,
@@ -1369,9 +1370,9 @@ nh5tbwrite_field_name_fl_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5tbwrite_field_name_dl_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hsize_t_f *start,
hsize_t_f *nrecords,
@@ -1381,9 +1382,9 @@ nh5tbwrite_field_name_dl_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5tbwrite_field_name_st_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hsize_t_f *start,
hsize_t_f *nrecords,
@@ -1393,9 +1394,9 @@ nh5tbwrite_field_name_st_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5tbread_field_name_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hsize_t_f *start,
hsize_t_f *nrecords,
@@ -1405,9 +1406,9 @@ nh5tbread_field_name_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5tbread_field_name_int_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hsize_t_f *start,
hsize_t_f *nrecords,
@@ -1417,9 +1418,9 @@ nh5tbread_field_name_int_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5tbread_field_name_fl_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hsize_t_f *start,
hsize_t_f *nrecords,
@@ -1429,9 +1430,9 @@ nh5tbread_field_name_fl_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5tbread_field_name_dl_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hsize_t_f *start,
hsize_t_f *nrecords,
@@ -1441,9 +1442,9 @@ nh5tbread_field_name_dl_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5tbread_field_name_st_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hsize_t_f *start,
hsize_t_f *nrecords,
@@ -1453,7 +1454,7 @@ nh5tbread_field_name_st_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5tbwrite_field_index_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *field_index,
hsize_t_f *start,
@@ -1464,7 +1465,7 @@ nh5tbwrite_field_index_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5tbwrite_field_index_int_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *field_index,
hsize_t_f *start,
@@ -1475,7 +1476,7 @@ nh5tbwrite_field_index_int_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5tbwrite_field_index_fl_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *field_index,
hsize_t_f *start,
@@ -1486,7 +1487,7 @@ nh5tbwrite_field_index_fl_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5tbwrite_field_index_dl_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *field_index,
hsize_t_f *start,
@@ -1497,7 +1498,7 @@ nh5tbwrite_field_index_dl_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5tbwrite_field_index_st_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *field_index,
hsize_t_f *start,
@@ -1508,7 +1509,7 @@ nh5tbwrite_field_index_st_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5tbread_field_index_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *field_index,
hsize_t_f *start,
@@ -1519,7 +1520,7 @@ nh5tbread_field_index_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5tbread_field_index_int_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *field_index,
hsize_t_f *start,
@@ -1530,7 +1531,7 @@ nh5tbread_field_index_int_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5tbread_field_index_fl_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *field_index,
hsize_t_f *start,
@@ -1541,7 +1542,7 @@ nh5tbread_field_index_fl_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5tbread_field_index_dl_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *field_index,
hsize_t_f *start,
@@ -1552,7 +1553,7 @@ nh5tbread_field_index_dl_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5tbread_field_index_st_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *field_index,
hsize_t_f *start,
@@ -1563,9 +1564,9 @@ nh5tbread_field_index_st_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5tbinsert_field_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hid_t_f *field_type,
int_f *position,
@@ -1574,9 +1575,9 @@ nh5tbinsert_field_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5tbinsert_field_int_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hid_t_f *field_type,
int_f *position,
@@ -1584,9 +1585,9 @@ nh5tbinsert_field_int_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5tbinsert_field_fl_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hid_t_f *field_type,
int_f *position,
@@ -1594,9 +1595,9 @@ nh5tbinsert_field_fl_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5tbinsert_field_dl_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hid_t_f *field_type,
int_f *position,
@@ -1604,9 +1605,9 @@ nh5tbinsert_field_dl_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5tbinsert_field_st_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hid_t_f *field_type,
int_f *position,
@@ -1614,16 +1615,16 @@ nh5tbinsert_field_st_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5tbdelete_field_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name);
HDF5_HL_F90CSTUBDLL
int_f
nh5tbget_table_info_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hsize_t_f *nfields,
hsize_t_f *nrecords);
@@ -1631,16 +1632,16 @@ nh5tbget_table_info_c(hid_t_f *loc_id,
HDF5_HL_F90CSTUBDLL
int_f
nh5tbget_field_info_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hsize_t_f *nfields,
size_t_f *field_sizes,
size_t_f *field_offsets,
size_t_f *type_size,
- int_f *namelen2,
- int_f *lenmax,
+ size_t_f *namelen2,
+ size_t_f *lenmax,
_fcd field_names,
- int_f *maxlen_out);
+ size_t_f *maxlen_out);
#endif /* _H5LTf90proto_H */
diff --git a/hl/fortran/src/H5LTfc.c b/hl/fortran/src/H5LTfc.c
index 4f8f7b6..1e0a236 100644
--- a/hl/fortran/src/H5LTfc.c
+++ b/hl/fortran/src/H5LTfc.c
@@ -40,7 +40,7 @@
int_f
nh5ltmake_dataset_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -49,25 +49,20 @@ nh5ltmake_dataset_c (hid_t_f *loc_id,
{
int ret_value = -1;
herr_t ret;
- hid_t c_loc_id;
- hid_t c_type_id;
char *c_name = NULL;
hsize_t *c_dims = NULL;
- int c_namelen;
int i;
/*
* convert FORTRAN name to C name
*/
- c_namelen = *namelen;
- c_name = (char *)HD5f2cstring(name, c_namelen);
+ c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
if (c_name == NULL)
goto done;
- c_dims = HDmalloc(sizeof(hsize_t) * (*rank ));
+ c_dims = (hsize_t *)HDmalloc(sizeof(hsize_t) * ( (size_t)*rank ));
if (c_dims == NULL)
goto done;
-
/*
* transpose dimension arrays because of C-FORTRAN storage order
*/
@@ -79,11 +74,8 @@ nh5ltmake_dataset_c (hid_t_f *loc_id,
/*
* call H5LTmake_dataset function.
*/
- c_loc_id = (hid_t)*loc_id;
- c_type_id = (hid_t)*type_id;
-
- ret = H5LTmake_dataset(c_loc_id, c_name, *rank, c_dims, c_type_id, buf );
+ ret = H5LTmake_dataset((hid_t)*loc_id, c_name, (int)*rank, c_dims, (hid_t)*type_id, buf );
if (ret < 0)
goto done;
@@ -99,7 +91,7 @@ done:
int_f
nh5ltmake_dataset_int1_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -110,7 +102,7 @@ nh5ltmake_dataset_int1_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_int2_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -121,7 +113,7 @@ nh5ltmake_dataset_int2_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_int3_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -132,7 +124,7 @@ nh5ltmake_dataset_int3_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_int4_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -143,7 +135,7 @@ nh5ltmake_dataset_int4_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_int5_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -154,7 +146,7 @@ nh5ltmake_dataset_int5_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_int6_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -165,7 +157,7 @@ nh5ltmake_dataset_int6_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_int7_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -176,7 +168,7 @@ nh5ltmake_dataset_int7_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_fl1_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -187,7 +179,7 @@ nh5ltmake_dataset_fl1_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_fl2_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -198,7 +190,7 @@ nh5ltmake_dataset_fl2_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_fl3_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -209,7 +201,7 @@ nh5ltmake_dataset_fl3_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_fl4_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -220,7 +212,7 @@ nh5ltmake_dataset_fl4_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_fl5_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -231,7 +223,7 @@ nh5ltmake_dataset_fl5_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_fl6_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -242,7 +234,7 @@ nh5ltmake_dataset_fl6_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_fl7_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -253,7 +245,7 @@ nh5ltmake_dataset_fl7_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_dl1_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -264,7 +256,7 @@ nh5ltmake_dataset_dl1_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_dl2_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -275,7 +267,7 @@ nh5ltmake_dataset_dl2_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_dl3_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -286,7 +278,7 @@ nh5ltmake_dataset_dl3_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_dl4_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -297,7 +289,7 @@ nh5ltmake_dataset_dl4_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_dl5_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -308,7 +300,7 @@ nh5ltmake_dataset_dl5_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_dl6_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -319,7 +311,7 @@ nh5ltmake_dataset_dl6_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_dl7_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -330,7 +322,7 @@ nh5ltmake_dataset_dl7_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_nint1_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -341,7 +333,7 @@ nh5ltmake_dataset_nint1_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_nint2_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -352,7 +344,7 @@ nh5ltmake_dataset_nint2_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_nint3_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -363,7 +355,7 @@ nh5ltmake_dataset_nint3_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_nint4_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -374,7 +366,7 @@ nh5ltmake_dataset_nint4_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_nint5_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -385,7 +377,7 @@ nh5ltmake_dataset_nint5_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_nint6_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -396,7 +388,7 @@ nh5ltmake_dataset_nint6_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_nint7_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -407,7 +399,7 @@ nh5ltmake_dataset_nint7_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_nfl1_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -418,7 +410,7 @@ nh5ltmake_dataset_nfl1_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_nfl2_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -429,7 +421,7 @@ nh5ltmake_dataset_nfl2_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_nfl3_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -440,7 +432,7 @@ nh5ltmake_dataset_nfl3_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_nfl4_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -451,7 +443,7 @@ nh5ltmake_dataset_nfl4_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_nfl5_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -462,7 +454,7 @@ nh5ltmake_dataset_nfl5_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_nfl6_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -473,7 +465,7 @@ nh5ltmake_dataset_nfl6_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_nfl7_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -484,7 +476,7 @@ nh5ltmake_dataset_nfl7_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_ndl1_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -495,7 +487,7 @@ nh5ltmake_dataset_ndl1_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_ndl2_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -506,7 +498,7 @@ nh5ltmake_dataset_ndl2_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_ndl3_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -517,7 +509,7 @@ nh5ltmake_dataset_ndl3_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_ndl4_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -528,7 +520,7 @@ nh5ltmake_dataset_ndl4_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_ndl5_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -539,7 +531,7 @@ nh5ltmake_dataset_ndl5_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_ndl6_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -550,7 +542,7 @@ nh5ltmake_dataset_ndl6_c (hid_t_f *loc_id,
}
int_f
nh5ltmake_dataset_ndl7_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank,
hsize_t_f *dims,
@@ -580,7 +572,7 @@ nh5ltmake_dataset_ndl7_c (hid_t_f *loc_id,
int_f
nh5ltread_dataset_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -591,13 +583,11 @@ nh5ltread_dataset_c (hid_t_f *loc_id,
hid_t c_loc_id;
hid_t c_type_id;
char *c_name = NULL;
- int c_namelen;
/*
* convert FORTRAN name to C name
*/
- c_namelen = *namelen;
- c_name = (char *)HD5f2cstring(name, c_namelen);
+ c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
if (c_name == NULL)
goto done;
@@ -623,7 +613,7 @@ done:
int_f
nh5ltread_dataset_int1_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -633,7 +623,7 @@ nh5ltread_dataset_int1_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_int2_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -643,7 +633,7 @@ nh5ltread_dataset_int2_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_int3_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -653,7 +643,7 @@ nh5ltread_dataset_int3_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_int4_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -663,7 +653,7 @@ nh5ltread_dataset_int4_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_int5_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -673,7 +663,7 @@ nh5ltread_dataset_int5_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_int6_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -683,7 +673,7 @@ nh5ltread_dataset_int6_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_int7_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -693,7 +683,7 @@ nh5ltread_dataset_int7_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_fl1_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -703,7 +693,7 @@ nh5ltread_dataset_fl1_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_fl2_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -713,7 +703,7 @@ nh5ltread_dataset_fl2_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_fl3_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -723,7 +713,7 @@ nh5ltread_dataset_fl3_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_fl4_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -733,7 +723,7 @@ nh5ltread_dataset_fl4_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_fl5_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -743,7 +733,7 @@ nh5ltread_dataset_fl5_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_fl6_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -753,7 +743,7 @@ nh5ltread_dataset_fl6_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_fl7_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -763,7 +753,7 @@ nh5ltread_dataset_fl7_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_dl1_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -773,7 +763,7 @@ nh5ltread_dataset_dl1_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_dl2_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -783,7 +773,7 @@ nh5ltread_dataset_dl2_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_dl3_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -793,7 +783,7 @@ nh5ltread_dataset_dl3_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_dl4_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -803,7 +793,7 @@ nh5ltread_dataset_dl4_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_dl5_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -813,7 +803,7 @@ nh5ltread_dataset_dl5_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_dl6_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -823,7 +813,7 @@ nh5ltread_dataset_dl6_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_dl7_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -833,7 +823,7 @@ nh5ltread_dataset_dl7_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_nint1_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -843,7 +833,7 @@ nh5ltread_dataset_nint1_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_nint2_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -853,7 +843,7 @@ nh5ltread_dataset_nint2_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_nint3_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -863,7 +853,7 @@ nh5ltread_dataset_nint3_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_nint4_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -873,7 +863,7 @@ nh5ltread_dataset_nint4_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_nint5_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -883,7 +873,7 @@ nh5ltread_dataset_nint5_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_nint6_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -893,7 +883,7 @@ nh5ltread_dataset_nint6_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_nint7_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -903,7 +893,7 @@ nh5ltread_dataset_nint7_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_nfl1_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -913,7 +903,7 @@ nh5ltread_dataset_nfl1_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_nfl2_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -923,7 +913,7 @@ nh5ltread_dataset_nfl2_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_nfl3_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -933,7 +923,7 @@ nh5ltread_dataset_nfl3_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_nfl4_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -943,7 +933,7 @@ nh5ltread_dataset_nfl4_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_nfl5_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -953,7 +943,7 @@ nh5ltread_dataset_nfl5_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_nfl6_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -963,7 +953,7 @@ nh5ltread_dataset_nfl6_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_nfl7_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -973,7 +963,7 @@ nh5ltread_dataset_nfl7_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_ndl1_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -983,7 +973,7 @@ nh5ltread_dataset_ndl1_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_ndl2_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -993,7 +983,7 @@ nh5ltread_dataset_ndl2_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_ndl3_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -1003,7 +993,7 @@ nh5ltread_dataset_ndl3_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_ndl4_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -1013,7 +1003,7 @@ nh5ltread_dataset_ndl4_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_ndl5_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -1023,7 +1013,7 @@ nh5ltread_dataset_ndl5_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_ndl6_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -1033,7 +1023,7 @@ nh5ltread_dataset_ndl6_c (hid_t_f *loc_id,
}
int_f
nh5ltread_dataset_ndl7_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hid_t_f *type_id,
void *buf,
@@ -1062,29 +1052,25 @@ nh5ltread_dataset_ndl7_c (hid_t_f *loc_id,
int_f
nh5ltmake_dataset_string_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *buflen,
+ size_t_f *buflen,
char *buf)
{
int ret_value = -1;
herr_t ret;
hid_t c_loc_id;
char *c_name = NULL;
- int c_namelen;
char *c_buf = NULL;
- int c_buflen;
/*
* convert FORTRAN name to C name
*/
- c_namelen = *namelen;
- c_name = (char *)HD5f2cstring(name, c_namelen);
+ c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
if (c_name == NULL)
goto done;
- c_buflen = *buflen;
- c_buf = (char *)HD5f2cstring(buf, c_buflen);
+ c_buf = (char *)HD5f2cstring(buf, (size_t)*buflen);
if (c_buf == NULL)
goto done;
@@ -1131,7 +1117,7 @@ done:
int_f
nh5ltread_dataset_string_c (hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
char *buf)
{
@@ -1139,13 +1125,11 @@ nh5ltread_dataset_string_c (hid_t_f *loc_id,
herr_t ret;
hid_t c_loc_id;
char *c_name = NULL;
- int c_namelen;
/*
* convert FORTRAN name to C name
*/
- c_namelen = *namelen;
- c_name = (char *)HD5f2cstring(name, c_namelen);
+ c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
if (c_name == NULL)
goto done;
@@ -1191,9 +1175,9 @@ done:
int_f
nh5ltset_attribute_int_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd dsetname,
- int_f *attrnamelen,
+ size_t_f *attrnamelen,
_fcd attrname,
size_t_f *size,
void *buf)
@@ -1203,20 +1187,16 @@ nh5ltset_attribute_int_c(hid_t_f *loc_id,
hid_t c_loc_id;
char *c_name = NULL;
char *c_attrname = NULL;
- int c_namelen;
- int c_attrnamelen;
size_t c_size;
/*
* convert FORTRAN name to C name
*/
- c_namelen = *namelen;
- c_name = (char *)HD5f2cstring(dsetname, c_namelen);
+ c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
if (c_name == NULL)
goto done;
- c_attrnamelen = (int)*attrnamelen;
- c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen);
+ c_attrname = (char *)HD5f2cstring(attrname, (size_t)*attrnamelen);
if (c_attrname == NULL)
goto done;
@@ -1227,11 +1207,11 @@ nh5ltset_attribute_int_c(hid_t_f *loc_id,
c_size = (size_t)*size;
if (sizeof(int_f) == sizeof(int))
- ret = H5LTset_attribute_int(c_loc_id,c_name,c_attrname,buf,c_size);
+ ret = H5LTset_attribute_int(c_loc_id,c_name,c_attrname,(const int *)buf,c_size);
else if (sizeof(int_f) == sizeof(long))
- ret = H5LTset_attribute_long(c_loc_id,c_name,c_attrname,buf,c_size);
+ ret = H5LTset_attribute_long(c_loc_id,c_name,c_attrname,(const long *)buf,c_size);
else if (sizeof(int_f) == sizeof(long long))
- ret = H5LTset_attribute_long_long(c_loc_id,c_name,c_attrname,buf,c_size);
+ ret = H5LTset_attribute_long_long(c_loc_id,c_name,c_attrname,(const long long *)buf,c_size);
else
goto done;
@@ -1270,9 +1250,9 @@ done:
int_f
nh5ltset_attribute_float_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd dsetname,
- int_f *attrnamelen,
+ size_t_f *attrnamelen,
_fcd attrname,
size_t_f *size,
void *buf)
@@ -1282,20 +1262,16 @@ nh5ltset_attribute_float_c(hid_t_f *loc_id,
hid_t c_loc_id;
char *c_name = NULL;
char *c_attrname = NULL;
- int c_namelen;
- int c_attrnamelen;
size_t c_size;
/*
* convert FORTRAN name to C name
*/
- c_namelen = *namelen;
- c_name = (char *)HD5f2cstring(dsetname, c_namelen);
+ c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
if (c_name == NULL)
goto done;
- c_attrnamelen = *attrnamelen;
- c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen);
+ c_attrname = (char *)HD5f2cstring(attrname, (size_t)*attrnamelen);
if (c_attrname == NULL)
goto done;
@@ -1305,7 +1281,7 @@ nh5ltset_attribute_float_c(hid_t_f *loc_id,
c_loc_id = (hid_t)*loc_id;
c_size = (size_t)*size;
- ret = H5LTset_attribute_float(c_loc_id,c_name,c_attrname,buf,c_size);
+ ret = H5LTset_attribute_float(c_loc_id,c_name,c_attrname,(float *)buf,c_size);
if (ret < 0)
goto done;
@@ -1343,9 +1319,9 @@ done:
int_f
nh5ltset_attribute_double_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd dsetname,
- int_f *attrnamelen,
+ size_t_f *attrnamelen,
_fcd attrname,
size_t_f *size,
void *buf)
@@ -1355,20 +1331,16 @@ nh5ltset_attribute_double_c(hid_t_f *loc_id,
hid_t c_loc_id;
char *c_name = NULL;
char *c_attrname = NULL;
- int c_namelen;
- int c_attrnamelen;
size_t c_size;
/*
* Convert FORTRAN name to C name
*/
- c_namelen = *namelen;
- c_name = (char *)HD5f2cstring(dsetname, c_namelen);
+ c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
if (c_name == NULL)
goto done;
- c_attrnamelen = *attrnamelen;
- c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen);
+ c_attrname = (char *)HD5f2cstring(attrname, (size_t)*attrnamelen);
if (c_attrname == NULL)
goto done;
@@ -1378,7 +1350,7 @@ nh5ltset_attribute_double_c(hid_t_f *loc_id,
c_loc_id = (hid_t)*loc_id;
c_size = (size_t)*size;
- ret = H5LTset_attribute_double(c_loc_id,c_name,c_attrname,buf,c_size);
+ ret = H5LTset_attribute_double(c_loc_id,c_name,c_attrname,(double *)buf,c_size);
if (ret < 0)
goto done;
@@ -1416,11 +1388,11 @@ done:
int_f
nh5ltset_attribute_string_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd dsetname,
- int_f *attrnamelen,
+ size_t_f *attrnamelen,
_fcd attrname,
- int_f *buflen,
+ size_t_f *buflen,
void *buf)
{
int ret_value = -1;
@@ -1428,26 +1400,20 @@ nh5ltset_attribute_string_c(hid_t_f *loc_id,
hid_t c_loc_id;
char *c_name = NULL;
char *c_attrname = NULL;
- int c_namelen;
- int c_attrnamelen;
char *c_buf = NULL;
- int c_buflen;
/*
* convert FORTRAN name to C name
*/
- c_namelen = *namelen;
- c_name = (char *)HD5f2cstring(dsetname, c_namelen);
+ c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
if (c_name == NULL)
goto done;
- c_attrnamelen = *attrnamelen;
- c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen);
+ c_attrname = (char *)HD5f2cstring(attrname, (size_t)*attrnamelen);
if (c_attrname == NULL)
goto done;
- c_buflen = *buflen;
- c_buf = (char *)HD5f2cstring(buf, c_buflen);
+ c_buf = (char *)HD5f2cstring((_fcd)buf, (size_t)*buflen);
if (c_buf == NULL)
goto done;
@@ -1497,9 +1463,9 @@ done:
int_f
nh5ltget_attribute_int_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd dsetname,
- int_f *attrnamelen,
+ size_t_f *attrnamelen,
_fcd attrname,
void *buf)
{
@@ -1508,19 +1474,15 @@ nh5ltget_attribute_int_c(hid_t_f *loc_id,
hid_t c_loc_id;
char *c_name = NULL;
char *c_attrname = NULL;
- int c_namelen;
- int c_attrnamelen;
/*
* convert FORTRAN name to C name
*/
- c_namelen = (int)*namelen;
- c_name = (char *)HD5f2cstring(dsetname, c_namelen);
+ c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
if (c_name == NULL)
goto done;
- c_attrnamelen = (int)*attrnamelen;
- c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen);
+ c_attrname = (char *)HD5f2cstring(attrname, (size_t)*attrnamelen);
if (c_attrname == NULL)
goto done;
@@ -1530,11 +1492,11 @@ nh5ltget_attribute_int_c(hid_t_f *loc_id,
c_loc_id = (hid_t)*loc_id;
if(sizeof(int_f) == sizeof(int))
- ret = H5LTget_attribute_int(c_loc_id,c_name,c_attrname,buf);
+ ret = H5LTget_attribute_int(c_loc_id,c_name,c_attrname,(int *)buf);
else if (sizeof(int_f) == sizeof(long))
- ret = H5LTget_attribute_long(c_loc_id,c_name,c_attrname,buf);
+ ret = H5LTget_attribute_long(c_loc_id,c_name,c_attrname,(long *)buf);
else if (sizeof(int_f) == sizeof(long long))
- ret = H5LTget_attribute_long_long(c_loc_id,c_name,c_attrname,buf);
+ ret = H5LTget_attribute_long_long(c_loc_id,c_name,c_attrname,(long long *)buf);
else
goto done;
@@ -1575,9 +1537,9 @@ done:
int_f
nh5ltget_attribute_float_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd dsetname,
- int_f *attrnamelen,
+ size_t_f *attrnamelen,
_fcd attrname,
void *buf)
{
@@ -1586,19 +1548,15 @@ nh5ltget_attribute_float_c(hid_t_f *loc_id,
hid_t c_loc_id;
char *c_name = NULL;
char *c_attrname = NULL;
- int c_namelen;
- int c_attrnamelen;
/*
* convert FORTRAN name to C name
*/
- c_namelen = (int)*namelen;
- c_name = (char *)HD5f2cstring(dsetname, c_namelen);
+ c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
if (c_name == NULL)
goto done;
- c_attrnamelen = (int)*attrnamelen;
- c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen);
+ c_attrname = (char *)HD5f2cstring(attrname, (size_t)*attrnamelen);
if (c_attrname == NULL)
goto done;
@@ -1607,7 +1565,7 @@ nh5ltget_attribute_float_c(hid_t_f *loc_id,
*/
c_loc_id = (hid_t)*loc_id;
- ret = H5LTget_attribute_float(c_loc_id,c_name,c_attrname,buf);
+ ret = H5LTget_attribute_float(c_loc_id,c_name,c_attrname,(float*)buf);
if (ret < 0)
goto done;
@@ -1644,9 +1602,9 @@ done:
int_f
nh5ltget_attribute_double_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd dsetname,
- int_f *attrnamelen,
+ size_t_f *attrnamelen,
_fcd attrname,
void *buf)
{
@@ -1655,19 +1613,15 @@ nh5ltget_attribute_double_c(hid_t_f *loc_id,
hid_t c_loc_id;
char *c_name = NULL;
char *c_attrname = NULL;
- int c_namelen;
- int c_attrnamelen;
/*
* convert FORTRAN name to C name
*/
- c_namelen = (int)*namelen;
- c_name = (char *)HD5f2cstring(dsetname, c_namelen);
+ c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
if (c_name == NULL)
goto done;
- c_attrnamelen = (int)*attrnamelen;
- c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen);
+ c_attrname = (char *)HD5f2cstring(attrname, (size_t)*attrnamelen);
if (c_attrname == NULL)
goto done;
@@ -1676,7 +1630,7 @@ nh5ltget_attribute_double_c(hid_t_f *loc_id,
*/
c_loc_id = (hid_t)*loc_id;
- ret = H5LTget_attribute_double(c_loc_id,c_name,c_attrname,buf);
+ ret = H5LTget_attribute_double(c_loc_id,c_name,c_attrname,(double *)buf);
if (ret < 0)
goto done;
@@ -1714,9 +1668,9 @@ done:
int_f
nh5ltget_attribute_string_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd dsetname,
- int_f *attrnamelen,
+ size_t_f *attrnamelen,
_fcd attrname,
_fcd buf, size_t_f *buf_size)
{
@@ -1725,25 +1679,21 @@ nh5ltget_attribute_string_c(hid_t_f *loc_id,
char *c_name = NULL;
char *c_attrname = NULL;
char *c_buf = NULL;
- int c_namelen;
- int c_attrnamelen;
/*
* Convert FORTRAN name to C name
*/
- c_namelen = (int)*namelen;
- c_name = (char *)HD5f2cstring(dsetname, c_namelen);
+ c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
if (c_name == NULL)
goto done;
- c_attrnamelen = (int)*attrnamelen;
- c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen);
+ c_attrname = (char *)HD5f2cstring(attrname, (size_t)*attrnamelen);
if (c_attrname == NULL)
goto done;
/*
* Allocate buffer to hold C attribute string
*/
- if ((c_buf = HDmalloc((size_t)*buf_size + 1)) == NULL)
+ if ((c_buf = (char *)HDmalloc((size_t)*buf_size + 1)) == NULL)
goto done;
/*
@@ -1793,7 +1743,7 @@ done:
int_f
nh5ltget_dataset_ndims_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *rank)
{
@@ -1801,14 +1751,12 @@ nh5ltget_dataset_ndims_c(hid_t_f *loc_id,
herr_t ret;
hid_t c_loc_id;
char *c_name = NULL;
- int c_namelen;
int c_rank;
/*
* Convert FORTRAN name to C name
*/
- c_namelen = (int)*namelen;
- c_name = (char *)HD5f2cstring(name, c_namelen);
+ c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
if (c_name == NULL)
goto done;
@@ -1855,19 +1803,17 @@ done:
int_f
nh5ltfind_dataset_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name)
{
hid_t c_loc_id;
char *c_name = NULL;
- int c_namelen;
herr_t ret;
/*
* Convert FORTRAN name to C name
*/
- c_namelen = (int)*namelen;
- c_name = (char *)HD5f2cstring(name, c_namelen);
+ c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
if (c_name == NULL) return -1;
/*
@@ -1905,7 +1851,7 @@ nh5ltfind_dataset_c(hid_t_f *loc_id,
int_f
nh5ltget_dataset_info_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hsize_t_f *dims,
int_f *type_class,
@@ -1915,7 +1861,6 @@ nh5ltget_dataset_info_c(hid_t_f *loc_id,
herr_t ret;
hid_t c_loc_id;
char *c_name = NULL;
- int c_namelen;
H5T_class_t c_classtype;
size_t c_type_size;
hsize_t c_dims[32];
@@ -1925,8 +1870,7 @@ nh5ltget_dataset_info_c(hid_t_f *loc_id,
/*
* convert FORTRAN name to C name
*/
- c_namelen = (int)*namelen;
- c_name = (char *)HD5f2cstring(name, c_namelen);
+ c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
if (c_name == NULL)
goto done;
@@ -1986,9 +1930,9 @@ done:
int_f
nh5ltget_attribute_ndims_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd dsetname,
- int_f *attrnamelen,
+ size_t_f *attrnamelen,
_fcd attrname,
int_f *rank)
{
@@ -1997,20 +1941,16 @@ nh5ltget_attribute_ndims_c(hid_t_f *loc_id,
hid_t c_loc_id;
char *c_name = NULL;
char *c_attrname = NULL;
- int c_namelen;
- int c_attrnamelen;
int c_rank;
/*
* Convert FORTRAN name to C name
*/
- c_namelen =(int) *namelen;
- c_name = (char *)HD5f2cstring(dsetname, c_namelen);
+ c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
if (c_name == NULL)
goto done;
- c_attrnamelen = (int)*attrnamelen;
- c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen);
+ c_attrname = (char *)HD5f2cstring(attrname, (size_t)*attrnamelen);
if (c_attrname == NULL)
goto done;
@@ -2059,9 +1999,9 @@ done:
int_f
nh5ltget_attribute_info_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *attrnamelen,
+ size_t_f *attrnamelen,
_fcd attrname,
hsize_t_f *dims,
int_f *type_class,
@@ -2072,8 +2012,6 @@ nh5ltget_attribute_info_c(hid_t_f *loc_id,
hid_t c_loc_id;
char *c_name = NULL;
char *c_attrname = NULL;
- int c_namelen;
- int c_attrnamelen;
H5T_class_t c_classtype;
size_t c_type_size;
hsize_t c_dims[32];
@@ -2083,13 +2021,11 @@ nh5ltget_attribute_info_c(hid_t_f *loc_id,
/*
* convert FORTRAN name to C name
*/
- c_namelen = (int)*namelen;
- c_name = (char *)HD5f2cstring(name, c_namelen);
+ c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
if (c_name == NULL)
goto done;
- c_attrnamelen = (int)*attrnamelen;
- c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen);
+ c_attrname = (char *)HD5f2cstring(attrname, (size_t)*attrnamelen);
if (c_attrname == NULL)
goto done;
@@ -2152,9 +2088,9 @@ done:
int_f
nh5ltpath_valid_c(hid_t_f *loc_id,
- _fcd path,
- int_f *pathlen,
- int_f *check_object_valid_c)
+ _fcd path,
+ size_t_f *pathlen,
+ int_f *check_object_valid_c)
{
htri_t ret = -1;
char *c_path = NULL;
diff --git a/hl/fortran/src/H5LTff.f90 b/hl/fortran/src/H5LTff.f90
index 8df024e..9393f7f 100644
--- a/hl/fortran/src/H5LTff.f90
+++ b/hl/fortran/src/H5LTff.f90
@@ -171,11 +171,11 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
INTEGER, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTERFACE
INTEGER FUNCTION h5ltmake_dataset_int1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
@@ -187,10 +187,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(in), DIMENSION(*) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_int1_c
END INTERFACE
@@ -237,10 +237,10 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2)) :: buf ! data buffer
@@ -254,10 +254,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_int2_c
@@ -305,10 +305,10 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3)) :: buf ! data buffer
@@ -322,10 +322,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_int3_c
@@ -368,10 +368,10 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! data buffer
@@ -385,10 +385,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_int4_c
@@ -431,10 +431,10 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! data buffer
@@ -448,10 +448,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_int5_c
@@ -494,10 +494,10 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! data buffer
@@ -511,10 +511,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_int6_c
@@ -557,10 +557,10 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! data buffer
@@ -574,10 +574,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_int7_c
@@ -626,11 +626,11 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
REAL, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTERFACE
INTEGER FUNCTION h5ltmake_dataset_fl1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
@@ -642,10 +642,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(in), DIMENSION(*) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_fl1_c
END INTERFACE
@@ -692,10 +692,10 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2)) :: buf ! data buffer
@@ -709,10 +709,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_fl2_c
@@ -760,10 +760,10 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3)) :: buf ! data buffer
@@ -777,10 +777,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_fl3_c
@@ -823,10 +823,10 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! data buffer
@@ -840,10 +840,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3), dims(4)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_fl4_c
@@ -886,10 +886,10 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! data buffer
@@ -903,10 +903,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_fl5_c
@@ -949,10 +949,10 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! data buffer
@@ -966,10 +966,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_fl6_c
@@ -1012,10 +1012,10 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! data buffer
@@ -1029,10 +1029,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_fl7_c
@@ -1080,11 +1080,11 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTERFACE
INTEGER FUNCTION h5ltmake_dataset_dl1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
@@ -1096,10 +1096,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_dl1_c
END INTERFACE
@@ -1146,10 +1146,10 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2)) :: buf ! data buffer
@@ -1163,10 +1163,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_dl2_c
@@ -1214,10 +1214,10 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3)) :: buf ! data buffer
@@ -1231,10 +1231,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_dl3_c
@@ -1277,10 +1277,10 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3), dims(4)) :: buf ! data buffer
@@ -1294,10 +1294,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_dl4_c
@@ -1340,10 +1340,10 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! data buffer
@@ -1357,10 +1357,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_dl5_c
@@ -1403,10 +1403,10 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! data buffer
@@ -1420,10 +1420,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_dl6_c
@@ -1466,10 +1466,10 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! data buffer
@@ -1483,10 +1483,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_dl7_c
@@ -1533,10 +1533,10 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(inout), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTERFACE
INTEGER FUNCTION h5ltread_dataset_int1_c(loc_id,namelen,dset_name,type_id,buf,dims)
@@ -1548,9 +1548,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(HID_T), INTENT(IN) :: loc_id ! file or group identifier
INTEGER(HID_T), INTENT(IN) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(LEN=*), INTENT(IN) :: dset_name ! name of the dataset
- INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims ! size of the bufffer buf
+ INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims ! size of the buffer buf
INTEGER, INTENT(IN), DIMENSION(*) :: buf ! data buffer
END FUNCTION h5ltread_dataset_int1_c
END INTERFACE
@@ -1596,9 +1596,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTEGER, INTENT(inout), &
DIMENSION(dims(1),dims(2)) :: buf ! data buffer
@@ -1612,9 +1612,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_int2_c
@@ -1661,9 +1661,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTEGER, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3)) :: buf ! data buffer
@@ -1677,9 +1677,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_int3_c
@@ -1722,9 +1722,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTEGER, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! data buffer
@@ -1738,9 +1738,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_int4_c
@@ -1783,9 +1783,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTEGER, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! data buffer
@@ -1799,9 +1799,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_int5_c
@@ -1844,9 +1844,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTEGER, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! data buffer
@@ -1860,9 +1860,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_int6_c
@@ -1905,9 +1905,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTEGER, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! data buffer
@@ -1921,9 +1921,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_int7_c
@@ -1971,10 +1971,10 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(inout), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTERFACE
INTEGER FUNCTION h5ltread_dataset_fl1_c(loc_id,namelen,dset_name,type_id,buf,dims)
@@ -1986,9 +1986,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(in), DIMENSION(*) :: buf ! data buffer
END FUNCTION h5ltread_dataset_fl1_c
END INTERFACE
@@ -2035,9 +2035,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
REAL, INTENT(inout), &
DIMENSION(dims(1),dims(2)) :: buf ! data buffer
@@ -2051,9 +2051,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_fl2_c
@@ -2100,9 +2100,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
REAL, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3)) :: buf ! data buffer
@@ -2116,9 +2116,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_fl3_c
@@ -2161,9 +2161,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
REAL, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! data buffer
@@ -2177,9 +2177,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_fl4_c
@@ -2222,9 +2222,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
REAL, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! data buffer
@@ -2238,9 +2238,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_fl5_c
@@ -2283,9 +2283,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
REAL, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! data buffer
@@ -2299,9 +2299,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_fl6_c
@@ -2344,9 +2344,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
REAL, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! data buffer
@@ -2360,9 +2360,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_fl7_c
@@ -2410,10 +2410,10 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(inout), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTERFACE
INTEGER FUNCTION h5ltread_dataset_dl1_c(loc_id,namelen,dset_name,type_id,buf,dims)
@@ -2425,9 +2425,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf ! data buffer
END FUNCTION h5ltread_dataset_dl1_c
END INTERFACE
@@ -2473,9 +2473,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
DOUBLE PRECISION, INTENT(inout), &
DIMENSION(dims(1),dims(2)) :: buf ! data buffer
@@ -2489,9 +2489,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_dl2_c
@@ -2538,9 +2538,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
DOUBLE PRECISION, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3)) :: buf ! data buffer
@@ -2554,9 +2554,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_dl3_c
@@ -2599,9 +2599,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
DOUBLE PRECISION, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! data buffer
@@ -2615,9 +2615,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_dl4_c
@@ -2660,9 +2660,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
DOUBLE PRECISION, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! data buffer
@@ -2676,9 +2676,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_dl5_c
@@ -2721,9 +2721,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
DOUBLE PRECISION, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! data buffer
@@ -2737,9 +2737,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_dl6_c
@@ -2782,9 +2782,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
DOUBLE PRECISION, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! data buffer
@@ -2798,9 +2798,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_dl7_c
@@ -2847,10 +2847,10 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTERFACE
INTEGER FUNCTION h5ltmake_dataset_nint1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
@@ -2862,10 +2862,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(in), DIMENSION(*) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_nint1_c
END INTERFACE
@@ -2911,9 +2911,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2)) :: buf ! data buffer
@@ -2928,10 +2928,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_nint2_c
@@ -2979,9 +2979,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3)) :: buf ! data buffer
@@ -2996,10 +2996,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_nint3_c
@@ -3042,9 +3042,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! data buffer
@@ -3059,10 +3059,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_nint4_c
@@ -3105,9 +3105,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! data buffer
@@ -3122,10 +3122,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_nint5_c
@@ -3168,9 +3168,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! data buffer
@@ -3185,10 +3185,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_nint6_c
@@ -3231,9 +3231,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! data buffer
@@ -3248,10 +3248,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_nint7_c
@@ -3298,10 +3298,10 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTERFACE
INTEGER FUNCTION h5ltmake_dataset_nfl1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
@@ -3313,10 +3313,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(in), DIMENSION(*) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_nfl1_c
END INTERFACE
@@ -3362,9 +3362,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2)) :: buf ! data buffer
@@ -3378,10 +3378,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_nfl2_c
@@ -3428,9 +3428,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3)) :: buf ! data buffer
@@ -3444,10 +3444,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_nfl3_c
@@ -3490,9 +3490,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! data buffer
@@ -3506,10 +3506,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_nfl4_c
@@ -3552,9 +3552,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! data buffer
@@ -3568,10 +3568,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_nfl5_c
@@ -3614,9 +3614,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! data buffer
@@ -3630,10 +3630,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_nfl6_c
@@ -3676,9 +3676,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! data buffer
@@ -3692,10 +3692,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_nfl7_c
@@ -3743,9 +3743,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1)) :: buf ! data buffer
@@ -3759,10 +3759,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_ndl1_c
@@ -3810,9 +3810,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2)) :: buf ! data buffer
@@ -3826,10 +3826,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_ndl2_c
@@ -3876,9 +3876,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3)) :: buf ! data buffer
@@ -3892,10 +3892,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_ndl3_c
@@ -3938,9 +3938,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! data buffer
@@ -3954,10 +3954,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_ndl4_c
@@ -4000,9 +4000,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! data buffer
@@ -4016,10 +4016,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_ndl5_c
@@ -4062,9 +4062,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! data buffer
@@ -4078,10 +4078,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_ndl6_c
@@ -4124,9 +4124,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! data buffer
@@ -4140,10 +4140,10 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(in) :: rank ! rank
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(in), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_ndl7_c
@@ -4188,9 +4188,9 @@ CONTAINS
INTEGER(HID_T), INTENT(IN) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTEGER, INTENT(inout), &
DIMENSION(dims(1)) :: buf ! data buffer
@@ -4204,9 +4204,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(inout), &
DIMENSION(dims(1)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_nint1_c
@@ -4252,9 +4252,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTEGER, INTENT(inout), &
DIMENSION(dims(1),dims(2)) :: buf ! data buffer
@@ -4268,9 +4268,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(inout), &
DIMENSION(dims(1),dims(2)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_nint2_c
@@ -4315,9 +4315,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTEGER, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3)) :: buf ! data buffer
@@ -4331,9 +4331,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_nint3_c
@@ -4374,9 +4374,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTEGER, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! data buffer
@@ -4390,9 +4390,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_nint4_c
@@ -4433,9 +4433,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTEGER, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! data buffer
@@ -4449,9 +4449,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_nint5_c
@@ -4492,9 +4492,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTEGER, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! data buffer
@@ -4508,9 +4508,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_nint6_c
@@ -4551,9 +4551,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTEGER, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! data buffer
@@ -4567,9 +4567,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_nint7_c
@@ -4615,9 +4615,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
REAL, INTENT(inout), &
DIMENSION(dims(1)) :: buf ! data buffer
@@ -4631,9 +4631,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(inout), &
DIMENSION(dims(1)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_nfl1_c
@@ -4679,9 +4679,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
REAL, INTENT(inout), &
DIMENSION(dims(1),dims(2)) :: buf ! data buffer
@@ -4695,9 +4695,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(inout), &
DIMENSION(dims(1),dims(2)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_nfl2_c
@@ -4742,9 +4742,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
REAL, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3)) :: buf ! data buffer
@@ -4758,9 +4758,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_nfl3_c
@@ -4801,9 +4801,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
REAL, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! data buffer
@@ -4817,9 +4817,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_nfl4_c
@@ -4860,9 +4860,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
REAL, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! data buffer
@@ -4876,9 +4876,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_nfl5_c
@@ -4919,9 +4919,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
REAL, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! data buffer
@@ -4935,9 +4935,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_nfl6_c
@@ -4978,9 +4978,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
REAL, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! data buffer
@@ -4994,9 +4994,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
REAL, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_nfl7_c
@@ -5041,9 +5041,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
DOUBLE PRECISION, INTENT(inout), &
DIMENSION(dims(1)) :: buf ! data buffer
@@ -5057,9 +5057,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(inout), &
DIMENSION(dims(1)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_ndl1_c
@@ -5105,9 +5105,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
DOUBLE PRECISION, INTENT(inout), &
DIMENSION(dims(1),dims(2)) :: buf ! data buffer
@@ -5121,9 +5121,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(inout), &
DIMENSION(dims(1),dims(2)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_ndl2_c
@@ -5168,9 +5168,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
DOUBLE PRECISION, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3)) :: buf ! data buffer
@@ -5184,9 +5184,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_ndl3_c
@@ -5227,9 +5227,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
DOUBLE PRECISION, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! data buffer
@@ -5243,9 +5243,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_ndl4_c
@@ -5286,9 +5286,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
DOUBLE PRECISION, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! data buffer
@@ -5302,9 +5302,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_ndl5_c
@@ -5345,9 +5345,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
DOUBLE PRECISION, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! data buffer
@@ -5361,9 +5361,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_ndl6_c
@@ -5404,9 +5404,9 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
DOUBLE PRECISION, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! data buffer
@@ -5420,9 +5420,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
INTEGER(hid_t), INTENT(in) :: type_id ! datatype identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
- INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+ INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
DOUBLE PRECISION, INTENT(inout), &
DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! data buffer
END FUNCTION h5ltread_dataset_ndl7_c
@@ -5457,20 +5457,18 @@ CONTAINS
errcode )
IMPLICIT NONE
-
!
!This definition is needed for Windows DLLs
!DEC$if defined(BUILD_HDF5_HL_DLL)
!DEC$attributes dllexport :: h5ltmake_dataset_string_f
!DEC$endif
!
-
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
CHARACTER(len=*), INTENT(in) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
- INTEGER :: buflen ! buffer length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: buflen ! buffer length
INTERFACE
INTEGER FUNCTION h5ltmake_dataset_string_c(loc_id,namelen,dset_name,buflen,buf)
@@ -5481,8 +5479,8 @@ CONTAINS
!DEC$ENDIF
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
- INTEGER :: namelen ! lenght of name buffer
- INTEGER :: buflen ! lenght of data buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
+ INTEGER(size_t) :: buflen ! length of data buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
CHARACTER(len=*), INTENT(in) :: buf ! data buffer
END FUNCTION h5ltmake_dataset_string_c
@@ -5529,7 +5527,7 @@ CONTAINS
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
CHARACTER(len=*), INTENT(inout) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTERFACE
INTEGER FUNCTION h5ltread_dataset_string_c(loc_id,namelen,dset_name,buf)
@@ -5540,7 +5538,7 @@ CONTAINS
!DEC$ENDIF
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
CHARACTER(len=*), INTENT(inout) :: buf ! data buffer
END FUNCTION h5ltread_dataset_string_c
@@ -5598,8 +5596,8 @@ CONTAINS
INTEGER(size_t), INTENT(in) :: size ! size of attribute array
INTEGER :: errcode ! error code
INTEGER, INTENT(in), DIMENSION(*) :: buf ! data buffer
- INTEGER :: namelen ! name length
- INTEGER :: attrlen ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: attrlen ! name length
INTERFACE
INTEGER FUNCTION h5ltset_attribute_int_c(loc_id,namelen,dset_name,attrlen,attr_name,size,buf)
@@ -5611,8 +5609,8 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
!DEC$ATTRIBUTES reference :: attr_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
- INTEGER :: namelen ! lenght of name buffer
- INTEGER :: attrlen ! lenght of attr name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
+ INTEGER(size_t) :: attrlen ! length of attr name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
CHARACTER(len=*), INTENT(in) :: attr_name ! name of the attribute
INTEGER(size_t), INTENT(in) :: size ! size of attribute array
@@ -5665,8 +5663,8 @@ CONTAINS
INTEGER(size_t), INTENT(in) :: size ! size of attribute array
INTEGER :: errcode ! error code
REAL, INTENT(in), DIMENSION(*) :: buf ! data buffer
- INTEGER :: namelen ! name length
- INTEGER :: attrlen ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: attrlen ! name length
INTERFACE
INTEGER FUNCTION h5ltset_attribute_float_c(loc_id,namelen,dset_name,attrlen,attr_name,size,buf)
@@ -5678,8 +5676,8 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
!DEC$ATTRIBUTES reference :: attr_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
- INTEGER :: namelen ! lenght of name buffer
- INTEGER :: attrlen ! lenght of attr name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
+ INTEGER(size_t) :: attrlen ! length of attr name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
CHARACTER(len=*), INTENT(in) :: attr_name ! name of the attribute
INTEGER(size_t), INTENT(in) :: size ! size of attribute array
@@ -5732,8 +5730,8 @@ CONTAINS
INTEGER(size_t), INTENT(in) :: size ! size of attribute array
INTEGER :: errcode ! error code
DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf ! data buffer
- INTEGER :: namelen ! name length
- INTEGER :: attrlen ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: attrlen ! name length
INTERFACE
INTEGER FUNCTION h5ltset_attribute_double_c(loc_id,namelen,dset_name,attrlen,attr_name,size,buf)
@@ -5745,8 +5743,8 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
!DEC$ATTRIBUTES reference :: attr_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
- INTEGER :: namelen ! lenght of name buffer
- INTEGER :: attrlen ! lenght of attr name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
+ INTEGER(size_t) :: attrlen ! length of attr name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
CHARACTER(len=*), INTENT(in) :: attr_name ! name of the attribute
INTEGER(size_t), INTENT(in) :: size ! size of attribute array
@@ -5798,9 +5796,9 @@ CONTAINS
CHARACTER(len=*), INTENT(in) :: attr_name ! name of the attribute
INTEGER :: errcode ! error code
CHARACTER(len=*), INTENT(in) :: buf ! data buffer
- INTEGER :: namelen ! name length
- INTEGER :: attrlen ! name length
- INTEGER :: buflen ! data buffer length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: attrlen ! name length
+ INTEGER(size_t) :: buflen ! data buffer length
INTERFACE
INTEGER FUNCTION h5ltset_attribute_string_c(loc_id,namelen,dset_name,attrlen,attr_name,buflen,buf)
@@ -5812,9 +5810,9 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
!DEC$ATTRIBUTES reference :: attr_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
- INTEGER :: namelen ! lenght of name buffer
- INTEGER :: attrlen ! lenght of attr name buffer
- INTEGER :: buflen ! data buffer length
+ INTEGER(size_t) :: namelen ! length of name buffer
+ INTEGER(size_t) :: attrlen ! length of attr name buffer
+ INTEGER(size_t) :: buflen ! data buffer length
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
CHARACTER(len=*), INTENT(in) :: attr_name ! name of the attribute
CHARACTER(len=*), INTENT(in) :: buf ! data buffer
@@ -5867,8 +5865,8 @@ CONTAINS
CHARACTER(len=*), INTENT(in) :: attr_name ! name of the attribute
INTEGER :: errcode ! error code
INTEGER, INTENT(inout), DIMENSION(*) :: buf ! data buffer
- INTEGER :: namelen ! name length
- INTEGER :: attrlen ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: attrlen ! name length
INTERFACE
INTEGER FUNCTION h5ltget_attribute_int_c(loc_id,namelen,dset_name,attrlen,attr_name,buf)
@@ -5880,11 +5878,11 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
!DEC$ATTRIBUTES reference :: attr_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
- INTEGER :: namelen ! lenght of name buffer
- INTEGER :: attrlen ! lenght of attr name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
+ INTEGER(size_t) :: attrlen ! length of attr name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
CHARACTER(len=*), INTENT(in) :: attr_name ! name of the attribute
- INTEGER, INTENT(inout), DIMENSION(*) :: buf ! data buffer
+ INTEGER, INTENT(inout), DIMENSION(*) :: buf ! data buffer
END FUNCTION h5ltget_attribute_int_c
END INTERFACE
@@ -5932,8 +5930,8 @@ CONTAINS
CHARACTER(len=*), INTENT(in) :: attr_name ! name of the attribute
INTEGER :: errcode ! error code
REAL, INTENT(inout), DIMENSION(*) :: buf ! data buffer
- INTEGER :: namelen ! name length
- INTEGER :: attrlen ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: attrlen ! name length
INTERFACE
INTEGER FUNCTION h5ltget_attribute_float_c(loc_id,namelen,dset_name,attrlen,attr_name,buf)
@@ -5945,8 +5943,8 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
!DEC$ATTRIBUTES reference :: attr_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
- INTEGER :: namelen ! lenght of name buffer
- INTEGER :: attrlen ! lenght of attr name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
+ INTEGER(size_t) :: attrlen ! length of attr name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
CHARACTER(len=*), INTENT(in) :: attr_name ! name of the attribute
REAL, INTENT(inout), DIMENSION(*) :: buf ! data buffer
@@ -5996,8 +5994,8 @@ CONTAINS
CHARACTER(len=*), INTENT(in) :: attr_name ! name of the attribute
INTEGER :: errcode ! error code
DOUBLE PRECISION,INTENT(inout),DIMENSION(*) :: buf ! data buffer
- INTEGER :: namelen ! name length
- INTEGER :: attrlen ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: attrlen ! name length
INTERFACE
INTEGER FUNCTION h5ltget_attribute_double_c(loc_id,namelen,dset_name,attrlen,attr_name,buf)
@@ -6009,8 +6007,8 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
!DEC$ATTRIBUTES reference :: attr_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
- INTEGER :: namelen ! lenght of name buffer
- INTEGER :: attrlen ! lenght of attr name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
+ INTEGER(size_t) :: attrlen ! length of attr name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
CHARACTER(len=*), INTENT(in) :: attr_name ! name of the attribute
DOUBLE PRECISION, INTENT(inout), DIMENSION(*) :: buf ! data buffer
@@ -6060,8 +6058,8 @@ CONTAINS
CHARACTER(len=*), INTENT(in) :: attr_name ! name of the attribute
INTEGER :: errcode ! error code
CHARACTER(len=*), INTENT(inout) :: buf ! data buffer
- INTEGER :: namelen ! name length
- INTEGER :: attrlen ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: attrlen ! name length
INTEGER(size_t) :: buf_size ! buf size
INTERFACE
@@ -6074,8 +6072,8 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
!DEC$ATTRIBUTES reference :: attr_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
- INTEGER :: namelen ! lenght of name buffer
- INTEGER :: attrlen ! lenght of attr name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
+ INTEGER(size_t) :: attrlen ! length of attr name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
CHARACTER(len=*), INTENT(in) :: attr_name ! name of the attribute
CHARACTER(len=*), INTENT(inout) :: buf ! data buffer
@@ -6130,7 +6128,7 @@ CONTAINS
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(inout) :: rank ! rank
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTERFACE
INTEGER FUNCTION h5ltget_dataset_ndims_c(loc_id,namelen,dset_name,rank)
@@ -6141,7 +6139,7 @@ CONTAINS
!DEC$ENDIF
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER, INTENT(inout) :: rank ! rank
END FUNCTION h5ltget_dataset_ndims_c
@@ -6186,7 +6184,7 @@ CONTAINS
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTERFACE
INTEGER FUNCTION h5ltfind_dataset_c(loc_id,namelen,dset_name)
@@ -6197,7 +6195,7 @@ CONTAINS
!DEC$ENDIF
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
END FUNCTION h5ltfind_dataset_c
END INTERFACE
@@ -6247,7 +6245,7 @@ CONTAINS
INTEGER, INTENT(inout) :: type_class ! type class
INTEGER(size_t), INTENT(inout) :: type_size ! type size
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTERFACE
INTEGER FUNCTION h5ltget_dataset_info_c(loc_id,namelen,dset_name,dims,type_class,type_size)
@@ -6258,7 +6256,7 @@ CONTAINS
!DEC$ENDIF
!DEC$ATTRIBUTES reference :: dset_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
- INTEGER :: namelen ! lenght of name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER(hsize_t),DIMENSION(*),INTENT(inout):: dims ! dimensions
INTEGER, INTENT(inout) :: type_class ! type class
@@ -6314,8 +6312,8 @@ CONTAINS
CHARACTER(len=*), INTENT(in) :: attr_name ! name of the attribute
INTEGER, INTENT(inout) :: rank ! rank
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
- INTEGER :: attrlen ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: attrlen ! name length
INTERFACE
INTEGER FUNCTION h5ltget_attribute_ndims_c(loc_id,namelen,dset_name,attrlen,attr_name,rank)
@@ -6327,8 +6325,8 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
!DEC$ATTRIBUTES reference :: attr_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
- INTEGER :: namelen ! lenght of name buffer
- INTEGER :: attrlen ! lenght of attr name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
+ INTEGER(size_t) :: attrlen ! length of attr name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
CHARACTER(len=*), INTENT(in) :: attr_name ! name of the attribute
INTEGER, INTENT(inout) :: rank ! rank
@@ -6383,8 +6381,8 @@ CONTAINS
INTEGER, INTENT(inout) :: type_class ! type class
INTEGER(size_t), INTENT(inout) :: type_size ! type size
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
- INTEGER :: attrlen ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: attrlen ! name length
INTERFACE
INTEGER FUNCTION h5ltget_attribute_info_c(loc_id,namelen,dset_name,attrlen,attr_name,dims,type_class,type_size)
@@ -6396,8 +6394,8 @@ CONTAINS
!DEC$ATTRIBUTES reference :: dset_name
!DEC$ATTRIBUTES reference :: attr_name
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
- INTEGER :: namelen ! lenght of name buffer
- INTEGER :: attrlen ! lenght of attr name buffer
+ INTEGER(size_t) :: namelen ! length of name buffer
+ INTEGER(size_t) :: attrlen ! length of attr name buffer
CHARACTER(len=*), INTENT(in) :: dset_name ! name of the dataset
CHARACTER(len=*), INTENT(in) :: attr_name ! name of the attribute
INTEGER(hsize_t),DIMENSION(*),INTENT(inout):: dims ! dimensions
@@ -6445,7 +6443,7 @@ CONTAINS
LOGICAL , INTENT(OUT) :: path_valid ! Object status
INTEGER , INTENT(OUT) :: errcode ! Error code: 0 on success and -1 on failure
- INTEGER :: pathlen
+ INTEGER(size_t) :: pathlen
INTEGER :: check_object_valid_c
INTEGER :: status
@@ -6459,7 +6457,7 @@ CONTAINS
!DEC$ATTRIBUTES reference :: path
INTEGER(hid_t), INTENT(in) :: loc_id
CHARACTER(len=*), INTENT(in) :: path
- INTEGER :: pathlen
+ INTEGER(size_t) :: pathlen
INTEGER :: check_object_valid_c
END FUNCTION h5ltpath_valid_c
END INTERFACE
diff --git a/hl/fortran/src/H5TBfc.c b/hl/fortran/src/H5TBfc.c
index 0efc9a8..bf058fd 100644
--- a/hl/fortran/src/H5TBfc.c
+++ b/hl/fortran/src/H5TBfc.c
@@ -37,10 +37,10 @@
*-------------------------------------------------------------------------
*/
int_f
-nh5tbmake_table_c(int_f *namelen1,
+nh5tbmake_table_c(size_t_f *namelen1,
_fcd name1,
hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hsize_t_f *nfields,
hsize_t_f *nrecords,
@@ -49,8 +49,8 @@ nh5tbmake_table_c(int_f *namelen1,
hid_t_f *field_types,
hsize_t_f *chunk_size,
int_f *compress,
- int_f *char_len_field_names, /* field_names lenghts */
- int_f *max_char_size_field_names, /* char len of fields */
+ size_t_f *char_len_field_names, /* field_names lenghts */
+ size_t_f *max_char_size_field_names, /* char len of fields */
char *field_names) /* field_names */
{
char *c_name = NULL;
@@ -64,7 +64,7 @@ nh5tbmake_table_c(int_f *namelen1,
char *tmp = NULL, *tmp_p;
int_f ret_value = 0;
- num_elem = *nfields;
+ num_elem = (hsize_t)*nfields;
/*
* convert FORTRAN name to C name
@@ -79,7 +79,7 @@ nh5tbmake_table_c(int_f *namelen1,
HGOTO_DONE(FAIL)
for(i = 0; i < num_elem; i++) {
- c_field_offset[i] = field_offset[i];
+ c_field_offset[i] = (size_t)field_offset[i];
c_field_types[i] = field_types[i];
} /* end for */
@@ -100,7 +100,7 @@ nh5tbmake_table_c(int_f *namelen1,
if(NULL == (c_field_names[i] = (char *)HDmalloc((size_t)char_len_field_names[i] + 1)))
HGOTO_DONE(FAIL)
HDmemcpy(c_field_names[i], tmp_p, (size_t)char_len_field_names[i]);
- c_field_names[i][char_len_field_names[i]] = '\0';
+ c_field_names[i][char_len_field_names[i]] = '\0';
tmp_p = tmp_p + *max_char_size_field_names;
} /* end for */
@@ -123,7 +123,7 @@ done:
if(c_field_names[i])
HDfree(c_field_names[i]);
} /* end for */
- HDfree(c_field_names);
+ HDfree(c_field_names);
} /* end if */
if(tmp)
HDfree(tmp);
@@ -152,9 +152,9 @@ done:
*/
int_f
nh5tbwrite_field_name_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hsize_t_f *start,
hsize_t_f *nrecords,
@@ -192,9 +192,9 @@ done:
int_f
nh5tbwrite_field_name_int_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hsize_t_f *start,
hsize_t_f *nrecords,
@@ -207,9 +207,9 @@ nh5tbwrite_field_name_int_c(hid_t_f *loc_id,
int_f
nh5tbwrite_field_name_fl_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hsize_t_f *start,
hsize_t_f *nrecords,
@@ -222,9 +222,9 @@ nh5tbwrite_field_name_fl_c(hid_t_f *loc_id,
int_f
nh5tbwrite_field_name_dl_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hsize_t_f *start,
hsize_t_f *nrecords,
@@ -237,9 +237,9 @@ nh5tbwrite_field_name_dl_c(hid_t_f *loc_id,
int_f
nh5tbwrite_field_name_st_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hsize_t_f *start,
hsize_t_f *nrecords,
@@ -267,9 +267,9 @@ nh5tbwrite_field_name_st_c(hid_t_f *loc_id,
*/
int_f
nh5tbread_field_name_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hsize_t_f *start,
hsize_t_f *nrecords,
@@ -307,9 +307,9 @@ done:
int_f
nh5tbread_field_name_int_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hsize_t_f *start,
hsize_t_f *nrecords,
@@ -322,9 +322,9 @@ nh5tbread_field_name_int_c(hid_t_f *loc_id,
int_f
nh5tbread_field_name_fl_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hsize_t_f *start,
hsize_t_f *nrecords,
@@ -337,9 +337,9 @@ nh5tbread_field_name_fl_c(hid_t_f *loc_id,
int_f
nh5tbread_field_name_dl_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hsize_t_f *start,
hsize_t_f *nrecords,
@@ -352,9 +352,9 @@ nh5tbread_field_name_dl_c(hid_t_f *loc_id,
int_f
nh5tbread_field_name_st_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hsize_t_f *start,
hsize_t_f *nrecords,
@@ -382,7 +382,7 @@ nh5tbread_field_name_st_c(hid_t_f *loc_id,
*/
int_f
nh5tbwrite_field_index_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *field_index,
hsize_t_f *start,
@@ -418,7 +418,7 @@ done:
int_f
nh5tbwrite_field_index_int_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *field_index,
hsize_t_f *start,
@@ -432,7 +432,7 @@ nh5tbwrite_field_index_int_c(hid_t_f *loc_id,
int_f
nh5tbwrite_field_index_fl_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *field_index,
hsize_t_f *start,
@@ -446,7 +446,7 @@ nh5tbwrite_field_index_fl_c(hid_t_f *loc_id,
int_f
nh5tbwrite_field_index_dl_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *field_index,
hsize_t_f *start,
@@ -460,7 +460,7 @@ nh5tbwrite_field_index_dl_c(hid_t_f *loc_id,
int_f
nh5tbwrite_field_index_st_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *field_index,
hsize_t_f *start,
@@ -489,7 +489,7 @@ nh5tbwrite_field_index_st_c(hid_t_f *loc_id,
*/
int_f
nh5tbread_field_index_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *field_index,
hsize_t_f *start,
@@ -524,7 +524,7 @@ done:
int_f
nh5tbread_field_index_int_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *field_index,
hsize_t_f *start,
@@ -538,7 +538,7 @@ nh5tbread_field_index_int_c(hid_t_f *loc_id,
int_f
nh5tbread_field_index_fl_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *field_index,
hsize_t_f *start,
@@ -552,7 +552,7 @@ nh5tbread_field_index_fl_c(hid_t_f *loc_id,
int_f
nh5tbread_field_index_dl_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *field_index,
hsize_t_f *start,
@@ -566,7 +566,7 @@ nh5tbread_field_index_dl_c(hid_t_f *loc_id,
int_f
nh5tbread_field_index_st_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
int_f *field_index,
hsize_t_f *start,
@@ -595,9 +595,9 @@ nh5tbread_field_index_st_c(hid_t_f *loc_id,
*/
int_f
nh5tbinsert_field_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hid_t_f *field_type,
int_f *position,
@@ -633,9 +633,9 @@ done:
int_f
nh5tbinsert_field_int_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hid_t_f *field_type,
int_f *position,
@@ -647,9 +647,9 @@ nh5tbinsert_field_int_c(hid_t_f *loc_id,
int_f
nh5tbinsert_field_fl_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hid_t_f *field_type,
int_f *position,
@@ -661,9 +661,9 @@ nh5tbinsert_field_fl_c(hid_t_f *loc_id,
int_f
nh5tbinsert_field_dl_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hid_t_f *field_type,
int_f *position,
@@ -675,9 +675,9 @@ nh5tbinsert_field_dl_c(hid_t_f *loc_id,
int_f
nh5tbinsert_field_st_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name,
hid_t_f *field_type,
int_f *position,
@@ -704,9 +704,9 @@ nh5tbinsert_field_st_c(hid_t_f *loc_id,
*/
int_f
nh5tbdelete_field_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
- int_f *namelen1,
+ size_t_f *namelen1,
_fcd field_name)
{
char *c_name = NULL;
@@ -753,7 +753,7 @@ done:
*/
int_f
nh5tbget_table_info_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hsize_t_f *nfields,
hsize_t_f *nrecords)
@@ -803,16 +803,16 @@ done:
*/
int_f
nh5tbget_field_info_c(hid_t_f *loc_id,
- int_f *namelen,
+ size_t_f *namelen,
_fcd name,
hsize_t_f *nfields,
size_t_f *field_sizes,
size_t_f *field_offsets,
size_t_f *type_size,
- int_f *namelen2, /* field_names lenghts */
- int_f *lenmax, /* character len max */
+ size_t_f *namelen2, /* field_names lenghts */
+ size_t_f *lenmax, /* character len max */
_fcd field_names, /* field_names */
- int_f *maxlen_out)
+ size_t_f *maxlen_out)
{
char *c_name = NULL;
@@ -867,9 +867,9 @@ nh5tbget_field_info_c(hid_t_f *loc_id,
size_t field_name_len = HDstrlen(c_field_names[i]);
HDmemcpy(tmp_p, c_field_names[i], field_name_len);
- namelen2[i] = (int_f)field_name_len;
- length = MAX(length, strlen((c_field_names[i])));
- tmp_p = tmp_p + c_lenmax;
+ namelen2[i] = (size_t_f)field_name_len;
+ length = MAX(length, strlen((c_field_names[i])));
+ tmp_p = tmp_p + c_lenmax;
} /* end for */
HD5packFstring(tmp, _fcdtocp(field_names), (size_t)( c_lenmax* c_nfields));
@@ -880,7 +880,7 @@ nh5tbget_field_info_c(hid_t_f *loc_id,
field_offsets[i] = (size_t_f)c_field_offsets[i];
} /* end for */
- *maxlen_out = (int_f)length;
+ *maxlen_out = (size_t_f)length;
done:
if(c_name)
diff --git a/hl/fortran/src/H5TBff.f90 b/hl/fortran/src/H5TBff.f90
index 8d31a93..5846f49 100644
--- a/hl/fortran/src/H5TBff.f90
+++ b/hl/fortran/src/H5TBff.f90
@@ -93,14 +93,12 @@ SUBROUTINE h5tbmake_table_f(table_title,&
errcode )
IMPLICIT NONE
-
!
!This definition is needed for Windows DLLs
!DEC$if defined(BUILD_HDF5_HL_DLL)
!DEC$attributes dllexport :: h5tbmake_table_f
!DEC$endif
!
-
CHARACTER(LEN=*), INTENT(in) :: table_title ! name of the dataset
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(LEN=*), INTENT(in) :: dset_name ! name of the dataset
@@ -112,12 +110,12 @@ SUBROUTINE h5tbmake_table_f(table_title,&
INTEGER(hid_t), DIMENSION(1:nfields), INTENT(in) :: field_types ! field types
INTEGER(hsize_t), INTENT(in) :: chunk_size ! chunk size
INTEGER, INTENT(in) :: compress ! compress
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length
INTEGER :: errcode ! error code
- INTEGER, DIMENSION(1:nfields) :: char_len_field_names ! field name lengths
- INTEGER :: max_char_size_field_names ! character len of field names
- INTEGER :: i ! general purpose integer
+ INTEGER(size_t), DIMENSION(1:nfields) :: char_len_field_names ! field name lengths
+ INTEGER(size_t) :: max_char_size_field_names ! character len of field names
+ INTEGER(hsize_t) :: i ! general purpose integer
INTERFACE
@@ -155,10 +153,10 @@ SUBROUTINE h5tbmake_table_f(table_title,&
INTEGER(hid_t), DIMENSION(nfields), INTENT(in) :: field_types ! field types
INTEGER(hsize_t), INTENT(in) :: chunk_size ! chunk size
INTEGER, INTENT(in) :: compress ! compress
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length
- INTEGER, DIMENSION(nfields) :: char_len_field_names ! field name's lengths
- INTEGER :: max_char_size_field_names ! character len of field names
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length
+ INTEGER(size_t), DIMENSION(nfields) :: char_len_field_names ! field name's lengths
+ INTEGER(size_t) :: max_char_size_field_names ! character len of field names
END FUNCTION h5tbmake_table_c
END INTERFACE
@@ -232,8 +230,8 @@ SUBROUTINE h5tbwrite_field_name_f_int(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
INTEGER, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length
INTERFACE
INTEGER FUNCTION h5tbwrite_field_name_int_c(loc_id,namelen,dset_name,namelen1,field_name,&
@@ -254,8 +252,8 @@ SUBROUTINE h5tbwrite_field_name_f_int(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
INTEGER, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length
END FUNCTION h5tbwrite_field_name_int_c
END INTERFACE
@@ -308,8 +306,8 @@ SUBROUTINE h5tbwrite_field_name_f_float(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
REAL, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length
INTERFACE
INTEGER FUNCTION h5tbwrite_field_name_fl_c(loc_id,namelen,dset_name,namelen1,field_name,&
@@ -330,8 +328,8 @@ SUBROUTINE h5tbwrite_field_name_f_float(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
REAL, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length
END FUNCTION h5tbwrite_field_name_fl_c
END INTERFACE
@@ -386,8 +384,8 @@ SUBROUTINE h5tbwrite_field_name_f_double(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length
INTERFACE
INTEGER FUNCTION h5tbwrite_field_name_dl_c(loc_id,namelen,dset_name,namelen1,field_name,&
@@ -408,8 +406,8 @@ SUBROUTINE h5tbwrite_field_name_f_double(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length
END FUNCTION h5tbwrite_field_name_dl_c
END INTERFACE
@@ -462,8 +460,8 @@ SUBROUTINE h5tbwrite_field_name_f_string(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length
INTERFACE
INTEGER FUNCTION h5tbwrite_field_name_st_c(loc_id,namelen,dset_name,namelen1,field_name,&
@@ -484,8 +482,8 @@ SUBROUTINE h5tbwrite_field_name_f_string(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length
END FUNCTION h5tbwrite_field_name_st_c
END INTERFACE
@@ -539,8 +537,8 @@ SUBROUTINE h5tbread_field_name_f_int(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
INTEGER, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length
INTERFACE
INTEGER FUNCTION h5tbread_field_name_int_c(loc_id,namelen,dset_name,namelen1,field_name,&
@@ -561,8 +559,8 @@ SUBROUTINE h5tbread_field_name_f_int(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
INTEGER, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length
END FUNCTION h5tbread_field_name_int_c
END INTERFACE
@@ -615,8 +613,8 @@ SUBROUTINE h5tbread_field_name_f_float(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
REAL, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length
INTERFACE
INTEGER FUNCTION h5tbread_field_name_fl_c(loc_id,namelen,dset_name,namelen1,field_name,&
@@ -637,8 +635,8 @@ SUBROUTINE h5tbread_field_name_f_float(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
REAL, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length
END FUNCTION h5tbread_field_name_fl_c
END INTERFACE
@@ -691,8 +689,8 @@ SUBROUTINE h5tbread_field_name_f_double(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length
INTERFACE
INTEGER FUNCTION h5tbread_field_name_dl_c(loc_id,namelen,dset_name,namelen1,field_name,&
@@ -713,8 +711,8 @@ SUBROUTINE h5tbread_field_name_f_double(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length
END FUNCTION h5tbread_field_name_dl_c
END INTERFACE
@@ -767,8 +765,8 @@ SUBROUTINE h5tbread_field_name_f_string(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length
INTERFACE
INTEGER FUNCTION h5tbread_field_name_st_c(loc_id,namelen,dset_name,namelen1,field_name,&
@@ -789,8 +787,8 @@ SUBROUTINE h5tbread_field_name_f_string(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length
END FUNCTION h5tbread_field_name_st_c
END INTERFACE
@@ -844,7 +842,7 @@ SUBROUTINE h5tbwrite_field_index_f_int(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
INTEGER, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTERFACE
INTEGER FUNCTION h5tbwrite_field_index_int_c(loc_id,namelen,dset_name,field_index,&
@@ -864,7 +862,7 @@ SUBROUTINE h5tbwrite_field_index_f_int(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
INTEGER, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
END FUNCTION h5tbwrite_field_index_int_c
END INTERFACE
@@ -916,7 +914,7 @@ SUBROUTINE h5tbwrite_field_index_f_float(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
REAL, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTERFACE
INTEGER FUNCTION h5tbwrite_field_index_fl_c(loc_id,namelen,dset_name,field_index,&
@@ -936,7 +934,7 @@ SUBROUTINE h5tbwrite_field_index_f_float(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
REAL, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
END FUNCTION h5tbwrite_field_index_fl_c
END INTERFACE
@@ -990,7 +988,7 @@ SUBROUTINE h5tbwrite_field_index_f_double(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTERFACE
INTEGER FUNCTION h5tbwrite_field_index_dl_c(loc_id,namelen,dset_name,field_index,&
@@ -1010,7 +1008,7 @@ SUBROUTINE h5tbwrite_field_index_f_double(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
END FUNCTION h5tbwrite_field_index_dl_c
END INTERFACE
@@ -1062,7 +1060,7 @@ SUBROUTINE h5tbwrite_field_index_f_string(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTERFACE
INTEGER FUNCTION h5tbwrite_field_index_st_c(loc_id,namelen,dset_name,field_index,&
@@ -1082,7 +1080,7 @@ SUBROUTINE h5tbwrite_field_index_f_string(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
END FUNCTION h5tbwrite_field_index_st_c
END INTERFACE
@@ -1135,7 +1133,7 @@ SUBROUTINE h5tbread_field_index_f_int(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
INTEGER, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTERFACE
INTEGER FUNCTION h5tbread_field_index_int_c(loc_id,namelen,dset_name,field_index,&
@@ -1155,7 +1153,7 @@ SUBROUTINE h5tbread_field_index_f_int(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
INTEGER, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
END FUNCTION h5tbread_field_index_int_c
END INTERFACE
@@ -1207,7 +1205,7 @@ SUBROUTINE h5tbread_field_index_f_float(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
REAL, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTERFACE
INTEGER FUNCTION h5tbread_field_index_fl_c(loc_id,namelen,dset_name,field_index,&
@@ -1227,7 +1225,7 @@ SUBROUTINE h5tbread_field_index_f_float(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
REAL, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
END FUNCTION h5tbread_field_index_fl_c
END INTERFACE
@@ -1279,7 +1277,7 @@ SUBROUTINE h5tbread_field_index_f_double(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTERFACE
INTEGER FUNCTION h5tbread_field_index_dl_c(loc_id,namelen,dset_name,field_index,&
@@ -1299,7 +1297,7 @@ SUBROUTINE h5tbread_field_index_f_double(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
END FUNCTION h5tbread_field_index_dl_c
END INTERFACE
@@ -1351,7 +1349,7 @@ SUBROUTINE h5tbread_field_index_f_string(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTERFACE
INTEGER FUNCTION h5tbread_field_index_st_c(loc_id,namelen,dset_name,field_index,&
@@ -1371,7 +1369,7 @@ SUBROUTINE h5tbread_field_index_f_string(loc_id,&
INTEGER(size_t), INTENT(in) :: type_size ! type size
CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf ! data buffer
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
END FUNCTION h5tbread_field_index_st_c
END INTERFACE
@@ -1420,8 +1418,8 @@ SUBROUTINE h5tbinsert_field_f_int(loc_id,&
INTEGER(hid_t), INTENT(in) :: field_type ! field type
INTEGER, INTENT(in) :: field_index ! field_index
INTEGER, INTENT(in), DIMENSION(*) :: buf ! data buffer
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length
INTEGER :: errcode ! error code
@@ -1442,8 +1440,8 @@ SUBROUTINE h5tbinsert_field_f_int(loc_id,&
INTEGER(hid_t), INTENT(in) :: field_type ! field type
INTEGER, INTENT(in) :: field_index ! field_index
INTEGER, INTENT(in), DIMENSION(*) :: buf ! data buffer
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length length
END FUNCTION h5tbinsert_field_int_c
END INTERFACE
@@ -1494,8 +1492,8 @@ SUBROUTINE h5tbinsert_field_f_float(loc_id,&
INTEGER(hid_t), INTENT(in) :: field_type ! field type
INTEGER, INTENT(in) :: field_index ! field_index
REAL, INTENT(in), DIMENSION(*) :: buf ! data buffer
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length
INTEGER :: errcode ! error code
@@ -1516,8 +1514,8 @@ SUBROUTINE h5tbinsert_field_f_float(loc_id,&
INTEGER(hid_t), INTENT(in) :: field_type ! field type
INTEGER, INTENT(in) :: field_index ! field_index
REAL, INTENT(in), DIMENSION(*) :: buf ! data buffer
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length length
END FUNCTION h5tbinsert_field_fl_c
END INTERFACE
@@ -1568,8 +1566,8 @@ SUBROUTINE h5tbinsert_field_f_double(loc_id,&
INTEGER(hid_t), INTENT(in) :: field_type ! field type
INTEGER, INTENT(in) :: field_index ! field_index
DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf ! data buffer
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length
INTEGER :: errcode ! error code
@@ -1590,8 +1588,8 @@ SUBROUTINE h5tbinsert_field_f_double(loc_id,&
INTEGER(hid_t), INTENT(in) :: field_type ! field type
INTEGER, INTENT(in) :: field_index ! field_index
DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf ! data buffer
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length length
END FUNCTION h5tbinsert_field_dl_c
END INTERFACE
@@ -1643,8 +1641,8 @@ SUBROUTINE h5tbinsert_field_f_string(loc_id,&
INTEGER(hid_t), INTENT(in) :: field_type ! field type
INTEGER, INTENT(in) :: field_index ! field_index
CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf ! data buffer
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length
INTEGER :: errcode ! error code
@@ -1665,8 +1663,8 @@ SUBROUTINE h5tbinsert_field_f_string(loc_id,&
INTEGER(hid_t), INTENT(in) :: field_type ! field type
INTEGER, INTENT(in) :: field_index ! field_index
CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf ! data buffer
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length length
END FUNCTION h5tbinsert_field_st_c
END INTERFACE
@@ -1712,8 +1710,8 @@ SUBROUTINE h5tbdelete_field_f(loc_id,&
INTEGER(hid_t), INTENT(in) :: loc_id ! file or group identifier
CHARACTER(LEN=*), INTENT(in) :: dset_name ! name of the dataset
CHARACTER(LEN=*), INTENT(in) :: field_name ! name of the field
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length
INTEGER :: errcode ! error code
@@ -1730,8 +1728,8 @@ SUBROUTINE h5tbdelete_field_f(loc_id,&
INTEGER(HID_T), INTENT(IN) :: loc_id ! file or group identifier
CHARACTER(LEN=*), INTENT(IN) :: dset_name ! name of the dataset
CHARACTER(LEN=*), INTENT(IN) :: field_name ! name of the field
- INTEGER :: namelen ! name length
- INTEGER :: namelen1 ! name length length
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: namelen1 ! name length length
END FUNCTION h5tbdelete_field_c
END INTERFACE
@@ -1781,7 +1779,7 @@ SUBROUTINE h5tbget_table_info_f(loc_id,&
INTEGER(hsize_t), INTENT(inout):: nfields ! nfields
INTEGER(hsize_t), INTENT(inout):: nrecords ! nrecords
INTEGER :: errcode ! error code
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
INTERFACE
INTEGER FUNCTION h5tbget_table_info_c(loc_id,namelen,dset_name,nfields,nrecords)
@@ -1795,7 +1793,7 @@ SUBROUTINE h5tbget_table_info_f(loc_id,&
CHARACTER(LEN=*), INTENT(in) :: dset_name ! name of the dataset
INTEGER(hsize_t), INTENT(inout):: nfields ! nfields
INTEGER(hsize_t), INTENT(inout):: nrecords ! nrecords
- INTEGER :: namelen ! name length
+ INTEGER(size_t) :: namelen ! name length
END FUNCTION h5tbget_table_info_c
END INTERFACE
@@ -1819,7 +1817,7 @@ END SUBROUTINE h5tbget_table_info_f
! Comments:
!
! Modifications:
-! Added optional parameter for returning the maximum character lenght
+! Added optional parameter for returning the maximum character length
! in the field name array. March 3, 2011
!
!-------------------------------------------------------------------------
@@ -1828,9 +1826,9 @@ SUBROUTINE h5tbget_field_info_f(loc_id,&
dset_name,&
nfields,&
field_names,&
- field_sizes,&
- field_offsets,&
- type_size,&
+ field_sizes,&
+ field_offsets,&
+ type_size,&
errcode, maxlen_out )
IMPLICIT NONE
@@ -1849,11 +1847,11 @@ SUBROUTINE h5tbget_field_info_f(loc_id,&
INTEGER(size_t), INTENT(inout):: type_size ! type size
INTEGER :: errcode ! error code
INTEGER, OPTIONAL :: maxlen_out ! maximum character len of the field names
- INTEGER :: namelen ! name length
- INTEGER, DIMENSION(nfields) :: namelen2 ! name lengths
- INTEGER :: i ! general purpose integer
- INTEGER :: maxlen
- INTEGER :: c_maxlen_out
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t), DIMENSION(nfields) :: namelen2 ! name lengths
+ INTEGER(hsize_t) :: i ! general purpose integer
+ INTEGER(size_t) :: maxlen
+ INTEGER(size_t) :: c_maxlen_out
INTERFACE
INTEGER FUNCTION h5tbget_field_info_c(loc_id,namelen,dset_name,nfields,&
@@ -1872,10 +1870,10 @@ SUBROUTINE h5tbget_field_info_f(loc_id,&
INTEGER(size_t), DIMENSION(1:nfields), INTENT(inout) :: field_sizes ! field sizes
INTEGER(size_t), DIMENSION(1:nfields), INTENT(inout) :: field_offsets ! field offsets
INTEGER(size_t), INTENT(inout):: type_size ! type size
- INTEGER :: namelen ! name length
- INTEGER :: maxlen ! maxiumum length of input field names
- INTEGER, DIMENSION(1:nfields) :: namelen2 ! name lengths
- INTEGER :: c_maxlen_out ! maximum character length of a field array element
+ INTEGER(size_t) :: namelen ! name length
+ INTEGER(size_t) :: maxlen ! maxiumum length of input field names
+ INTEGER(size_t), DIMENSION(1:nfields) :: namelen2 ! name lengths
+ INTEGER(size_t) :: c_maxlen_out ! maximum character length of a field array element
END FUNCTION h5tbget_field_info_c
END INTERFACE
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index 3ccfb9d..6f34295 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -426,7 +426,6 @@ AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@ -I$(top_builddir)/fortran/src \
AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@ $(am__append_1)
AM_MAKEFLAGS = @AM_MAKEFLAGS@
AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -458,7 +457,6 @@ DIRECT_VFD = @DIRECT_VFD@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
-DYNAMIC_DIRS = @DYNAMIC_DIRS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -477,17 +475,14 @@ FCFLAGS_f90 = @FCFLAGS_f90@
FCLIBS = @FCLIBS@
FC_VERSION = @FC_VERSION@
FGREP = @FGREP@
-FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@
GREP = @GREP@
H5_CFLAGS = @H5_CFLAGS@
H5_CPPFLAGS = @H5_CPPFLAGS@
H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
H5_FCFLAGS = @H5_FCFLAGS@
H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
H5_VERSION = @H5_VERSION@
HADDR_T = @HADDR_T@
HAVE_DMALLOC = @HAVE_DMALLOC@
@@ -550,7 +545,6 @@ R_INTEGER = @R_INTEGER@
R_LARGE = @R_LARGE@
SEARCH = @SEARCH@
SED = @SED@
-SETX = @SETX@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIZE_T = @SIZE_T@
@@ -565,10 +559,6 @@ TR = @TR@
TRACE_API = @TRACE_API@
UNAME_INFO = @UNAME_INFO@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
-USE_FILTER_NBIT = @USE_FILTER_NBIT@
-USE_FILTER_SCALEOFFSET = @USE_FILTER_SCALEOFFSET@
-USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@
USE_FILTER_SZIP = @USE_FILTER_SZIP@
USINGMEMCHECKER = @USINGMEMCHECKER@
VERSION = @VERSION@
@@ -690,7 +680,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
# After making changes, run bin/reconfigure to update other configure related
# files like Makefile.in.
LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 205
+LT_VERS_REVISION = 206
LT_VERS_AGE = 0
# Our main target, the high-level fortran library
diff --git a/hl/fortran/test/CMakeLists.txt b/hl/fortran/test/CMakeLists.txt
index fcb0b8c..55fb987 100644
--- a/hl/fortran/test/CMakeLists.txt
+++ b/hl/fortran/test/CMakeLists.txt
@@ -9,32 +9,36 @@ INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY} ${HDF5_F90_BINARY_DIR} ${
#-- Adding test for hl_f90_tstds
add_executable (hl_f90_tstds tstds.f90)
TARGET_NAMING (hl_f90_tstds ${LIB_TYPE})
-TARGET_FORTRAN_PROPERTIES (hl_f90_tstds " " " ")
+TARGET_FORTRAN_PROPERTIES (hl_f90_tstds ${LIB_TYPE} " " " ")
target_link_libraries (hl_f90_tstds ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET})
+target_include_directories (hl_f90_tstds PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY})
set_target_properties (hl_f90_tstds PROPERTIES LINKER_LANGUAGE Fortran)
set_target_properties (hl_f90_tstds PROPERTIES FOLDER test/hl/fortran)
#-- Adding test for hl_f90_tstlite
add_executable (hl_f90_tstlite tstlite.f90)
TARGET_NAMING (hl_f90_tstlite ${LIB_TYPE})
-TARGET_FORTRAN_PROPERTIES (hl_f90_tstlite " " " ")
+TARGET_FORTRAN_PROPERTIES (hl_f90_tstlite ${LIB_TYPE} " " " ")
target_link_libraries (hl_f90_tstlite ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET})
+target_include_directories (hl_f90_tstlite PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY})
set_target_properties (hl_f90_tstlite PROPERTIES LINKER_LANGUAGE Fortran)
set_target_properties (hl_f90_tstlite PROPERTIES FOLDER test/hl/fortran)
#-- Adding test for hl_f90_tstimage
add_executable (hl_f90_tstimage tstimage.f90)
TARGET_NAMING (hl_f90_tstimage ${LIB_TYPE})
-TARGET_FORTRAN_PROPERTIES (hl_f90_tstimage " " " ")
+TARGET_FORTRAN_PROPERTIES (hl_f90_tstimage ${LIB_TYPE} " " " ")
target_link_libraries (hl_f90_tstimage ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET})
+target_include_directories (hl_f90_tstimage PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY})
set_target_properties (hl_f90_tstimage PROPERTIES LINKER_LANGUAGE Fortran)
set_target_properties (hl_f90_tstimage PROPERTIES FOLDER test/hl/fortran)
#-- Adding test for hl_f90_tsttable
add_executable (hl_f90_tsttable tsttable.f90)
TARGET_NAMING (hl_f90_tsttable ${LIB_TYPE})
-TARGET_FORTRAN_PROPERTIES (hl_f90_tsttable " " " ")
+TARGET_FORTRAN_PROPERTIES (hl_f90_tsttable ${LIB_TYPE} " " " ")
target_link_libraries (hl_f90_tsttable ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET})
+target_include_directories (hl_f90_tsttable PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY})
set_target_properties (hl_f90_tsttable PROPERTIES LINKER_LANGUAGE Fortran)
set_target_properties (hl_f90_tsttable PROPERTIES FOLDER test/hl/fortran)
diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in
index e1b28a5..6725d26 100644
--- a/hl/fortran/test/Makefile.in
+++ b/hl/fortran/test/Makefile.in
@@ -417,7 +417,6 @@ AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@ -I$(top_builddir)/fortran/src \
AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@ $(am__append_1)
AM_MAKEFLAGS = @AM_MAKEFLAGS@
AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -449,7 +448,6 @@ DIRECT_VFD = @DIRECT_VFD@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
-DYNAMIC_DIRS = @DYNAMIC_DIRS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -468,17 +466,14 @@ FCFLAGS_f90 = @FCFLAGS_f90@
FCLIBS = @FCLIBS@
FC_VERSION = @FC_VERSION@
FGREP = @FGREP@
-FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@
GREP = @GREP@
H5_CFLAGS = @H5_CFLAGS@
H5_CPPFLAGS = @H5_CPPFLAGS@
H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
H5_FCFLAGS = @H5_FCFLAGS@
H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
H5_VERSION = @H5_VERSION@
HADDR_T = @HADDR_T@
HAVE_DMALLOC = @HAVE_DMALLOC@
@@ -541,7 +536,6 @@ R_INTEGER = @R_INTEGER@
R_LARGE = @R_LARGE@
SEARCH = @SEARCH@
SED = @SED@
-SETX = @SETX@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIZE_T = @SIZE_T@
@@ -556,10 +550,6 @@ TR = @TR@
TRACE_API = @TRACE_API@
UNAME_INFO = @UNAME_INFO@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
-USE_FILTER_NBIT = @USE_FILTER_NBIT@
-USE_FILTER_SCALEOFFSET = @USE_FILTER_SCALEOFFSET@
-USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@
USE_FILTER_SZIP = @USE_FILTER_SZIP@
USINGMEMCHECKER = @USINGMEMCHECKER@
VERSION = @VERSION@
diff --git a/hl/fortran/test/tstds.f90 b/hl/fortran/test/tstds.f90
index c73e1c4..cbf6c38 100644
--- a/hl/fortran/test/tstds.f90
+++ b/hl/fortran/test/tstds.f90
@@ -91,7 +91,7 @@ SUBROUTINE test_testds(err)
!-------------------------------------------------------------------------
! attach the DS_1_NAME dimension scale to DSET_NAME at dimension 1
!-------------------------------------------------------------------------
-
+
CALL test_begin(' Test Attaching Dimension Scale ')
! get the dataset id for DSET_NAME
diff --git a/hl/fortran/test/tstimage.f90 b/hl/fortran/test/tstimage.f90
index 3794bbf..0bff6b2 100644
--- a/hl/fortran/test/tstimage.f90
+++ b/hl/fortran/test/tstimage.f90
@@ -111,13 +111,11 @@ end do
! Initialize FORTRAN predefined datatypes.
!
call h5open_f(errcode)
-
!
! Create a new file using default properties.
!
call h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, errcode)
-
!-------------------------------------------------------------------------
! indexed image
!-------------------------------------------------------------------------
diff --git a/hl/fortran/test/tstlite.f90 b/hl/fortran/test/tstlite.f90
index 0b5a138..d035b89 100644
--- a/hl/fortran/test/tstlite.f90
+++ b/hl/fortran/test/tstlite.f90
@@ -63,7 +63,6 @@ INTEGER :: i ! general purpose integer
CALL test_begin(' Make/Read datasets (1D) ')
-
!
! Initialize the data array.
!
@@ -186,8 +185,8 @@ USE HDF5 ! module of HDF5 library
IMPLICIT NONE
-INTEGER, PARAMETER :: DIM1 = 4; ! columns
-INTEGER, PARAMETER :: DIM2 = 6; ! rows
+INTEGER(HSIZE_T), PARAMETER :: DIM1 = 4; ! columns
+INTEGER(HSIZE_T), PARAMETER :: DIM2 = 6; ! rows
CHARACTER(len=9), PARAMETER :: filename = "dsetf2.h5"! File name
CHARACTER(LEN=5), PARAMETER :: dsetname1 = "dset1" ! Dataset name
CHARACTER(LEN=5), PARAMETER :: dsetname2 = "dset2" ! Dataset name
@@ -205,7 +204,7 @@ REAL, DIMENSION(DIM1,DIM2) :: buf3r ! Data buffer
DOUBLE PRECISION, DIMENSION(DIM1,DIM2) :: buf4 ! Data buffer
DOUBLE PRECISION, DIMENSION(DIM1,DIM2) :: buf4r ! Data buffer
INTEGER :: errcode ! Error flag
-INTEGER :: i, j, n ! general purpose integers
+INTEGER(HSIZE_T) :: i, j, n ! general purpose integers
CALL test_begin(' Make/Read datasets (2D) ')
@@ -215,15 +214,15 @@ CALL test_begin(' Make/Read datasets (2D) ')
!
n=1
DO i = 1, DIM1*DIM2
- buf(i) = n;
+ buf(i) = INT(n)
n = n + 1
END DO
DO i = 1, dims(1)
DO j = 1, dims(2)
- buf2(i,j) = (i-1)*dims(2) + j;
- buf3(i,j) = (i-1)*dims(2) + j;
- buf4(i,j) = (i-1)*dims(2) + j;
+ buf2(i,j) = INT((i-1)*dims(2) + j)
+ buf3(i,j) = INT((i-1)*dims(2) + j)
+ buf4(i,j) = INT((i-1)*dims(2) + j)
END DO
END DO
@@ -373,9 +372,9 @@ USE HDF5 ! module of HDF5 library
IMPLICIT NONE
-INTEGER, PARAMETER :: DIM1 = 6; ! columns
-INTEGER, PARAMETER :: DIM2 = 4; ! rows
-INTEGER, PARAMETER :: DIM3 = 2; ! layers
+INTEGER, PARAMETER :: DIM1 = 6 ! columns
+INTEGER, PARAMETER :: DIM2 = 4 ! rows
+INTEGER, PARAMETER :: DIM3 = 2 ! layers
CHARACTER(len=9), PARAMETER :: filename = "dsetf3.h5" ! File name
CHARACTER(LEN=5), PARAMETER :: dsetname1 = "dset1" ! Dataset name
CHARACTER(LEN=5), PARAMETER :: dsetname2 = "dset2" ! Dataset name
@@ -394,7 +393,7 @@ DOUBLE PRECISION, DIMENSION(DIM1,DIM2,DIM3) :: buf4 ! Data buffer
DOUBLE PRECISION, DIMENSION(DIM1,DIM2,DIM3) :: buf4r ! Data buffer
INTEGER :: rank = 3 ! Dataset rank
INTEGER :: errcode ! Error flag
-INTEGER :: i, j, k, n ! general purpose integers
+INTEGER(HSIZE_T) :: i, j, k, n ! general purpose integers
INTEGER :: type_class
INTEGER(SIZE_T) :: type_size
@@ -406,20 +405,20 @@ CALL test_begin(' Make/Read datasets (3D) ')
!
n=1
DO i = 1, DIM1*DIM2*DIM3
- buf(i) = n;
+ buf(i) = INT(n)
n = n + 1
END DO
n = 1
DO i = 1, dims(1)
- DO j = 1, dims(2)
- DO k = 1, dims(3)
- buf2(i,j,k) = n;
- buf3(i,j,k) = n;
- buf4(i,j,k) = n;
- n = n + 1
- END DO
- END DO
+ DO j = 1, dims(2)
+ DO k = 1, dims(3)
+ buf2(i,j,k) = INT(n)
+ buf3(i,j,k) = INT(n)
+ buf4(i,j,k) = INT(n)
+ n = n + 1
+ END DO
+ END DO
END DO
!
@@ -625,7 +624,7 @@ SUBROUTINE test_datasetND(rank)
DOUBLE PRECISION, ALLOCATABLE, DIMENSION(:,:,:,:,:,:,:) :: dbuf_7 ! Data buffer
DOUBLE PRECISION, ALLOCATABLE, DIMENSION(:,:,:,:,:,:,:) :: dbufr_7 ! Data buffer
INTEGER :: errcode ! Error flag
- INTEGER :: i, j, k, l, m, n, o, nn ! general purpose integers
+ INTEGER(HSIZE_T) :: i, j, k, l, m, n, o, nn ! general purpose integers
INTEGER :: type_class
INTEGER(SIZE_T) :: type_size
CHARACTER(LEN=1) :: ichr1
@@ -651,9 +650,9 @@ SUBROUTINE test_datasetND(rank)
DO j = 1, DIM2
DO k = 1, DIM3
DO l = 1, DIM4
- ibuf_4(i,j,k,l) = nn
- rbuf_4(i,j,k,l) = nn
- dbuf_4(i,j,k,l) = nn
+ ibuf_4(i,j,k,l) = INT(nn)
+ rbuf_4(i,j,k,l) = INT(nn)
+ dbuf_4(i,j,k,l) = INT(nn)
nn = nn + 1
END DO
END DO
@@ -677,9 +676,9 @@ SUBROUTINE test_datasetND(rank)
DO k = 1, DIM3
DO l = 1, DIM4
DO m = 1, DIM5
- ibuf_5(i,j,k,l,m) = nn
- rbuf_5(i,j,k,l,m) = nn
- dbuf_5(i,j,k,l,m) = nn
+ ibuf_5(i,j,k,l,m) = INT(nn)
+ rbuf_5(i,j,k,l,m) = INT(nn)
+ dbuf_5(i,j,k,l,m) = INT(nn)
nn = nn + 1
END DO
END DO
@@ -705,9 +704,9 @@ SUBROUTINE test_datasetND(rank)
DO l = 1, DIM4
DO m = 1, DIM5
DO n = 1, DIM6
- ibuf_6(i,j,k,l,m,n) = nn
- rbuf_6(i,j,k,l,m,n) = nn
- dbuf_6(i,j,k,l,m,n) = nn
+ ibuf_6(i,j,k,l,m,n) = INT(nn)
+ rbuf_6(i,j,k,l,m,n) = INT(nn)
+ dbuf_6(i,j,k,l,m,n) = INT(nn)
nn = nn + 1
END DO
END DO
@@ -735,9 +734,9 @@ SUBROUTINE test_datasetND(rank)
DO m = 1, DIM5
DO n = 1, DIM6
DO o = 1, DIM7
- ibuf_7(i,j,k,l,m,n,o) = nn
- rbuf_7(i,j,k,l,m,n,o) = nn
- dbuf_7(i,j,k,l,m,n,o) = nn
+ ibuf_7(i,j,k,l,m,n,o) = INT(nn)
+ rbuf_7(i,j,k,l,m,n,o) = INT(nn)
+ dbuf_7(i,j,k,l,m,n,o) = INT(nn)
nn = nn + 1
END DO
END DO
@@ -1045,7 +1044,7 @@ SUBROUTINE test_datasets()
CHARACTER(len=9), PARAMETER :: filename = "dsetf4.h5"! File name
INTEGER(HID_T) :: file_id ! File identifier
INTEGER :: errcode ! Error flag
- INTEGER, PARAMETER :: DIM1 = 10; ! Dimension of array
+ INTEGER, PARAMETER :: DIM1 = 10 ! Dimension of array
CHARACTER(LEN=5), PARAMETER :: dsetname1 = "dset1" ! Dataset name
CHARACTER(LEN=5), PARAMETER :: dsetname2 = "dset2" ! Dataset name
CHARACTER(LEN=5), PARAMETER :: dsetname3 = "dset3" ! Dataset name
@@ -1086,10 +1085,10 @@ SUBROUTINE test_datasets()
!
n = 1
DO i = 1, DIM1
- buf2(i) = n;
- buf3(i) = n;
- buf4(i) = n;
- n = n + 1;
+ buf2(i) = n
+ buf3(i) = n
+ buf4(i) = n
+ n = n + 1
END DO
!-------------------------------------------------------------------------
@@ -1344,8 +1343,8 @@ SUBROUTINE test_attributes()
CHARACTER(len=9), PARAMETER :: filename = "dsetf5.h5"! File name
CHARACTER(len=9), PARAMETER :: filename1 ="tattr.h5" ! C written attribute file
INTEGER(HID_T) :: file_id ! File identifier
- INTEGER(HID_T) :: file_id1
- INTEGER, PARAMETER :: DIM1 = 10; ! Dimension of array
+! INTEGER(HID_T) :: file_id1
+ INTEGER, PARAMETER :: DIM1 = 10 ! Dimension of array
CHARACTER(LEN=5), PARAMETER :: attrname1 = "attr1" ! Attribute name
CHARACTER(LEN=5), PARAMETER :: attrname2 = "attr2" ! Attribute name
CHARACTER(LEN=5), PARAMETER :: attrname3 = "attr3" ! Attribute name
@@ -1355,8 +1354,8 @@ SUBROUTINE test_attributes()
CHARACTER(LEN=16), PARAMETER :: buf_c = "string attribute"
CHARACTER(LEN=8) :: bufr1 ! Data buffer
CHARACTER(LEN=10) :: bufr1_lg ! Data buffer
- CHARACTER(LEN=16) :: bufr_c ! Data buffer
- CHARACTER(LEN=18) :: bufr_c_lg ! Data buffer
+! CHARACTER(LEN=16) :: bufr_c ! Data buffer
+! CHARACTER(LEN=18) :: bufr_c_lg ! Data buffer
INTEGER, DIMENSION(DIM1) :: buf2 ! Data buffer
INTEGER, DIMENSION(DIM1) :: bufr2 ! Data buffer
REAL, DIMENSION(DIM1) :: buf3 ! Data buffer
@@ -1395,10 +1394,10 @@ SUBROUTINE test_attributes()
size = DIM1
n = 1
DO i = 1, DIM1
- buf2(i) = n;
- buf3(i) = n;
- buf4(i) = n;
- n = n + 1;
+ buf2(i) = n
+ buf3(i) = n
+ buf4(i) = n
+ n = n + 1
END DO
@@ -1443,7 +1442,6 @@ SUBROUTINE test_attributes()
! write attribute.
!
CALL h5ltset_attribute_float_f(file_id,dsetname1,attrname3,buf3,size,errcode)
-
!
! read attribute.
!
@@ -1460,7 +1458,6 @@ SUBROUTINE test_attributes()
ENDIF
END DO
-
CALL passed()
!-------------------------------------------------------------------------
@@ -1468,8 +1465,7 @@ SUBROUTINE test_attributes()
!-------------------------------------------------------------------------
CALL test_begin(' Set/Get attributes double ')
-
-
+
!
! write attribute.
!
diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt
index f4d5a96..3c24e40 100644
--- a/hl/src/CMakeLists.txt
+++ b/hl/src/CMakeLists.txt
@@ -34,7 +34,7 @@ set (HL_HEADERS
)
add_library (${HDF5_HL_LIB_TARGET} ${LIB_TYPE} ${HL_SRCS} ${HL_HEADERS})
-TARGET_C_PROPERTIES (${HDF5_HL_LIB_TARGET} " " " ")
+TARGET_C_PROPERTIES (${HDF5_HL_LIB_TARGET} ${LIB_TYPE} " " " ")
target_link_libraries (${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
H5_SET_LIB_OPTIONS (${HDF5_HL_LIB_TARGET} ${HDF5_HL_LIB_NAME} ${LIB_TYPE})
set_target_properties (${HDF5_HL_LIB_TARGET} PROPERTIES
diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c
index f4b754a..de6e66c 100644
--- a/hl/src/H5DS.c
+++ b/hl/src/H5DS.c
@@ -144,7 +144,8 @@ herr_t H5DSattach_scale(hid_t did,
hid_t dsid_j; /* DS dataset ID in DIMENSION_LIST */
H5O_info_t oi1, oi2;
H5I_type_t it1, it2;
- int i, len;
+ int i;
+ size_t len;
int found_ds=0;
htri_t is_scale;
@@ -242,7 +243,7 @@ herr_t H5DSattach_scale(hid_t did,
if (has_dimlist == 0)
{
- dims[0] = rank;
+ dims[0] = (hsize_t)rank;
/* space for the attribute */
if((sid = H5Screate_simple(1, dims, NULL)) < 0)
@@ -477,7 +478,7 @@ herr_t H5DSattach_scale(hid_t did,
dsbuf[nelmts - 1] = dsl;
/* create a new data space for the new references array */
- dims[0] = nelmts;
+ dims[0] = (hsize_t)nelmts;
if((sid = H5Screate_simple(1, dims, NULL)) < 0)
goto out;
@@ -798,7 +799,7 @@ herr_t H5DSdetach_scale(hid_t did,
for(ii=0; ii<nelmts; ii++) {
/* First check if we have the same dimension index */
- if((int)idx == dsbuf[ii].dim_idx) {
+ if(idx == dsbuf[ii].dim_idx) {
/* get the reference to the dataset */
ref = dsbuf[ii].ref;
@@ -853,7 +854,7 @@ herr_t H5DSdetach_scale(hid_t did,
if(nelmts)
{
/* create a new data space for the new references array */
- dims[0] = nelmts;
+ dims[0] = (hsize_t)nelmts;
if((sid = H5Screate_simple(1, dims, NULL)) < 0)
goto out;
@@ -1153,7 +1154,7 @@ htri_t H5DSis_attached(hid_t did,
goto out;
/* same object */
- if(oi3.fileno == oi4.fileno && oi3.addr == oi4.addr && (int)idx==dsbuf[i].dim_idx)
+ if(oi3.fileno == oi4.fileno && oi3.addr == oi4.addr && idx==dsbuf[i].dim_idx)
found_dset=1;
/* close the dereferenced dataset */
@@ -1429,10 +1430,12 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label)
hid_t aid = -1; /* attribute ID */
int rank; /* rank of dataset */
hsize_t dims[1]; /* dimensions of dataset */
- const char **buf = NULL; /* buffer to store in the attribute */
H5I_type_t it; /* ID type */
unsigned int i;
-
+ union { /* union is needed to eliminate compiler warnings about */
+ char ** buf; /* discarding the 'const' qualifier in the free */
+ char const ** const_buf; /* buf calls */
+ } u;
/*-------------------------------------------------------------------------
* parameter checking
*-------------------------------------------------------------------------
@@ -1478,7 +1481,7 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label)
if (has_labels == 0)
{
- dims[0] = rank;
+ dims[0] = (hsize_t)rank;
/* space for the attribute */
if ((sid = H5Screate_simple(1, dims, NULL)) < 0)
@@ -1495,19 +1498,19 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label)
goto out;
/* allocate and initialize */
- buf = (const char **) HDmalloc((size_t) rank * sizeof(char *));
+ u.const_buf = (char const **) HDmalloc((size_t) rank * sizeof(char *));
- if (buf == NULL)
+ if (u.const_buf == NULL)
goto out;
for (i = 0; i < (unsigned int) rank; i++)
- buf[i] = NULL;
+ u.const_buf[i] = NULL;
/* store the label information in the required index */
- buf[idx] = label;
+ u.const_buf[idx] = label;
/* write the attribute with the label */
- if (H5Awrite(aid, tid, buf) < 0)
+ if (H5Awrite(aid, tid, u.const_buf) < 0)
goto out;
/* close */
@@ -1517,10 +1520,10 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label)
goto out;
if (H5Aclose(aid) < 0)
goto out;
- if (buf)
+ if (u.const_buf)
{
- HDfree(buf);
- buf = NULL;
+ HDfree(u.const_buf);
+ u.const_buf = NULL;
}
}
@@ -1531,6 +1534,7 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label)
else
{
+
if ((aid = H5Aopen(did, DIMENSION_LABELS, H5P_DEFAULT)) < 0)
goto out;
@@ -1538,34 +1542,34 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label)
goto out;
/* allocate and initialize */
- buf = (const char **) HDmalloc((size_t) rank * sizeof(char *));
-
- if (buf == NULL)
+ u.buf = (char **) HDmalloc((size_t) rank * sizeof(char *));
+
+ if (u.buf == NULL)
goto out;
/* read */
- if (H5Aread(aid, tid, (void *) buf) < 0)
+ if (H5Aread(aid, tid, (void *)u.buf) < 0)
goto out;
/* free the ptr that will be replaced by label */
- if (buf[idx])
- HDfree(buf[idx]);
+ if (u.buf[idx])
+ HDfree(u.buf[idx]);
/* store the label information in the required index */
- buf[idx] = label;
+ u.const_buf[idx] = label;
/* write the attribute with the new references */
- if (H5Awrite(aid, tid, buf) < 0)
+ if (H5Awrite(aid, tid, u.buf) < 0)
goto out;
/* label was brought in, so don't free */
- buf[idx] = NULL;
+ u.buf[idx] = NULL;
/* free all the ptr's from the H5Aread() */
for (i = 0; i < (unsigned int) rank; i++)
{
- if (buf[i])
- HDfree(buf[i]);
+ if (u.buf[i])
+ HDfree(u.buf[i]);
}
/* close */
@@ -1573,28 +1577,29 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label)
goto out;
if (H5Aclose(aid) < 0)
goto out;
- if (buf)
+ if (u.buf)
{
- HDfree(buf);
- buf = NULL;
+ HDfree(u.buf);
+ u.buf = NULL;
}
}
return SUCCEED;
/* error zone */
+
out:
- if (buf)
+ if (u.buf)
{
- if (buf[idx]) /* check if we errored during H5Awrite */
- buf[idx] = NULL; /* don't free label */
+ if (u.buf[idx]) /* check if we errored during H5Awrite */
+ u.buf[idx] = NULL; /* don't free label */
/* free all the ptr's from the H5Aread() */
for (i = 0; i < (unsigned int) rank; i++)
{
- if (buf[i])
- HDfree(buf[i]);
+ if (u.buf[i])
+ HDfree(u.buf[i]);
}
- HDfree(buf);
+ HDfree(u.buf);
}
H5E_BEGIN_TRY
{
diff --git a/hl/src/H5DSprivate.h b/hl/src/H5DSprivate.h
index 61c0a1c..39c3e74 100644
--- a/hl/src/H5DSprivate.h
+++ b/hl/src/H5DSprivate.h
@@ -28,7 +28,7 @@
/* attribute type of a DS dataset */
typedef struct ds_list_t {
hobj_ref_t ref; /* object reference */
- int dim_idx; /* dimension index of the dataset */
+ unsigned int dim_idx; /* dimension index of the dataset */
} ds_list_t;
diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c
index aeda6ab..6fa548d 100644
--- a/hl/src/H5IM.c
+++ b/hl/src/H5IM.c
@@ -628,9 +628,9 @@ herr_t H5IMlink_palette( hid_t loc_id,
n_refs = H5Sget_simple_extent_npoints(asid);
- dim_ref = n_refs + 1;
+ dim_ref = (hsize_t)n_refs + 1;
- refbuf = (hobj_ref_t*)HDmalloc( sizeof(hobj_ref_t) * (int)dim_ref );
+ refbuf = (hobj_ref_t*)HDmalloc( sizeof(hobj_ref_t) * (size_t)dim_ref );
if ( H5Aread( aid, atid, refbuf ) < 0)
goto out;
@@ -949,9 +949,9 @@ herr_t H5IMget_palette_info( hid_t loc_id,
n_refs = H5Sget_simple_extent_npoints(asid);
- dim_ref = n_refs;
+ dim_ref = (hsize_t)n_refs;
- refbuf = (hobj_ref_t*)HDmalloc( sizeof(hobj_ref_t) * (int)dim_ref );
+ refbuf = (hobj_ref_t*)HDmalloc( sizeof(hobj_ref_t) * (size_t)dim_ref );
if ( H5Aread( aid, atid, refbuf ) < 0)
goto out;
@@ -1067,9 +1067,9 @@ herr_t H5IMget_palette( hid_t loc_id,
n_refs = H5Sget_simple_extent_npoints(asid);
- dim_ref = n_refs;
+ dim_ref = (hsize_t)n_refs;
- refbuf = (hobj_ref_t*)HDmalloc( sizeof(hobj_ref_t) * (int)dim_ref );
+ refbuf = (hobj_ref_t*)HDmalloc( sizeof(hobj_ref_t) * (size_t)dim_ref );
if ( H5Aread( aid, atid, refbuf ) < 0)
goto out;
diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c
index 9d6123b..8541cfe 100644
--- a/hl/src/H5LT.c
+++ b/hl/src/H5LT.c
@@ -2398,7 +2398,7 @@ print_enum(hid_t type, char* str, size_t *str_len, hbool_t no_ubuf, size_t indt)
for (i = 0; i < nmembs; i++) {
if((name[i] = H5Tget_member_name(type, (unsigned)i))==NULL)
goto out;
- if(H5Tget_member_value(type, (unsigned)i, value + i * super_size) < 0)
+ if(H5Tget_member_value(type, (unsigned)i, value + (size_t)i * super_size) < 0)
goto out;
}
@@ -2426,7 +2426,7 @@ print_enum(hid_t type, char* str, size_t *str_len, hbool_t no_ubuf, size_t indt)
/*On SGI Altix(cobalt), wrong values were printed out with "value+i*dst_size"
*strangely, unless use another pointer "copy".*/
- copy = value+i*dst_size;
+ copy = value + (size_t)i * dst_size;
if (H5T_SGN_NONE == H5Tget_sign(native))
HDsnprintf(tmp_str, TMP_LEN, "%u", *((unsigned int*)((void *)copy)));
else
@@ -2557,6 +2557,7 @@ char* H5LT_dtype_to_text(hid_t dtype, char *dt_str, H5LT_lang_t lang, size_t *sl
switch (tcls) {
case H5T_INTEGER:
+ case H5T_BITFIELD:
if (H5Tequal(dtype, H5T_STD_I8BE)) {
HDsnprintf(dt_str, *slen, "H5T_STD_I8BE");
} else if (H5Tequal(dtype, H5T_STD_I8LE)) {
@@ -3053,9 +3054,19 @@ next:
case H5T_TIME:
HDsnprintf(dt_str, *slen, "H5T_TIME: not yet implemented");
break;
- case H5T_BITFIELD:
- HDsnprintf(dt_str, *slen, "H5T_BITFIELD: not yet implemented");
+ case H5T_NO_CLASS:
+ HDsnprintf(dt_str, *slen, "H5T_NO_CLASS");
break;
+ case H5T_REFERENCE:
+ if (H5Tequal(dtype, H5T_STD_REF_DSETREG) == TRUE) {
+ HDsnprintf(dt_str, *slen, " H5T_REFERENCE { H5T_STD_REF_DSETREG }");
+ }
+ else {
+ HDsnprintf(dt_str, *slen, " H5T_REFERENCE { H5T_STD_REF_OBJECT }");
+ }
+ break;
+ case H5T_NCLASSES:
+ break;
default:
HDsnprintf(dt_str, *slen, "unknown data type");
}
diff --git a/hl/src/H5LTanalyze.c b/hl/src/H5LTanalyze.c
index d9ffb36..54e443d 100644
--- a/hl/src/H5LTanalyze.c
+++ b/hl/src/H5LTanalyze.c
@@ -1,3 +1,22 @@
+#if __GNUC__ >= 4 && __GNUC_MINOR__ >=2
+#pragma GCC diagnostic ignored "-Wconversion"
+#pragma GCC diagnostic ignored "-Wimplicit-function-declaration"
+#pragma GCC diagnostic ignored "-Wlarger-than="
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#pragma GCC diagnostic ignored "-Wnested-externs"
+#pragma GCC diagnostic ignored "-Wold-style-definition"
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#pragma GCC diagnostic ignored "-Wsign-conversion"
+#pragma GCC diagnostic ignored "-Wstrict-prototypes"
+#pragma GCC diagnostic ignored "-Wswitch-default"
+#pragma GCC diagnostic ignored "-Wunused-function"
+#pragma GCC diagnostic ignored "-Wunused-macros"
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#elif defined __SUNPRO_CC
+#pragma disable_warn
+#elif defined _MSC_VER
+#pragma warning(push, 1)
+#endif
#line 2 "H5LTanalyze.c"
#line 4 "H5LTanalyze.c"
diff --git a/hl/src/H5LTparse.c b/hl/src/H5LTparse.c
index aa12185..6ca95c54 100644
--- a/hl/src/H5LTparse.c
+++ b/hl/src/H5LTparse.c
@@ -1,3 +1,22 @@
+#if __GNUC__ >= 4 && __GNUC_MINOR__ >=2
+#pragma GCC diagnostic ignored "-Wconversion"
+#pragma GCC diagnostic ignored "-Wimplicit-function-declaration"
+#pragma GCC diagnostic ignored "-Wlarger-than="
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#pragma GCC diagnostic ignored "-Wnested-externs"
+#pragma GCC diagnostic ignored "-Wold-style-definition"
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#pragma GCC diagnostic ignored "-Wsign-conversion"
+#pragma GCC diagnostic ignored "-Wstrict-prototypes"
+#pragma GCC diagnostic ignored "-Wswitch-default"
+#pragma GCC diagnostic ignored "-Wunused-function"
+#pragma GCC diagnostic ignored "-Wunused-macros"
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#elif defined __SUNPRO_CC
+#pragma disable_warn
+#elif defined _MSC_VER
+#pragma warning(push, 1)
+#endif
/* A Bison parser, made by GNU Bison 2.7. */
/* Bison implementation for Yacc-like parsers in C
diff --git a/hl/src/H5PT.c b/hl/src/H5PT.c
index 7a0bc20..6ed1ac0 100644
--- a/hl/src/H5PT.c
+++ b/hl/src/H5PT.c
@@ -130,6 +130,9 @@ hid_t H5PTcreate_fl ( hid_t loc_id,
if((table->type_id = H5Tcopy(dtype_id)) < 0)
goto out;
+ if((table->type_id = H5Tget_native_type(table->type_id, H5T_DIR_DEFAULT)) < 0)
+ goto out;
+
H5PT_create_index(table);
table->size = 0;
diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in
index ee3ef49..8685b9e 100644
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@@ -407,7 +407,6 @@ AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@
AM_MAKEFLAGS = @AM_MAKEFLAGS@
AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -439,7 +438,6 @@ DIRECT_VFD = @DIRECT_VFD@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
-DYNAMIC_DIRS = @DYNAMIC_DIRS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -458,17 +456,14 @@ FCFLAGS_f90 = @FCFLAGS_f90@
FCLIBS = @FCLIBS@
FC_VERSION = @FC_VERSION@
FGREP = @FGREP@
-FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@
GREP = @GREP@
H5_CFLAGS = @H5_CFLAGS@
H5_CPPFLAGS = @H5_CPPFLAGS@
H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
H5_FCFLAGS = @H5_FCFLAGS@
H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
H5_VERSION = @H5_VERSION@
HADDR_T = @HADDR_T@
HAVE_DMALLOC = @HAVE_DMALLOC@
@@ -531,7 +526,6 @@ R_INTEGER = @R_INTEGER@
R_LARGE = @R_LARGE@
SEARCH = @SEARCH@
SED = @SED@
-SETX = @SETX@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIZE_T = @SIZE_T@
@@ -546,10 +540,6 @@ TR = @TR@
TRACE_API = @TRACE_API@
UNAME_INFO = @UNAME_INFO@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
-USE_FILTER_NBIT = @USE_FILTER_NBIT@
-USE_FILTER_SCALEOFFSET = @USE_FILTER_SCALEOFFSET@
-USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@
USE_FILTER_SZIP = @USE_FILTER_SZIP@
USINGMEMCHECKER = @USINGMEMCHECKER@
VERSION = @VERSION@
@@ -671,7 +661,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
# After making changes, run bin/reconfigure to update other configure related
# files like Makefile.in.
LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 205
+LT_VERS_REVISION = 206
LT_VERS_AGE = 0
# This library is our main target.
diff --git a/hl/test/CMakeLists.txt b/hl/test/CMakeLists.txt
index 28c716c..47383ce 100644
--- a/hl/test/CMakeLists.txt
+++ b/hl/test/CMakeLists.txt
@@ -23,7 +23,7 @@ INCLUDE_DIRECTORIES (${HDF5_TEST_SRC_DIR})
MACRO (HL_ADD_EXE hl_name)
add_executable (hl_${hl_name} ${hl_name}.c)
TARGET_NAMING (hl_${hl_name} ${LIB_TYPE})
- TARGET_C_PROPERTIES (hl_${hl_name} " " " ")
+ TARGET_C_PROPERTIES (hl_${hl_name} ${LIB_TYPE} " " " ")
target_link_libraries (hl_${hl_name}
${HDF5_HL_LIB_TARGET}
${HDF5_LIB_TARGET}
@@ -45,8 +45,8 @@ HL_ADD_EXE (test_table)
# --------------------------------------------------------------------
if (HDF5_BUILD_GENERATORS AND NOT BUILD_SHARED_LIBS)
add_executable (hl_gen_test_ds gen_test_ds.c)
- TARGET_NAMING (hl_gen_test_ds ${LIB_TYPE})
- TARGET_C_PROPERTIES (hl_gen_test_ds " " " ")
+ TARGET_NAMING (hl_gen_test_ds STATIC)
+ TARGET_C_PROPERTIES (hl_gen_test_ds STATIC " " " ")
target_link_libraries (hl_gen_test_ds
${HDF5_HL_LIB_TARGET}
${HDF5_LIB_TARGET}
diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in
index 75350ec..6fc324b 100644
--- a/hl/test/Makefile.in
+++ b/hl/test/Makefile.in
@@ -444,7 +444,6 @@ AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@
AM_MAKEFLAGS = @AM_MAKEFLAGS@
AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -476,7 +475,6 @@ DIRECT_VFD = @DIRECT_VFD@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
-DYNAMIC_DIRS = @DYNAMIC_DIRS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -495,17 +493,14 @@ FCFLAGS_f90 = @FCFLAGS_f90@
FCLIBS = @FCLIBS@
FC_VERSION = @FC_VERSION@
FGREP = @FGREP@
-FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@
GREP = @GREP@
H5_CFLAGS = @H5_CFLAGS@
H5_CPPFLAGS = @H5_CPPFLAGS@
H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
H5_FCFLAGS = @H5_FCFLAGS@
H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
H5_VERSION = @H5_VERSION@
HADDR_T = @HADDR_T@
HAVE_DMALLOC = @HAVE_DMALLOC@
@@ -568,7 +563,6 @@ R_INTEGER = @R_INTEGER@
R_LARGE = @R_LARGE@
SEARCH = @SEARCH@
SED = @SED@
-SETX = @SETX@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIZE_T = @SIZE_T@
@@ -583,10 +577,6 @@ TR = @TR@
TRACE_API = @TRACE_API@
UNAME_INFO = @UNAME_INFO@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
-USE_FILTER_NBIT = @USE_FILTER_NBIT@
-USE_FILTER_SCALEOFFSET = @USE_FILTER_SCALEOFFSET@
-USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@
USE_FILTER_SZIP = @USE_FILTER_SZIP@
USINGMEMCHECKER = @USINGMEMCHECKER@
VERSION = @VERSION@
diff --git a/hl/test/h5hltest.h b/hl/test/h5hltest.h
index 809c4ec..e8292d2 100644
--- a/hl/test/h5hltest.h
+++ b/hl/test/h5hltest.h
@@ -33,7 +33,7 @@
#define TESTING2(WHAT) {printf("%-70s", "Testing " WHAT); fflush(stdout);}
#define TESTING3(WHAT) {printf("%-70s", "" WHAT); fflush(stdout);}
-/* Implrements verbose 'assert' with 'goto error' exit */
+/* Implements verbose 'assert' with 'goto error' exit */
#define VERIFY(condition, string) do { if (!(condition)) FAIL_PUTS_ERROR(string) } while(0)
#endif /* _H5HLTEST_H */
diff --git a/hl/test/test_ds.c b/hl/test/test_ds.c
index 77d2b71..7b6fb82 100644
--- a/hl/test/test_ds.c
+++ b/hl/test/test_ds.c
@@ -3126,7 +3126,7 @@ static int test_simple(void)
if(H5DSget_scale_name(dsid, name_out, (size_t)name_len+1) < 0)
goto out;
- if(HDstrncmp("Latitude set 0",name_out, name_len)!=0)
+ if(HDstrncmp("Latitude set 0",name_out, (size_t)name_len)!=0)
goto out;
if(name_out) {
HDfree(name_out);
diff --git a/hl/test/test_dset_opt.c b/hl/test/test_dset_opt.c
index bddd162..95ce535 100644
--- a/hl/test/test_dset_opt.c
+++ b/hl/test/test_dset_opt.c
@@ -41,7 +41,7 @@
#define CHUNK_NX 4
#define CHUNK_NY 4
-#define DEFLATE_SIZE_ADJUST(s) (ceil(((double)(s))*1.001)+12)
+#define DEFLATE_SIZE_ADJUST(s) (ceil(((double)(s))*1.001F)+12)
/* Temporary filter IDs used for testing */
#define H5Z_FILTER_BOGUS1 305
@@ -501,20 +501,20 @@ filter_bogus1(unsigned int flags, size_t UNUSED cd_nelmts,
size_t *buf_size, void **buf)
{
int *int_ptr=(int *)*buf; /* Pointer to the data values */
- ssize_t buf_left=*buf_size; /* Amount of data buffer left to process */
+ ssize_t buf_left=(ssize_t)*buf_size; /* Amount of data buffer left to process */
if(flags & H5Z_FLAG_REVERSE) { /* read */
/* Substract the "add on" value to all the data values */
while(buf_left>0) {
*int_ptr++ -= (int)ADD_ON;
- buf_left -= sizeof(int);
+ buf_left -= (ssize_t)sizeof(int);
} /* end while */
} /* end if */
else { /* write */
/* Add the "add on" value to all the data values */
while(buf_left>0) {
*int_ptr++ += (int)ADD_ON;
- buf_left -= sizeof(int);
+ buf_left -= (ssize_t)sizeof(int);
} /* end while */
} /* end else */
@@ -538,20 +538,20 @@ filter_bogus2(unsigned int flags, size_t UNUSED cd_nelmts,
size_t *buf_size, void **buf)
{
int *int_ptr=(int *)*buf; /* Pointer to the data values */
- ssize_t buf_left=*buf_size; /* Amount of data buffer left to process */
+ ssize_t buf_left=(ssize_t)*buf_size; /* Amount of data buffer left to process */
if(flags & H5Z_FLAG_REVERSE) { /* read */
/* Substract the "add on" value to all the data values */
while(buf_left>0) {
*int_ptr++ /= (int)FACTOR;
- buf_left -= sizeof(int);
+ buf_left -= (ssize_t)sizeof(int);
} /* end while */
} /* end if */
else { /* write */
/* Add the "add on" value to all the data values */
while(buf_left>0) {
*int_ptr++ *= (int)FACTOR;
- buf_left -= sizeof(int);
+ buf_left -= (ssize_t)sizeof(int);
} /* end while */
} /* end else */
diff --git a/hl/test/test_lite.c b/hl/test/test_lite.c
index 19d3759..2337610 100644
--- a/hl/test/test_lite.c
+++ b/hl/test/test_lite.c
@@ -300,7 +300,7 @@ static int test_dsets( void )
for (i = 0; i < DIM; i++)
{
- if ( data_float_in[i] != data_float_out[i] ) {
+ if(!FLT_ABS_EQUAL(data_float_in[i],data_float_out[i])) {
goto out;
}
}
@@ -311,7 +311,7 @@ static int test_dsets( void )
for (i = 0; i < DIM; i++)
{
- if ( data_float_in[i] != data_float_out[i] ) {
+ if(!FLT_ABS_EQUAL(data_float_in[i],data_float_out[i])) {
goto out;
}
}
@@ -336,7 +336,7 @@ static int test_dsets( void )
for (i = 0; i < DIM; i++)
{
- if ( data_double_in[i] != data_double_out[i] ) {
+ if(!DBL_ABS_EQUAL(data_double_in[i],data_double_out[i])) {
goto out;
}
}
@@ -347,7 +347,7 @@ static int test_dsets( void )
for (i = 0; i < DIM; i++)
{
- if ( data_double_in[i] != data_double_out[i] ) {
+ if(!DBL_ABS_EQUAL(data_double_in[i],data_double_out[i])) {
goto out;
}
}
@@ -959,7 +959,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
for (i = 0; i < 5; i++)
{
- if ( attr_float_in[i] != attr_float_out[i] ) {
+ if(!FLT_ABS_EQUAL(attr_float_in[i],attr_float_out[i])) {
return -1;
}
}
@@ -970,7 +970,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
for (i = 0; i < 5; i++)
{
- if ( attr_float_in[i] != attr_float_out[i] ) {
+ if(!FLT_ABS_EQUAL(attr_float_in[i],attr_float_out[i])) {
return -1;
}
}
@@ -1003,7 +1003,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
for (i = 0; i < 5; i++)
{
- if ( attr_double_in[i] != attr_double_out[i] ) {
+ if(!DBL_ABS_EQUAL(attr_double_in[i],attr_double_out[i])) {
return -1;
}
}
@@ -1014,7 +1014,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
for (i = 0; i < 5; i++)
{
- if ( attr_double_in[i] != attr_double_out[i] ) {
+ if(!DBL_ABS_EQUAL(attr_double_in[i],attr_double_out[i])) {
return -1;
}
}
@@ -1046,7 +1046,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
TESTING("H5LTget_attribute_info");
- if(NULL==(dims_out = (hsize_t*) HDmalloc( sizeof(hsize_t) * rank_out ))) return -1;
+ if(NULL==(dims_out = (hsize_t*) HDmalloc( sizeof(hsize_t) * (size_t)rank_out ))) return -1;
if ( H5LTget_attribute_info( loc_id, obj_name, ATTR2_NAME, dims_out, &type_class, &type_size) < 0 ) {
HDfree( dims_out );
diff --git a/hl/test/test_packet.c b/hl/test/test_packet.c
index 9d3074d..256892b 100644
--- a/hl/test/test_packet.c
+++ b/hl/test/test_packet.c
@@ -54,14 +54,14 @@ typedef struct particle_t
*-------------------------------------------------------------------------
*/
static particle_t testPart[NRECORDS] = {
- {"zero", 0,0, 0.0f, 0.0},
- {"one", 10,10, 1.0f, 10.0},
- {"two", 20,20, 2.0f, 20.0},
- {"three",30,30, 3.0f, 30.0},
- {"four", 40,40, 4.0f, 40.0},
- {"five", 50,50, 5.0f, 50.0},
- {"six", 60,60, 6.0f, 60.0},
- {"seven",70,70, 7.0f, 70.0}
+ {"zero", 0,0, 0.0f, 0.0f},
+ {"one", 10,10, 1.0f, 10.0f},
+ {"two", 20,20, 2.0f, 20.0f},
+ {"three",30,30, 3.0f, 30.0f},
+ {"four", 40,40, 4.0f, 40.0f},
+ {"five", 50,50, 5.0f, 50.0f},
+ {"six", 60,60, 6.0f, 60.0f},
+ {"seven",70,70, 7.0f, 70.0f}
};
/*-------------------------------------------------------------------------
@@ -75,8 +75,8 @@ static int cmp_par(size_t i, size_t j, particle_t *rbuf, particle_t *wbuf )
if ( ( HDstrcmp( rbuf[i].name, wbuf[j].name ) != 0 ) ||
rbuf[i].lati != wbuf[j].lati ||
rbuf[i].longi != wbuf[j].longi ||
- rbuf[i].pressure != wbuf[j].pressure ||
- rbuf[i].temperature != wbuf[j].temperature ) {
+ !FLT_ABS_EQUAL(rbuf[i].pressure,wbuf[j].pressure) ||
+ !DBL_ABS_EQUAL(rbuf[i].temperature,wbuf[j].temperature) ) {
return -1;
}
return 0;
@@ -895,6 +895,92 @@ error:
return -1;
}
+/*-------------------------------------------------------------------------
+ * test_rw_non-native_dt
+ *
+ * test reading and writing packet table using datatypes that are not
+ * native.
+ *
+ *-------------------------------------------------------------------------
+ */
+static int test_rw_nonnative_dt(hid_t fid)
+{
+ hid_t ptable; /* Packet table identifier */
+
+ herr_t err; /* Function return status */
+ hsize_t count; /* Number of records in the table */
+
+ int x; /* Loop variable */
+
+ /* Buffers to hold data */
+ int writeBuffer[5];
+ int readBuffer[5];
+
+ TESTING("reading/writing non-native packet table");
+
+ /* Initialize buffers */
+ for(x=0; x<5; x++) {
+ writeBuffer[x]=x;
+ readBuffer[x] = -1;
+ }
+
+ /* Create a fixed-length packet table within the file */
+ /* This table's "packets" will be simple integers and it will use no compression */
+ if(H5Tget_order(H5T_NATIVE_INT) == H5T_ORDER_LE) {
+ ptable = H5PTcreate_fl(fid, "Packet Test Dataset, Non-native", H5T_STD_I32BE, (hsize_t)100, -1);
+ } else {
+ ptable = H5PTcreate_fl(fid, "Packet Test Dataset, Non-native", H5T_STD_I32LE, (hsize_t)100, -1);
+ }
+ if(ptable == H5I_INVALID_HID)
+ goto out;
+
+ /* Write one packet to the packet table */
+ if( (err = H5PTappend(ptable, (hsize_t)1, &(writeBuffer[0]))) < 0 )
+ goto out;
+
+ /* Write several packets to the packet table */
+ if( (err = H5PTappend(ptable, (hsize_t)4, &(writeBuffer[1]))) < 0)
+ goto out;
+
+ if( (err = H5PTclose(ptable)) < 0)
+ goto out;
+
+ /* Open the Packet table */
+ if( (ptable = H5PTopen(fid, "Packet Test Dataset, Non-native")) < 0)
+ goto out;
+
+ /* Get the number of packets in the packet table. This should be five. */
+ if( (err = H5PTget_num_packets(ptable, &count)) < 0)
+ goto out;
+
+ if( (int)count != 5 )
+ goto out;
+
+ /* Initialize packet table's "current record" */
+ if( (err = H5PTcreate_index(ptable)) < 0)
+ goto out;
+
+ /* Iterate through packets, read each one back */
+ for(x=0; x<5; x++) {
+ if( (err = H5PTget_next(ptable, (hsize_t)1, &(readBuffer[x]))) < 0)
+ goto out;
+ if( x != readBuffer[x])
+ goto out;
+ }
+
+ /* Close the packet table */
+ if( (err = H5PTclose(ptable)) < 0)
+ goto out;
+
+ PASSED();
+ return 0;
+
+ out:
+ H5_FAILED();
+ if( H5PTis_valid(ptable) < 0)
+ H5PTclose(ptable);
+ return -1;
+}
/*-------------------------------------------------------------------------
* test_error
@@ -1035,6 +1121,7 @@ static int test_packet_table(hid_t fid)
test_read(fid);
test_get_next(fid);
test_big_table(fid);
+ test_rw_nonnative_dt(fid);
#ifdef VLPT_REMOVED
test_varlen(fid);
#endif /* VLPT_REMOVED */
diff --git a/hl/test/test_table.c b/hl/test/test_table.c
index c312296..3bc5e5f 100644
--- a/hl/test/test_table.c
+++ b/hl/test/test_table.c
@@ -166,14 +166,14 @@ static int cmp_par(hsize_t i, hsize_t j, particle_t *rbuf, particle_t *wbuf )
if ( ( HDstrcmp( rbuf[i].name, wbuf[j].name ) != 0 ) ||
rbuf[i].lati != wbuf[j].lati ||
rbuf[i].longi != wbuf[j].longi ||
- rbuf[i].pressure != wbuf[j].pressure ||
- rbuf[i].temperature != wbuf[j].temperature )
+ !FLT_ABS_EQUAL(rbuf[i].pressure,wbuf[j].pressure) ||
+ !DBL_ABS_EQUAL(rbuf[i].temperature,wbuf[j].temperature) )
{
HDfprintf(stderr,"read and write buffers have differences\n");
HDfprintf(stderr,"%s %ld %f %f %d\n",
- rbuf[i].name,rbuf[i].longi,rbuf[i].pressure,rbuf[i].temperature,rbuf[i].lati);
+ rbuf[i].name,rbuf[i].longi,(double)rbuf[i].pressure,rbuf[i].temperature,rbuf[i].lati);
HDfprintf(stderr,"%s %ld %f %f %d\n",
- wbuf[j].name,wbuf[j].longi,wbuf[j].pressure,wbuf[j].temperature,wbuf[j].lati);
+ wbuf[j].name,wbuf[j].longi,(double)wbuf[j].pressure,wbuf[j].temperature,wbuf[j].lati);
return -1;
}
return 0;
@@ -218,7 +218,7 @@ static int test_table(hid_t fid, int do_write)
hsize_t chunk_size=10;
int compress=0;
int *fill=NULL;
- particle_t fill1[1] = { {"no data",-1, -99.0f, -99.0, -1} };
+ particle_t fill1[1] = { {"no data",-1, -99.0f, -99.0f, -1} };
int fill1_new[1] = { -100 };
hsize_t position;
char tname[20];
@@ -246,18 +246,18 @@ static int test_table(hid_t fid, int do_write)
particle2_t rbuf2[NRECORDS];
particle3_t rbuf3[NRECORDS];
particle_t rbufc[NRECORDS*2];
- particle_t abuf[2]={{"eight",80,8.0f,80.0,80},{"nine",90,9.0f,90.0,90}};
- particle_t ibuf[2]={{"zero", 0, 0.0f, 0.0, 0},{"zero", 0, 0.0f, 0.0, 0}};
+ particle_t abuf[2]={{"eight",80,8.0f,80.0f,80},{"nine",90,9.0f,90.0f,90}};
+ particle_t ibuf[2]={{"zero", 0, 0.0f, 0.0f, 0},{"zero", 0, 0.0f, 0.0f, 0}};
particle_t wbufd[NRECORDS];
particle_t wbuf[NRECORDS] = {
- {"zero", 0, 0.0f, 0.0, 0,},
- {"one", 10, 1.0f, 10.0, 10},
- {"two", 20, 2.0f, 20.0, 20},
- {"three",30, 3.0f, 30.0, 30},
- {"four", 40, 4.0f, 40.0, 40},
- {"five", 50, 5.0f, 50.0, 50},
- {"six", 60, 6.0f, 60.0, 60},
- {"seven",70, 7.0f, 70.0, 70}
+ {"zero", 0, 0.0f, 0.0f, 0,},
+ {"one", 10, 1.0f, 10.0f, 10},
+ {"two", 20, 2.0f, 20.0f, 20},
+ {"three",30, 3.0f, 30.0f, 30},
+ {"four", 40, 4.0f, 40.0f, 40},
+ {"five", 50, 5.0f, 50.0f, 50},
+ {"six", 60, 6.0f, 60.0f, 60},
+ {"seven",70, 7.0f, 70.0f, 70}
};
/* buffers for the field "Pressure" and "New_field" */
float pressure_in [NRECORDS] = { 0.0f,1.0f,2.0f,3.0f,4.0f,5.0f,6.0f,7.0f };
@@ -390,14 +390,14 @@ static int test_table(hid_t fid, int do_write)
/* Define an array of Particles */
particle4_t p_data[NRECORDS] = {
- {12112, 1.4, 2.5, {1,2,3},{4,5,6}, {99,100}},
- {12113, 1.4, 2.5, {1,2,3},{4,5,6}, {99,100}},
- {12114, 1.4, 2.5, {1,2,3},{4,5,6}, {99,100}},
- {12115, 1.4, 2.5, {1,2,3},{4,5,6}, {99,100}},
- {12116, 1.4, 2.5, {1,2,3},{4,5,6}, {99,100}},
- {12117, 1.4, 2.5, {1,2,3},{4,5,6}, {99,100}},
- {12118, 1.4, 2.5, {1,2,3},{4,5,6}, {99,100}},
- {12119, 1.4, 2.5, {1,2,3},{4,5,6}, {99,100}}
+ {12112, 1.4f, 2.5f, {1,2,3},{4,5,6}, {99,100}},
+ {12113, 1.4f, 2.5f, {1,2,3},{4,5,6}, {99,100}},
+ {12114, 1.4f, 2.5f, {1,2,3},{4,5,6}, {99,100}},
+ {12115, 1.4f, 2.5f, {1,2,3},{4,5,6}, {99,100}},
+ {12116, 1.4f, 2.5f, {1,2,3},{4,5,6}, {99,100}},
+ {12117, 1.4f, 2.5f, {1,2,3},{4,5,6}, {99,100}},
+ {12118, 1.4f, 2.5f, {1,2,3},{4,5,6}, {99,100}},
+ {12119, 1.4f, 2.5f, {1,2,3},{4,5,6}, {99,100}}
};
/*-------------------------------------------------------------------------
@@ -1138,14 +1138,14 @@ static int test_table(hid_t fid, int do_write)
{
if ( i >= 2 && i <= 4 )
{
- if ( rbuf[i].lati != position_in[i-NRECORDS_ADD+1].lati ||
+ if ( rbuf[i].lati != position_in[i-NRECORDS_ADD+1].lati ||
rbuf[i].longi != position_in[i-NRECORDS_ADD+1].longi ||
- rbuf[i].pressure != pressure_in[i-NRECORDS_ADD+1] )
+ !FLT_ABS_EQUAL(rbuf[i].pressure,pressure_in[i-NRECORDS_ADD+1]) )
{
HDfprintf(stderr,"%ld %f %d\n",
- rbuf[i].longi,rbuf[i].pressure,rbuf[i].lati);
+ rbuf[i].longi,(double)rbuf[i].pressure,rbuf[i].lati);
HDfprintf(stderr,"%ld %f %d\n",
- position_in[i].longi,pressure_in[i],position_in[i].lati);
+ position_in[i].longi,(double)pressure_in[i],position_in[i].lati);
goto out;
}
}
@@ -1200,9 +1200,9 @@ static int test_table(hid_t fid, int do_write)
goto out;
/* Compare the extracted table with the initial values */
- for( i = 0; i < NRECORDS; i++ )
+ for ( i = 0; i < NRECORDS; i++ )
{
- if ( pressure_out[i] != pressure_in[i] ) {
+ if ( !FLT_ABS_EQUAL(pressure_out[i], pressure_in[i]) ) {
goto out;
}
}
@@ -1265,7 +1265,7 @@ static int test_table(hid_t fid, int do_write)
for( i = 0; i < NRECORDS; i++ )
{
if ( ( HDstrcmp( namepre_out[i].name, namepre_in[i].name ) != 0 ) ||
- namepre_out[i].pressure != namepre_in[i].pressure ) {
+ !FLT_ABS_EQUAL(namepre_out[i].pressure,namepre_in[i].pressure) ) {
goto out;
}
}
@@ -1294,7 +1294,7 @@ static int test_table(hid_t fid, int do_write)
{
hsize_t iistart = start;
if ( ( HDstrcmp( namepre_out[i].name, namepre_in[iistart+i].name ) != 0 ) ||
- namepre_out[i].pressure != namepre_in[iistart+i].pressure ) {
+ !FLT_ABS_EQUAL(namepre_out[i].pressure, namepre_in[iistart+i].pressure) ) {
goto out;
}
}
@@ -1353,7 +1353,7 @@ static int test_table(hid_t fid, int do_write)
{
if ( rbuf[i].lati != position_in[i-NRECORDS_ADD+1].lati ||
rbuf[i].longi != position_in[i-NRECORDS_ADD+1].longi ||
- rbuf[i].pressure != pressure_in[i-NRECORDS_ADD+1] )
+ !FLT_ABS_EQUAL(rbuf[i].pressure,pressure_in[i-NRECORDS_ADD+1]) )
goto out;
}
}
@@ -1406,7 +1406,7 @@ static int test_table(hid_t fid, int do_write)
/* compare the extracted table with the initial values */
for( i = 0; i < NRECORDS; i++ )
{
- if ( pressure_out[i] != pressure_in[i] ) {
+ if ( !FLT_ABS_EQUAL(pressure_out[i], pressure_in[i]) ) {
goto out;
}
}
@@ -1471,10 +1471,10 @@ static int test_table(hid_t fid, int do_write)
/* compare the extracted table with the initial values */
for( i = 0; i < NRECORDS; i++ )
{
- if ( ( HDstrcmp( namepre_out[i].name, namepre_in[i].name ) != 0 ) ||
- namepre_out[i].pressure != namepre_in[i].pressure ) {
- goto out;
- }
+ if ( ( HDstrcmp( namepre_out[i].name, namepre_in[i].name ) != 0 ) ||
+ !FLT_ABS_EQUAL(namepre_out[i].pressure,namepre_in[i].pressure) ) {
+ goto out;
+ }
}
/* reset buffer */
@@ -1502,8 +1502,8 @@ static int test_table(hid_t fid, int do_write)
for( i = 0; i < 3; i++ )
{
int iistart = (int) start;
- if ( ( HDstrcmp( namepre_out[i].name, wbuf[iistart+i].name ) != 0 ) ||
- namepre_out[i].pressure != wbuf[iistart+i].pressure ) {
+ if ( ( HDstrcmp( namepre_out[i].name, wbuf[iistart+(int)i].name ) != 0 ) ||
+ !FLT_ABS_EQUAL(namepre_out[i].pressure, wbuf[iistart+(int)i].pressure) ) {
goto out;
}
}
@@ -1546,8 +1546,8 @@ static int test_table(hid_t fid, int do_write)
if ( ( HDstrcmp( rbuf2[i].name, wbuf[i].name ) != 0 ) ||
rbuf2[i].lati != wbuf[i].lati ||
rbuf2[i].longi != wbuf[i].longi ||
- rbuf2[i].pressure != wbuf[i].pressure ||
- rbuf2[i].temperature != wbuf[i].temperature ||
+ !FLT_ABS_EQUAL(rbuf2[i].pressure,wbuf[i].pressure) ||
+ !DBL_ABS_EQUAL(rbuf2[i].temperature,wbuf[i].temperature) ||
rbuf2[i].new_field != buf_new[i] ) {
goto out;
}
@@ -1587,7 +1587,7 @@ static int test_table(hid_t fid, int do_write)
if ( ( HDstrcmp( rbuf3[i].name, wbuf[i].name ) != 0 ) ||
rbuf3[i].lati != wbuf[i].lati ||
rbuf3[i].longi != wbuf[i].longi ||
- rbuf3[i].temperature != wbuf[i].temperature ) {
+ !DBL_ABS_EQUAL(rbuf3[i].temperature,wbuf[i].temperature) ) {
goto out;
}
}
diff --git a/hl/tools/CMakeLists.txt b/hl/tools/CMakeLists.txt
index 567b3da..f58a513 100644
--- a/hl/tools/CMakeLists.txt
+++ b/hl/tools/CMakeLists.txt
@@ -19,7 +19,7 @@ INCLUDE_DIRECTORIES (${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5)
add_executable (gif2h5 ${GIF2H5_SRCS})
TARGET_NAMING (gif2h5 ${LIB_TYPE})
-TARGET_C_PROPERTIES (gif2h5 " " " ")
+TARGET_C_PROPERTIES (gif2h5 ${LIB_TYPE} " " " ")
target_link_libraries (gif2h5 ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
set_target_properties (gif2h5 PROPERTIES FOLDER tools/hl)
@@ -30,7 +30,7 @@ set (hdf2gif_SRCS
)
add_executable (h52gif ${hdf2gif_SRCS})
TARGET_NAMING (h52gif ${LIB_TYPE})
-TARGET_C_PROPERTIES (h52gif " " " ")
+TARGET_C_PROPERTIES (h52gif ${LIB_TYPE} " " " ")
target_link_libraries (h52gif ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
set_target_properties (h52gif PROPERTIES FOLDER tools/hl)
@@ -42,8 +42,8 @@ if (BUILD_TESTING)
# --------------------------------------------------------------------
if (HDF5_BUILD_GENERATORS AND NOT BUILD_SHARED_LIBS)
add_executable (hl_h52gifgentest ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/h52gifgentst.c)
- TARGET_NAMING (hl_h52gifgentest ${LIB_TYPE})
- TARGET_C_PROPERTIES (hl_h52gifgentest " " " ")
+ TARGET_NAMING (hl_h52gifgentest STATIC)
+ TARGET_C_PROPERTIES (hl_h52gifgentest STATIC " " " ")
target_link_libraries (hl_h52gifgentest ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
set_target_properties (hl_h52gifgentest PROPERTIES FOLDER generator/tools/hl)
diff --git a/hl/tools/CMakeTests.cmake b/hl/tools/CMakeTests.cmake
index a340c2d..4ebd7a2 100644
--- a/hl/tools/CMakeTests.cmake
+++ b/hl/tools/CMakeTests.cmake
@@ -26,6 +26,13 @@ add_custom_command (
ARGS -E copy_if_different ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/testfiles/h52giftst.h5 ${PROJECT_BINARY_DIR}/testfiles/h52giftst.h5
)
+add_custom_command (
+ TARGET h52gif
+ POST_BUILD
+ COMMAND ${CMAKE_COMMAND}
+ ARGS -E copy_if_different ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/testfiles/ex_image2.h5 ${PROJECT_BINARY_DIR}/testfiles/ex_image2.h5
+)
+
# Remove any output file left over from previous test run
add_test (
NAME HL_TOOLS-clear-objects
@@ -33,8 +40,19 @@ add_test (
-E remove
image1.gif
image1.h5
+ image.gif
+ image24.gif
)
+add_test (NAME HL_TOOLS_gif2h5 COMMAND $<TARGET_FILE:gif2h5> testfiles/image1.gif image1.h5)
+
add_test (NAME HL_TOOLS_h52gif COMMAND $<TARGET_FILE:h52gif> testfiles/h52giftst.h5 image1.gif -i image)
-add_test (NAME HL_TOOLS_gif2h5 COMMAND $<TARGET_FILE:gif2h5> testfiles/image1.gif image1.h5)
+add_test (NAME HL_TOOLS_h52gif_none COMMAND $<TARGET_FILE:h52gif> testfiles/h52giftst.h5 image.gif -i nosuch_image)
+set_tests_properties (HL_TOOLS_h52gif_none PROPERTIES WILL_FAIL "true")
+
+#add_test (NAME HL_TOOLS_h52gifpal COMMAND $<TARGET_FILE:h52gif> testfiles/h52giftst.h5 image.gif -i palette)
+#set_tests_properties (HL_TOOLS_h52gifpal PROPERTIES WILL_FAIL "true")
+
+add_test (NAME HL_TOOLS_h52gif24bits COMMAND $<TARGET_FILE:h52gif> testfiles/ex_image2.h5 image24.gif -i image24bitpixel)
+set_tests_properties (HL_TOOLS_h52gif24bits PROPERTIES WILL_FAIL "true")
diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in
index 9d4359e..77049d3 100644
--- a/hl/tools/Makefile.in
+++ b/hl/tools/Makefile.in
@@ -406,7 +406,6 @@ AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@
AM_MAKEFLAGS = @AM_MAKEFLAGS@
AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -438,7 +437,6 @@ DIRECT_VFD = @DIRECT_VFD@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
-DYNAMIC_DIRS = @DYNAMIC_DIRS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -457,17 +455,14 @@ FCFLAGS_f90 = @FCFLAGS_f90@
FCLIBS = @FCLIBS@
FC_VERSION = @FC_VERSION@
FGREP = @FGREP@
-FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@
GREP = @GREP@
H5_CFLAGS = @H5_CFLAGS@
H5_CPPFLAGS = @H5_CPPFLAGS@
H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
H5_FCFLAGS = @H5_FCFLAGS@
H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
H5_VERSION = @H5_VERSION@
HADDR_T = @HADDR_T@
HAVE_DMALLOC = @HAVE_DMALLOC@
@@ -530,7 +525,6 @@ R_INTEGER = @R_INTEGER@
R_LARGE = @R_LARGE@
SEARCH = @SEARCH@
SED = @SED@
-SETX = @SETX@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIZE_T = @SIZE_T@
@@ -545,10 +539,6 @@ TR = @TR@
TRACE_API = @TRACE_API@
UNAME_INFO = @UNAME_INFO@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
-USE_FILTER_NBIT = @USE_FILTER_NBIT@
-USE_FILTER_SCALEOFFSET = @USE_FILTER_SCALEOFFSET@
-USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@
USE_FILTER_SZIP = @USE_FILTER_SZIP@
USINGMEMCHECKER = @USINGMEMCHECKER@
VERSION = @VERSION@
diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in
index b8fdd3a..3da84e1 100644
--- a/hl/tools/gif2h5/Makefile.in
+++ b/hl/tools/gif2h5/Makefile.in
@@ -420,7 +420,6 @@ AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@
AM_MAKEFLAGS = @AM_MAKEFLAGS@
AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -452,7 +451,6 @@ DIRECT_VFD = @DIRECT_VFD@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
-DYNAMIC_DIRS = @DYNAMIC_DIRS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -471,17 +469,14 @@ FCFLAGS_f90 = @FCFLAGS_f90@
FCLIBS = @FCLIBS@
FC_VERSION = @FC_VERSION@
FGREP = @FGREP@
-FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@
GREP = @GREP@
H5_CFLAGS = @H5_CFLAGS@
H5_CPPFLAGS = @H5_CPPFLAGS@
H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_CXX_SHARED = @H5_CXX_SHARED@
H5_FCFLAGS = @H5_FCFLAGS@
H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
H5_VERSION = @H5_VERSION@
HADDR_T = @HADDR_T@
HAVE_DMALLOC = @HAVE_DMALLOC@
@@ -544,7 +539,6 @@ R_INTEGER = @R_INTEGER@
R_LARGE = @R_LARGE@
SEARCH = @SEARCH@
SED = @SED@
-SETX = @SETX@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIZE_T = @SIZE_T@
@@ -559,10 +553,6 @@ TR = @TR@
TRACE_API = @TRACE_API@
UNAME_INFO = @UNAME_INFO@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
-USE_FILTER_NBIT = @USE_FILTER_NBIT@
-USE_FILTER_SCALEOFFSET = @USE_FILTER_SCALEOFFSET@
-USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@
USE_FILTER_SZIP = @USE_FILTER_SZIP@
USINGMEMCHECKER = @USINGMEMCHECKER@
VERSION = @VERSION@
diff --git a/hl/tools/gif2h5/decompress.c b/hl/tools/gif2h5/decompress.c
index d4e4cdc..ef2d78a 100644
--- a/hl/tools/gif2h5/decompress.c
+++ b/hl/tools/gif2h5/decompress.c
@@ -90,7 +90,7 @@ ReadCode(void)
RawCode += (0x10000 * Raster[ByteOffset + 2]);
RawCode >>= (BitOffset % 8);
- BitOffset += CodeSize;
+ BitOffset += (int)CodeSize;
return (RawCode & ReadMask);
}
diff --git a/hl/tools/gif2h5/gif.h b/hl/tools/gif2h5/gif.h
index 5334919..f34a111 100644
--- a/hl/tools/gif2h5/gif.h
+++ b/hl/tools/gif2h5/gif.h
@@ -143,7 +143,7 @@ typedef struct _GifToMem {
*/
/* GIF2MEM.C */
-GIFTOMEM Gif2Mem(BYTE *);
+int Gif2Mem(BYTE *, GIFTOMEM *);
/* GIFREAD.C */
int ReadGifHeader(GIFHEAD *, BYTE **);
diff --git a/hl/tools/gif2h5/gif2hdf.c b/hl/tools/gif2h5/gif2hdf.c
index 810be78..8a9e971 100644
--- a/hl/tools/gif2h5/gif2hdf.c
+++ b/hl/tools/gif2h5/gif2hdf.c
@@ -99,7 +99,7 @@ main(int argv , char *argc[])
* Call Gif2Mem and break the whole file into parts. Gif2Mem also calls
* decompresses the images so we don't have to worry about that
*/
- GifMemoryStruct = Gif2Mem(MemGif);
+ Gif2Mem(MemGif, &GifMemoryStruct);
if (ferror(fpGif)) {
printf("File Stream Error\n\n");
diff --git a/hl/tools/gif2h5/gif2mem.c b/hl/tools/gif2h5/gif2mem.c
index ac4b0ec..456a32d 100644
--- a/hl/tools/gif2h5/gif2mem.c
+++ b/hl/tools/gif2h5/gif2mem.c
@@ -37,8 +37,8 @@
#include "gif.h"
-GIFTOMEM
-Gif2Mem(BYTE *MemGif)
+int
+Gif2Mem(BYTE *MemGif, GIFTOMEM *GifMemoryStruct)
{
/*
* The gif structure outline for passing data to memory is given in gif.h.
@@ -51,8 +51,6 @@ Gif2Mem(BYTE *MemGif)
GIFCOMMENT **gifComment; /* Comment Extension structure */
GIFGRAPHICCONTROL **gifGraphicControl; /* Graphic Control Extension strct */
- GIFTOMEM GifMemoryStruct;
-
register WORD i; /* Loop counter */
BYTE Identifier; /* Extension block identifier holder */
BYTE Label; /* Extension block label holder */
@@ -133,15 +131,15 @@ Gif2Mem(BYTE *MemGif)
gifHead->PlainTextCount = PlainTextCount;
/* putting stuff into the gif2mem structure */
- GifMemoryStruct.GifHeader = gifHead;
- GifMemoryStruct.GifImageDesc = gifImageDesc;
- GifMemoryStruct.GifPlainTextExtension = gifPlainText;
- GifMemoryStruct.GifApplicationExtension = gifApplication;
- GifMemoryStruct.GifCommentExtension = gifComment;
- GifMemoryStruct.GifGraphicControlExtension = gifGraphicControl;
+ GifMemoryStruct->GifHeader = gifHead;
+ GifMemoryStruct->GifImageDesc = gifImageDesc;
+ GifMemoryStruct->GifPlainTextExtension = gifPlainText;
+ GifMemoryStruct->GifApplicationExtension = gifApplication;
+ GifMemoryStruct->GifCommentExtension = gifComment;
+ GifMemoryStruct->GifGraphicControlExtension = gifGraphicControl;
/* return the struct */
- return GifMemoryStruct;
+ return 0;
case 0x2C: /* Image Descriptor */
/*
@@ -155,7 +153,7 @@ Gif2Mem(BYTE *MemGif)
if (ImageCount > ImageArray) {
aTemp = ImageArray;
- ImageArray = (ImageArray << 1) + 1;
+ ImageArray = (BYTE)((ImageArray << 1) + 1);
if (!(gifImageDesc = (GIFIMAGEDESC **)realloc(gifImageDesc,
sizeof(GIFIMAGEDESC *) * ImageArray))) {
printf("Out of memory!");
@@ -222,7 +220,7 @@ Gif2Mem(BYTE *MemGif)
PlainTextCount++;
if (PlainTextCount > PlainTextArray)
- PlainTextArray = (PlainTextArray << 1) + 1;
+ PlainTextArray = (BYTE)((PlainTextArray << 1) + 1);
if (!(gifPlainText = (GIFPLAINTEXT **)realloc(gifPlainText , sizeof(GIFPLAINTEXT *) * PlainTextArray))) {
printf("Out of memory!");
@@ -244,7 +242,7 @@ Gif2Mem(BYTE *MemGif)
CommentCount++;
if (CommentCount > CommentArray)
- CommentArray = (CommentArray << 1) + 1;
+ CommentArray = (BYTE)((CommentArray << 1) + 1);
if (!(gifComment = (GIFCOMMENT **)realloc(gifComment , sizeof(GIFCOMMENT *) * CommentArray))) {
printf("Out of memory!");
@@ -271,7 +269,7 @@ Gif2Mem(BYTE *MemGif)
if (ImageCount > ImageArray) {
aTemp = ImageArray;
- ImageArray = (ImageArray << 1) + 1;
+ ImageArray = (BYTE)((ImageArray << 1) + 1);
if (!(gifGraphicControl = (GIFGRAPHICCONTROL **)realloc(gifGraphicControl , sizeof(GIFGRAPHICCONTROL *) * ImageArray))) {
printf("Out of memory!");
@@ -309,7 +307,7 @@ Gif2Mem(BYTE *MemGif)
ApplicationCount++;
if (ApplicationCount > ApplicationArray)
- ApplicationArray = (ApplicationArray << 1) + 1;
+ ApplicationArray = (BYTE)((ApplicationArray << 1) + 1);
if (!(gifApplication = (GIFAPPLICATION **)realloc(gifApplication , sizeof(GIFAPPLICATION *) * ApplicationArray))) {
printf("Out of memory!");
diff --git a/hl/tools/gif2h5/h52gifgentst.c b/hl/tools/gif2h5/h52gifgentst.c
index ef38c3b..3433d0a 100644
--- a/hl/tools/gif2h5/h52gifgentst.c
+++ b/hl/tools/gif2h5/h52gifgentst.c
@@ -64,7 +64,7 @@ int main(void)
space = WIDTH*HEIGHT / PAL_ENTRIES;
for (i=0, j=0, n=0; i < WIDTH*HEIGHT; i++, j++ )
{
- buf[i] = n;
+ buf[i] = (unsigned char)n;
if ( j > space )
{
n++;
@@ -83,9 +83,9 @@ int main(void)
*/
for ( i=0, n=0; i<PAL_ENTRIES*3; i+=3, n++)
{
- pal[i] =n; /* red */
- pal[i+1]=0; /* green */
- pal[i+2]=255-n; /* blue */
+ pal[i] = (unsigned char)n; /* red */
+ pal[i+1] = (unsigned char)0; /* green */
+ pal[i+2] = (unsigned char)(255-n); /* blue */
}
/* make a palette */
diff --git a/hl/tools/gif2h5/h52giftest.sh.in b/hl/tools/gif2h5/h52giftest.sh.in
index 186b369..7aec219 100644
--- a/hl/tools/gif2h5/h52giftest.sh.in
+++ b/hl/tools/gif2h5/h52giftest.sh.in
@@ -18,6 +18,7 @@
TESTFILE1="$srcdir/testfiles/h52giftst.h5"
TESTFILE2="$srcdir/testfiles/image1.gif"
+TESTFILE3="$srcdir/testfiles/ex_image2.h5"
# initialize errors variable
errors=0
@@ -29,45 +30,69 @@ TESTING() {
-TOOLTEST1()
+# Verify the test runs with success (return code is 0)
+TOOLTEST()
{
- $RUNSERIAL ./h52gif $*
-
- RET=$?
- if [ $RET != 0 ] ; then
- echo "*FAILED*"
- errors="` expr $errors + 1 `";
- else
- echo " PASSED"
- fi
+ # for now, discard any error messages generated.
+ $RUNSERIAL $* > /dev/null 2>&1
+
+ RET=$?
+ if [ $RET = 0 ] ; then
+ echo " PASSED"
+ else
+ echo "*FAILED*"
+ errors="` expr $errors + 1 `";
+ fi
}
-TOOLTEST2()
+# Verify the test runs with failure (return code is not 0)
+# Use for testing if tool can handle error conditions like
+# illegal input, bad arguments, exeeding limits, ...
+TOOLTESTFAIL()
{
- $RUNSERIAL ./gif2h5 $*
-
- RET=$?
- if [ $RET != 0 ] ; then
- echo "*FAILED*"
- errors="` expr $errors + 1 `";
- else
- echo " PASSED"
- fi
+ # for now, discard any error messages generated.
+ $RUNSERIAL $* > /dev/null 2>&1
+
+ RET=$?
+ if [ $RET != 0 ] ; then
+ echo " PASSED"
+ else
+ echo "*FAILED*"
+ errors="` expr $errors + 1 `";
+ fi
}
+# Positive tests for gif2h5
+echo "**validate the gif2h5 tool processes input correctly..."
+TESTING "./gif2h5 image1.gif image1.h5"
+TOOLTEST ./gif2h5 $TESTFILE2 image1.h5
+echo ""
+# Positive tests for h52gif
+echo "**validate the h52gif tool processes input correctly..."
TESTING "./h52gif h52giftst.h5 image1.gif -i image"
-TOOLTEST1 $TESTFILE1 image1.gif -i image
-TESTING "./gif2h5 image1.gif image1.h5"
-TOOLTEST2 $TESTFILE2 image1.h5
+TOOLTEST ./h52gif $TESTFILE1 image1.gif -i image
+echo ""
+# Negative tests.
+echo "**verify the the h52gif tool handle error conditions correctly..."
+# nonexisting dataset name
+TESTING "./h52gif h52giftst.h5 image.gif -i nosuch_image"
+TOOLTESTFAIL "./h52gif $TESTFILE1 image.gif -i nosuch_image"
+# this test should have failed but it did not. Comment it out for now.
+#TESTING "./h52gif h52giftst.h5 image.gif -i palette"
+#TOOLTESTFAIL "./h52gif $TESTFILE1 image.gif -i palette"
+TESTING "./h52gif h52giftst.h5 image24.gif -i image24bitpixel"
+TOOLTESTFAIL "./h52gif $TESTFILE3 image24.gif -i image24bitpixel"
+echo ""
+# all done. summarize results.
if test $errors -eq 0 ; then
- echo "All h52gif tests passed."
+ echo "All gif2h5 and h52gif tests passed."
exit 0
else
- echo "h52gif tests failed with $errors errors."
+ echo "Some gif2h5 or h52gif tests failed with $errors errors."
exit 1
fi
diff --git a/hl/tools/gif2h5/hdf2gif.c b/hl/tools/gif2h5/hdf2gif.c
index 090d657..5c342ba 100644
--- a/hl/tools/gif2h5/hdf2gif.c
+++ b/hl/tools/gif2h5/hdf2gif.c
@@ -20,6 +20,8 @@
#include "h5tools.h"
#include "h5tools_utils.h"
+#define IMAGE_WIDTH_MAX 65535 /* unsigned 16bits integer */
+#define IMAGE_HEIGHT_MAX 65535 /* unsigned 16bits integer */
int EndianOrder;
@@ -147,6 +149,17 @@ int main(int argc , char **argv)
if ( H5IMget_image_info( fid, image_name, &width, &height, &planes, interlace, &npals ) < 0 )
goto out;
+ if (width > IMAGE_WIDTH_MAX || height > IMAGE_HEIGHT_MAX){
+ fprintf(stderr, "HDF5 image is too large. Limit is %d by %d.\n", IMAGE_WIDTH_MAX, IMAGE_HEIGHT_MAX);
+ goto out;
+ }
+
+ /* tool can handle single plane images only. */
+ if (planes > 1){
+ fprintf(stderr, "Cannot handle multiple planes image\n");
+ goto out;
+ }
+
Image = (BYTE*) malloc( (size_t) width * (size_t) height );
if ( H5IMread_image( fid, image_name, Image ) < 0 )
@@ -194,9 +207,9 @@ int main(int argc , char **argv)
numcols = 256;
for (i = 0 ; i < numcols ; i++)
{
- Red[i] = 255 - i;
- Green[i] = 255 - i;
- Blue[i] = 255 - i;
+ Red[i] = (BYTE)(255 - i);
+ Green[i] = (BYTE)(255 - i);
+ Blue[i] = (BYTE)(255 - i);
}
}
else
@@ -229,7 +242,7 @@ int main(int argc , char **argv)
if (j==i)
{
/* wasn't found */
- pc2nc[i] = nc;
+ pc2nc[i] = (BYTE)nc;
r1[nc] = Red[i];
g1[nc] = Green[i];
b1[nc] = Blue[i];
diff --git a/hl/tools/gif2h5/hdfgifwr.c b/hl/tools/gif2h5/hdfgifwr.c
index d828226..4c52f4c 100644
--- a/hl/tools/gif2h5/hdfgifwr.c
+++ b/hl/tools/gif2h5/hdfgifwr.c
@@ -270,7 +270,7 @@ nomatch:
ent = c;
if (free_ent < maxmaxcode) {
- CodeTabOf (i) = free_ent++; /* code -> hashtable */
+ CodeTabOf (i) = (unsigned short)free_ent++; /* code -> hashtable */
HashTabOf (i) = fcode;
} else {
cl_block();
@@ -313,9 +313,9 @@ output(int code)
cur_accum &= masks[cur_bits];
if (cur_bits > 0)
- cur_accum |= ((long)code << cur_bits);
+ cur_accum |= (unsigned long)((long)code << cur_bits);
else
- cur_accum = code;
+ cur_accum = (unsigned long)code;
cur_bits += n_bits;
@@ -437,7 +437,7 @@ static char accum[ 256 ];
static void
char_out(int c)
{
- accum[ a_count++ ] = c;
+ accum[ a_count++ ] = (char)c;
if (a_count >= 254)
flush_char();
diff --git a/hl/tools/gif2h5/testfiles/REAMDE b/hl/tools/gif2h5/testfiles/REAMDE
new file mode 100644
index 0000000..a428d47
--- /dev/null
+++ b/hl/tools/gif2h5/testfiles/REAMDE
@@ -0,0 +1,6 @@
+ex_image2.h5
+ Generated by hl/examples/ex_image2.c
+5giftst.h5:
+ Generated by ../h52gifgentst.c
+image1.gif:
+ To be determined.
diff --git a/hl/tools/gif2h5/testfiles/ex_image2.h5 b/hl/tools/gif2h5/testfiles/ex_image2.h5
new file mode 100644
index 0000000..a36df1b
--- /dev/null
+++ b/hl/tools/gif2h5/testfiles/ex_image2.h5
Binary files differ