[svn-r3252] Purpose:

    Code cleanup.
Description:
    Fixed _lots_ (I mean _tons_) of warnings spit out by the gcc with the
    extra warnings.  Including a few show-stoppers for compression on IRIX
    machines.
Solution:
    Changed lots of variables' types to more sensible and consistent types,
    more range-checking, more variable typecasts, etc.
Platforms tested:
    FreeBSD 4.2 (hawkwind), IRIX64-64 (modi4)

1 files changed, 104 insertions, 107 deletions

diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h
index 5917945..6158d70 100644
--- a/src/H5Tpkg.h
+++ b/src/H5Tpkg.h
@@ -219,519 +219,519 @@ __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 buf_stride,
+			     hsize_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 buf_stride,
+			      hsize_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 buf_stride,
+			       hsize_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,
+				   H5T_cdata_t *cdata, hsize_t nelmts,
 				   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 buf_stride,
+			     hsize_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 buf_stride,
+			     hsize_t nelmts, size_t buf_stride,
                              size_t bkg_stride, void *buf, void *bkg,
                              hid_t dset_xfer_plist);
 __DLL__ herr_t H5T_conv_array(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
-			     size_t nelmts, size_t buf_stride,
+			     hsize_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 buf_stride,
+			    hsize_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 buf_stride,
+			    hsize_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 buf_stride,
+			    hsize_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 buf_stride,
+			    hsize_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,
+				    H5T_cdata_t *cdata, hsize_t nelmts,
 				    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,
+				    H5T_cdata_t *cdata, hsize_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_short(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
+				    H5T_cdata_t *cdata, hsize_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_ushort(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
+				     H5T_cdata_t *cdata, hsize_t nelmts,
 				     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,
+				    H5T_cdata_t *cdata, hsize_t nelmts,
 				    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,
+				     H5T_cdata_t *cdata, hsize_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_int(hid_t src_id, hid_t dst_id,
-				  H5T_cdata_t *cdata, size_t nelmts,
+				  H5T_cdata_t *cdata, hsize_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_uint(hid_t src_id, hid_t dst_id,
-				   H5T_cdata_t *cdata, size_t nelmts,
+				   H5T_cdata_t *cdata, hsize_t nelmts,
 				   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,
+				  H5T_cdata_t *cdata, hsize_t nelmts,
 				  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,
+				   H5T_cdata_t *cdata, hsize_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_long(hid_t src_id, hid_t dst_id,
-				   H5T_cdata_t *cdata, size_t nelmts,
+				   H5T_cdata_t *cdata, hsize_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_ulong(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
+				    H5T_cdata_t *cdata, hsize_t nelmts,
 				    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,
+				   H5T_cdata_t *cdata, hsize_t nelmts,
 				   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,
+				    H5T_cdata_t *cdata, hsize_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_llong(hid_t src_id, hid_t dst_id,
-				    H5T_cdata_t *cdata, size_t nelmts,
+				    H5T_cdata_t *cdata, hsize_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_ullong(hid_t src_id, hid_t dst_id,
-				     H5T_cdata_t *cdata, size_t nelmts,
+				     H5T_cdata_t *cdata, hsize_t nelmts,
 				     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,
+				    H5T_cdata_t *cdata, hsize_t nelmts,
 				    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,
+				     H5T_cdata_t *cdata, hsize_t nelmts,
 				     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,
+				    H5T_cdata_t *cdata, hsize_t nelmts,
 				    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,
+				    H5T_cdata_t *cdata, hsize_t nelmts,
 				    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,
+				     H5T_cdata_t *cdata, hsize_t nelmts,
 				     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,
+				     H5T_cdata_t *cdata, hsize_t nelmts,
 				     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,
+				     H5T_cdata_t *cdata, hsize_t nelmts,
 				     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,
+				     H5T_cdata_t *cdata, hsize_t nelmts,
 				     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,
+				  H5T_cdata_t *cdata, hsize_t nelmts,
 				  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,
+				   H5T_cdata_t *cdata, hsize_t nelmts,
 				   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,
+				   H5T_cdata_t *cdata, hsize_t nelmts,
 				   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,
+				    H5T_cdata_t *cdata, hsize_t nelmts,
 				    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,
+				   H5T_cdata_t *cdata, hsize_t nelmts,
 				   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,
+				    H5T_cdata_t *cdata, hsize_t nelmts,
 				    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,
+				    H5T_cdata_t *cdata, hsize_t nelmts,
 				    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,
+				     H5T_cdata_t *cdata, hsize_t nelmts,
 				     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,
+				    H5T_cdata_t *cdata, hsize_t nelmts,
 				    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,
+				     H5T_cdata_t *cdata, hsize_t nelmts,
 				     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,
+				     H5T_cdata_t *cdata, hsize_t nelmts,
 				     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,
+				      H5T_cdata_t *cdata, hsize_t nelmts,
 				      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,
+				  H5T_cdata_t *cdata, hsize_t nelmts,
 				  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,
+				  H5T_cdata_t *cdata, hsize_t nelmts,
 				  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,
+				   H5T_cdata_t *cdata, hsize_t nelmts,
 				   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,
+				   H5T_cdata_t *cdata, hsize_t nelmts,
 				   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,
+				  H5T_cdata_t *cdata, hsize_t nelmts,
 				  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,
+				   H5T_cdata_t *cdata, hsize_t nelmts,
 				   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,
+				   H5T_cdata_t *cdata, hsize_t nelmts,
 				   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,
+				    H5T_cdata_t *cdata, hsize_t nelmts,
 				    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,
+				 H5T_cdata_t *cdata, hsize_t nelmts,
 				 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,
+				 H5T_cdata_t *cdata, hsize_t nelmts,
 				 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,
+				 H5T_cdata_t *cdata, hsize_t nelmts,
 				 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,
+				  H5T_cdata_t *cdata, hsize_t nelmts,
 				  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,
+				  H5T_cdata_t *cdata, hsize_t nelmts,
 				  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,
+				   H5T_cdata_t *cdata, hsize_t nelmts,
 				   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,
+				  H5T_cdata_t *cdata, hsize_t nelmts,
 				  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,
+				   H5T_cdata_t *cdata, hsize_t nelmts,
 				   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,
+				   H5T_cdata_t *cdata, hsize_t nelmts,
 				   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,
+				    H5T_cdata_t *cdata, hsize_t nelmts,
 				    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,
+				   H5T_cdata_t *cdata, hsize_t nelmts,
 				   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,
+				   H5T_cdata_t *cdata, hsize_t nelmts,
 				   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,
+				    H5T_cdata_t *cdata, hsize_t nelmts,
 				    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,
+				    H5T_cdata_t *cdata, hsize_t nelmts,
 				    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,
+				   H5T_cdata_t *cdata, hsize_t nelmts,
 				   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,
+				    H5T_cdata_t *cdata, hsize_t nelmts,
 				    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,
+				    H5T_cdata_t *cdata, hsize_t nelmts,
 				    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,
+				     H5T_cdata_t *cdata, hsize_t nelmts,
 				     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,
+				 H5T_cdata_t *cdata, hsize_t nelmts,
 				 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,
+				  H5T_cdata_t *cdata, hsize_t nelmts,
 				  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,
+				  H5T_cdata_t *cdata, hsize_t nelmts,
 				  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,
+				   H5T_cdata_t *cdata, hsize_t nelmts,
 				   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,
+				   H5T_cdata_t *cdata, hsize_t nelmts,
 				   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,
+				   H5T_cdata_t *cdata, hsize_t nelmts,
 				   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,
+				   H5T_cdata_t *cdata, hsize_t nelmts,
 				   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,
+				    H5T_cdata_t *cdata, hsize_t nelmts,
 				    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,
+				    H5T_cdata_t *cdata, hsize_t nelmts,
 				    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,
+				     H5T_cdata_t *cdata, hsize_t nelmts,
 				     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,
+				    H5T_cdata_t *cdata, hsize_t nelmts,
 				    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,
+				    H5T_cdata_t *cdata, hsize_t nelmts,
 				    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,
+				     H5T_cdata_t *cdata, hsize_t nelmts,
 				     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,
+				     H5T_cdata_t *cdata, hsize_t nelmts,
 				     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,
+				    H5T_cdata_t *cdata, hsize_t nelmts,
 				    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,
+				     H5T_cdata_t *cdata, hsize_t nelmts,
 				     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,
+				     H5T_cdata_t *cdata, hsize_t nelmts,
 				     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,
+				      H5T_cdata_t *cdata, hsize_t nelmts,
 				      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,
+				  H5T_cdata_t *cdata, hsize_t nelmts,
 				  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,
+				   H5T_cdata_t *cdata, hsize_t nelmts,
 				   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,
+				   H5T_cdata_t *cdata, hsize_t nelmts,
 				   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,
+				    H5T_cdata_t *cdata, hsize_t nelmts,
 				    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,
+				   H5T_cdata_t *cdata, hsize_t nelmts,
 				   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,
+				    H5T_cdata_t *cdata, hsize_t nelmts,
 				    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,
+				    H5T_cdata_t *cdata, hsize_t nelmts,
 				    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,
+				     H5T_cdata_t *cdata, hsize_t nelmts,
 				     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,
+				     H5T_cdata_t *cdata, hsize_t nelmts,
 				     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,
+				     H5T_cdata_t *cdata, hsize_t nelmts,
 				     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,
+				     H5T_cdata_t *cdata, hsize_t nelmts,
 				     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,
+				     H5T_cdata_t *cdata, hsize_t nelmts,
 				     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,
+				    H5T_cdata_t *cdata, hsize_t nelmts,
 				    size_t buf_stride, size_t bkg_stride,
                                     void *_buf, void *bkg,
                                     hid_t dset_xfer_plist);
@@ -763,7 +763,4 @@ __DLL__ herr_t H5T_vlen_disk_write(const H5D_xfer_t *xfer_parms, H5F_t *f, void
 __DLL__ H5T_t * H5T_array_create(H5T_t *base, int ndims,
         const hsize_t dim[/* ndims */], const int perm[/* ndims */]);
 
-/* Reference specific functions */
-__DLL__ H5R_type_t H5T_get_ref_type(const H5T_t *dt);
-
 #endif