[svn-r2262] * 2000-05-18

** src/H5Tconv.c
** src/H5Tpkg.h
** src/H5Tpublic.h
	The H5T_conv_struct_opt() function had a design flaw -- it
	didn't keep information about the stride to use to step
	through the temporary/background-value buffer and thus nested
	invocations would clobber each other's temp buffers.  This was
	fixed by splitting the `stride' argument into `buf_stride' and
	`bkg_stride' arguments for all the conversion functions. THIS
	IS AN API CHANGE, but users will get a compiler warning when
	they pass their conversion function pointer to H5Tregister().

** src/H5T.c
** src/H5Tprivate.h
	Added a bkg_stride argument to the H5T_convert() definition in
	order to fix a bug related to the optimized compound datatype
	conversion function.

** src/H5T.c
** src/H5A.c
** src/H5D.c
** src/H5Ofill.c
** src/H5P.c
	Added bkg_stride=0 argument to the H5T_convert() calls.

** test/dtypes.c
	Added a test for the H5T_conv_struct_opt() bug fixed above.

** src/H5FL.c
	The H5FL_term() function should return non-zero even when it
	couldn't free all the free lists do to their being used by
	some other package.  When that other package terminates it
	will return non-zero, causing H5FL_term() to be called
	again. This fixes some of the `infinite loop closing library'
	messages.

** tools/pdb2hdf
	Uses print_version() instead of doing that itself.

** src/H5Ppublic.h
	Renamed H5Pget_gc_reference() declaration to make it match the
	definition.

** src/H5FDlog.c
	Added API tracing macros.

	Removed `const' qualifier from a `char*' member of a struct
	which was allocated on the heap.

** src/H5TB.c
	Added curly braces to a couple deeply-nested `if' statements
	to make them clearer and to shut up the increadibly stupid and
	just plain incorrect gcc warning about ambiguous `else'.

** test/titerate.c
	Removed incomplete initialization in favor of memset() for one
	auto variable to stop compiler warnings.

** tools/Depencencies
	Regenerated to remove references to h5dumputil.c

1 files changed, 309 insertions, 112 deletions

diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h
index 1ef3b24..f541b63 100644
--- a/src/H5Tpkg.h
+++ b/src/H5Tpkg.h
@@ -209,321 +209,518 @@ __DLLVAR__ size_t	H5T_NATIVE_UINT_FAST64_ALIGN_g;
 
 /* Conversion functions */
 __DLL__ herr_t H5T_conv_noop(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, size_t stride, void *buf,
-			     void *bkg, hid_t dset_xfer_plist);
+			     size_t nelmts, size_t buf_stride,
+                             size_t bkg_stride, void *buf, void *bkg,
+                             hid_t dset_xfer_plist);
 
 __DLL__ herr_t H5T_conv_order(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			      size_t nelmts, size_t stride, void *_buf,
-			      void *bkg, hid_t dset_xfer_plist);
+			      size_t nelmts, size_t buf_stride,
+                              size_t bkg_stride, void *_buf, void *bkg,
+                              hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			       size_t nelmts, size_t stride, void *_buf,
-			       void *bkg, hid_t dset_xfer_plist);
+			       size_t nelmts, size_t buf_stride,
+                               size_t bkg_stride, void *_buf, void *bkg,
+                               hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_struct_opt(hid_t src_id, hid_t dst_id,
 				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t stride, void *_buf, void *bkg, hid_t dset_xfer_plist);
+				   size_t buf_stride, size_t bkg_stride,
+                                   void *_buf, void *bkg,
+                                   hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, size_t stride, void *buf,
-			     void *bkg, hid_t dset_xfer_plist);
+			     size_t nelmts, size_t buf_stride,
+                             size_t bkg_stride, void *buf, void *bkg,
+                             hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, size_t stride, void *buf,
-			     void *bkg, hid_t dset_xfer_plist);
+			     size_t nelmts, size_t buf_stride,
+                             size_t bkg_stride, void *buf, void *bkg,
+                             hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_i_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, size_t stride, void *_buf,
-			    void *bkg, hid_t dset_xfer_plist);
+			    size_t nelmts, size_t buf_stride,
+                            size_t bkg_stride, void *_buf, void *bkg,
+                            hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, size_t stride, void *_buf,
-			    void *bkg, hid_t dset_xfer_plist);
+			    size_t nelmts, size_t buf_stride,
+                            size_t bkg_stride, void *_buf, void *bkg,
+                            hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_s_s(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, size_t stride, void *_buf,
-			    void *bkg, hid_t dset_xfer_plist);
+			    size_t nelmts, size_t buf_stride,
+                            size_t bkg_stride, void *_buf, void *bkg,
+                            hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			    size_t nelmts, size_t stride, void *_buf,
-			    void *bkg, hid_t dset_xfer_plist);
+			    size_t nelmts, size_t buf_stride,
+                            size_t bkg_stride, void *_buf, void *bkg,
+                            hid_t dset_xfer_plist);
 
 __DLL__ herr_t H5T_conv_schar_uchar(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_uchar_schar(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_schar_short(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_schar_ushort(hid_t src_id, hid_t dst_id,
 				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				     size_t buf_stride, size_t bkg_stride,
+                                     void *buf, void *bkg,
+                                     hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_uchar_short(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_uchar_ushort(hid_t src_id, hid_t dst_id,
 				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				     size_t buf_stride, size_t bkg_stride,
+                                     void *buf, void *bkg,
+                                     hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_schar_int(hid_t src_id, hid_t dst_id,
 				  H5T_cdata_t *cdata, size_t nelmts,
-				  size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				  size_t buf_stride, size_t bkg_stride,
+                                  void *buf, void *bkg,
+                                  hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_schar_uint(hid_t src_id, hid_t dst_id,
 				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				   size_t buf_stride, size_t bkg_stride,
+                                   void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_uchar_int(hid_t src_id, hid_t dst_id,
 				  H5T_cdata_t *cdata, size_t nelmts,
-				  size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				  size_t buf_stride, size_t bkg_stride,
+                                  void *buf, void *bkg,
+                                  hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_uchar_uint(hid_t src_id, hid_t dst_id,
 				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				   size_t buf_stride, size_t bkg_stride,
+                                   void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_schar_long(hid_t src_id, hid_t dst_id,
 				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				   size_t buf_stride, size_t bkg_stride,
+                                   void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_schar_ulong(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_uchar_long(hid_t src_id, hid_t dst_id,
 				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				   size_t buf_stride, size_t bkg_stride,
+                                   void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_uchar_ulong(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_schar_llong(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_schar_ullong(hid_t src_id, hid_t dst_id,
 				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				     size_t buf_stride, size_t bkg_stride,
+                                     void *buf, void *bkg,
+                                     hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_uchar_llong(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_uchar_ullong(hid_t src_id, hid_t dst_id,
 				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				     size_t buf_stride, size_t bkg_stride,
+                                     void *buf, void *bkg,
+                                     hid_t dset_xfer_plist);
 
 __DLL__ herr_t H5T_conv_short_schar(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_short_uchar(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ushort_schar(hid_t src_id, hid_t dst_id,
 				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				     size_t buf_stride, size_t bkg_stride,
+                                     void *buf, void *bkg,
+                                     hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ushort_uchar(hid_t src_id, hid_t dst_id,
 				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				     size_t buf_stride, size_t bkg_stride,
+                                     void *buf, void *bkg,
+                                     hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_short_ushort(hid_t src_id, hid_t dst_id,
 				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				     size_t buf_stride, size_t bkg_stride,
+                                     void *buf, void *bkg,
+                                     hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ushort_short(hid_t src_id, hid_t dst_id,
 				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				     size_t buf_stride, size_t bkg_stride,
+                                     void *buf, void *bkg,
+                                     hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_short_int(hid_t src_id, hid_t dst_id,
 				  H5T_cdata_t *cdata, size_t nelmts,
-				  size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				  size_t buf_stride, size_t bkg_stride,
+                                  void *buf, void *bkg,
+                                  hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_short_uint(hid_t src_id, hid_t dst_id,
 				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				   size_t buf_stride, size_t bkg_stride,
+                                   void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ushort_int(hid_t src_id, hid_t dst_id,
 				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				   size_t buf_stride, size_t bkg_stride,
+                                   void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ushort_uint(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_short_long(hid_t src_id, hid_t dst_id,
 				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				   size_t buf_stride, size_t bkg_stride,
+                                   void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_short_ulong(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ushort_long(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ushort_ulong(hid_t src_id, hid_t dst_id,
 				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				     size_t buf_stride, size_t bkg_stride,
+                                     void *buf, void *bkg,
+                                     hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_short_llong(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_short_ullong(hid_t src_id, hid_t dst_id,
 				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				     size_t buf_stride, size_t bkg_stride,
+                                     void *buf, void *bkg,
+                                     hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ushort_llong(hid_t src_id, hid_t dst_id,
 				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				     size_t buf_stride, size_t bkg_stride,
+                                     void *buf, void *bkg,
+                                     hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ushort_ullong(hid_t src_id, hid_t dst_id,
 				      H5T_cdata_t *cdata, size_t nelmts,
-				      size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				      size_t buf_stride, size_t bkg_stride,
+                                      void *buf, void *bkg,
+                                      hid_t dset_xfer_plist);
 
 __DLL__ herr_t H5T_conv_int_schar(hid_t src_id, hid_t dst_id,
 				  H5T_cdata_t *cdata, size_t nelmts,
-				  size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				  size_t buf_stride, size_t bkg_stride,
+                                  void *buf, void *bkg,
+                                  hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_int_uchar(hid_t src_id, hid_t dst_id,
 				  H5T_cdata_t *cdata, size_t nelmts,
-				  size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				  size_t buf_stride, size_t bkg_stride,
+                                  void *buf, void *bkg,
+                                  hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_uint_schar(hid_t src_id, hid_t dst_id,
 				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				   size_t buf_stride, size_t bkg_stride,
+                                   void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_uint_uchar(hid_t src_id, hid_t dst_id,
 				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				   size_t buf_stride, size_t bkg_stride,
+                                   void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_int_short(hid_t src_id, hid_t dst_id,
 				  H5T_cdata_t *cdata, size_t nelmts,
-				  size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				  size_t buf_stride, size_t bkg_stride,
+                                  void *buf, void *bkg,
+                                  hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_int_ushort(hid_t src_id, hid_t dst_id,
 				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				   size_t buf_stride, size_t bkg_stride,
+                                   void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_uint_short(hid_t src_id, hid_t dst_id,
 				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				   size_t buf_stride, size_t bkg_stride,
+                                   void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_uint_ushort(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_int_uint(hid_t src_id, hid_t dst_id,
 				 H5T_cdata_t *cdata, size_t nelmts,
-				 size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				 size_t buf_stride, size_t bkg_stride,
+                                 void *buf, void *bkg,
+                                 hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_uint_int(hid_t src_id, hid_t dst_id,
 				 H5T_cdata_t *cdata, size_t nelmts,
-				 size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				 size_t buf_stride, size_t bkg_stride,
+                                 void *buf, void *bkg,
+                                 hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_int_long(hid_t src_id, hid_t dst_id,
 				 H5T_cdata_t *cdata, size_t nelmts,
-				 size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				 size_t buf_stride, size_t bkg_stride,
+                                 void *buf, void *bkg,
+                                 hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_int_ulong(hid_t src_id, hid_t dst_id,
 				  H5T_cdata_t *cdata, size_t nelmts,
-				  size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				  size_t buf_stride, size_t bkg_stride,
+                                  void *buf, void *bkg,
+                                  hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_uint_long(hid_t src_id, hid_t dst_id,
 				  H5T_cdata_t *cdata, size_t nelmts,
-				  size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				  size_t buf_stride, size_t bkg_stride,
+                                  void *buf, void *bkg,
+                                  hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_uint_ulong(hid_t src_id, hid_t dst_id,
 				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				   size_t buf_stride, size_t bkg_stride,
+                                   void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_int_llong(hid_t src_id, hid_t dst_id,
 				  H5T_cdata_t *cdata, size_t nelmts,
-				  size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				  size_t buf_stride, size_t bkg_stride,
+                                  void *buf, void *bkg,
+                                  hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_int_ullong(hid_t src_id, hid_t dst_id,
 				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				   size_t buf_stride, size_t bkg_stride,
+                                   void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_uint_llong(hid_t src_id, hid_t dst_id,
 				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				   size_t buf_stride, size_t bkg_stride,
+                                   void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_uint_ullong(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 
 __DLL__ herr_t H5T_conv_long_schar(hid_t src_id, hid_t dst_id,
 				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				   size_t buf_stride, size_t bkg_stride,
+                                   void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_long_uchar(hid_t src_id, hid_t dst_id,
 				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				   size_t buf_stride, size_t bkg_stride,
+                                   void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ulong_schar(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ulong_uchar(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_long_short(hid_t src_id, hid_t dst_id,
 				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				   size_t buf_stride, size_t bkg_stride,
+                                   void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_long_ushort(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ulong_short(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ulong_ushort(hid_t src_id, hid_t dst_id,
 				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				     size_t buf_stride, size_t bkg_stride,
+                                     void *buf, void *bkg,
+                                     hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_long_int(hid_t src_id, hid_t dst_id,
 				 H5T_cdata_t *cdata, size_t nelmts,
-				 size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				 size_t buf_stride, size_t bkg_stride,
+                                 void *buf, void *bkg,
+                                 hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_long_uint(hid_t src_id, hid_t dst_id,
 				  H5T_cdata_t *cdata, size_t nelmts,
-				  size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				  size_t buf_stride, size_t bkg_stride,
+                                  void *buf, void *bkg,
+                                  hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ulong_int(hid_t src_id, hid_t dst_id,
 				  H5T_cdata_t *cdata, size_t nelmts,
-				  size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				  size_t buf_stride, size_t bkg_stride,
+                                  void *buf, void *bkg,
+                                  hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ulong_uint(hid_t src_id, hid_t dst_id,
 				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				   size_t buf_stride, size_t bkg_stride,
+                                   void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_long_ulong(hid_t src_id, hid_t dst_id,
 				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				   size_t buf_stride, size_t bkg_stride,
+                                   void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ulong_long(hid_t src_id, hid_t dst_id,
 				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				   size_t buf_stride, size_t bkg_stride,
+                                   void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_long_llong(hid_t src_id, hid_t dst_id,
 				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				   size_t buf_stride, size_t bkg_stride,
+                                   void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_long_ullong(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ulong_llong(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ulong_ullong(hid_t src_id, hid_t dst_id,
 				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				     size_t buf_stride, size_t bkg_stride,
+                                     void *buf, void *bkg,
+                                     hid_t dset_xfer_plist);
 
 __DLL__ herr_t H5T_conv_llong_schar(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_llong_uchar(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ullong_schar(hid_t src_id, hid_t dst_id,
 				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				     size_t buf_stride, size_t bkg_stride,
+                                     void *buf, void *bkg,
+                                     hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ullong_uchar(hid_t src_id, hid_t dst_id,
 				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				     size_t buf_stride, size_t bkg_stride,
+                                     void *buf, void *bkg,
+                                     hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_llong_short(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_llong_ushort(hid_t src_id, hid_t dst_id,
 				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				     size_t buf_stride, size_t bkg_stride,
+                                     void *buf, void *bkg,
+                                     hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ullong_short(hid_t src_id, hid_t dst_id,
 				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				     size_t buf_stride, size_t bkg_stride,
+                                     void *buf, void *bkg,
+                                     hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ullong_ushort(hid_t src_id, hid_t dst_id,
 				      H5T_cdata_t *cdata, size_t nelmts,
-				      size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				      size_t buf_stride, size_t bkg_stride,
+                                      void *buf, void *bkg,
+                                      hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_llong_int(hid_t src_id, hid_t dst_id,
 				  H5T_cdata_t *cdata, size_t nelmts,
-				  size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				  size_t buf_stride, size_t bkg_stride,
+                                  void *buf, void *bkg,
+                                  hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_llong_uint(hid_t src_id, hid_t dst_id,
 				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				   size_t buf_stride, size_t bkg_stride,
+                                   void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ullong_int(hid_t src_id, hid_t dst_id,
 				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				   size_t buf_stride, size_t bkg_stride,
+                                   void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ullong_uint(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_llong_long(hid_t src_id, hid_t dst_id,
 				   H5T_cdata_t *cdata, size_t nelmts,
-				   size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				   size_t buf_stride, size_t bkg_stride,
+                                   void *buf, void *bkg,
+                                   hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_llong_ulong(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ullong_long(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ullong_ulong(hid_t src_id, hid_t dst_id,
 				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				     size_t buf_stride, size_t bkg_stride,
+                                     void *buf, void *bkg,
+                                     hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_llong_ullong(hid_t src_id, hid_t dst_id,
 				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				     size_t buf_stride, size_t bkg_stride,
+                                     void *buf, void *bkg,
+                                     hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_ullong_llong(hid_t src_id, hid_t dst_id,
 				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				     size_t buf_stride, size_t bkg_stride,
+                                     void *buf, void *bkg,
+                                     hid_t dset_xfer_plist);
 
 __DLL__ herr_t H5T_conv_float_double(hid_t src_id, hid_t dst_id,
 				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				     size_t buf_stride, size_t bkg_stride,
+                                     void *buf, void *bkg,
+                                     hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_double_float(hid_t src_id, hid_t dst_id,
 				     H5T_cdata_t *cdata, size_t nelmts,
-				     size_t stride, void *buf, void *bkg, hid_t dset_xfer_plist);
+				     size_t buf_stride, size_t bkg_stride,
+                                     void *buf, void *bkg,
+                                     hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_i32le_f64le(hid_t src_id, hid_t dst_id,
 				    H5T_cdata_t *cdata, size_t nelmts,
-				    size_t stride, void *_buf, void *bkg, hid_t dset_xfer_plist);
+				    size_t buf_stride, size_t bkg_stride,
+                                    void *_buf, void *bkg,
+                                    hid_t dset_xfer_plist);
 
 /* Bit twiddling functions */
 __DLL__ void H5T_bit_copy(uint8_t *dst, size_t dst_offset, const uint8_t *src,