[SCM] hdf5 branch, master, updated. upstream/1.8.7-153-g1917b91
Sylvestre Ledru
sylvestre.ledru at scilab-enterprises.com
Fri Jun 21 09:26:25 UTC 2013
The following commit has been merged in the master branch:
commit 1917b911dae3c54e827b7ee0dbe5d0b8dc41b363
Merge: 29fafe7818d7d9fc5d6a8ba1e69e8111c254eb11 08e52c6f59b903c45fb012a59711b3495c1566d6
Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
Date: Fri Jun 21 11:26:08 2013 +0200
Merge tag 'upstream/1.8.11'
Upstream version 1.8.11
Conflicts:
src/H5F.c
diff --combined src/H5Tconv.c
index a871b64,4e8a88d..c5a24c4
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@@ -605,7 -605,7 +605,7 @@@
{ \
herr_t ret_value=SUCCEED; /* Return value */ \
\
- FUNC_ENTER_NOAPI(FAIL) \
+ FUNC_ENTER_PACKAGE \
\
{ \
size_t elmtno; /*element number */ \
@@@ -890,7 -890,7 +890,7 @@@ done
/* Local Typedefs */
/******************/
- /* Conversion data for H5T_conv_struct() */
+ /* Conversion data for H5T__conv_struct() */
typedef struct H5T_conv_struct_t {
int *src2dst; /*mapping from src to dst member num */
hid_t *src_memb_id; /*source member type ID's */
@@@ -900,7 -900,7 +900,7 @@@
unsigned src_nmembs; /*needed by free function */
} H5T_conv_struct_t;
- /* Conversion data for H5T_conv_enum() */
+ /* Conversion data for H5T__conv_enum() */
typedef struct H5T_enum_struct_t {
int base; /*lowest `in' value */
int length; /*num elements in arrays */
@@@ -972,7 -972,7 +972,7 @@@ H5T_init_conv_interface(void
/*-------------------------------------------------------------------------
- * Function: H5T_conv_noop
+ * Function: H5T__conv_noop
*
* Purpose: The no-op conversion. The library knows about this
* conversion without it being registered.
@@@ -985,14 -985,14 +985,14 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_noop(hid_t UNUSED src_id, hid_t UNUSED dst_id, H5T_cdata_t *cdata,
+ H5T__conv_noop(hid_t UNUSED src_id, hid_t UNUSED dst_id, H5T_cdata_t *cdata,
size_t UNUSED nelmts, size_t UNUSED buf_stride,
size_t UNUSED bkg_stride, void UNUSED *buf,
void UNUSED *background, hid_t UNUSED dxpl_id)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(FAIL)
+ FUNC_ENTER_PACKAGE
switch(cdata->command) {
case H5T_CONV_INIT:
@@@ -1012,14 -1012,14 +1012,14 @@@
done:
FUNC_LEAVE_NOAPI(ret_value)
- } /* end H5T_conv_noop() */
+ } /* end H5T__conv_noop() */
/*-------------------------------------------------------------------------
- * Function: H5T_conv_order_opt
+ * Function: H5T__conv_order_opt
*
* Purpose: Convert one type to another when byte order is the only
- * difference. This is the optimized version of H5T_conv_order()
+ * difference. This is the optimized version of H5T__conv_order()
* for a handful of different sizes.
*
* Note: This is a soft conversion function.
@@@ -1034,7 -1034,7 +1034,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_order_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_order_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *_buf,
void UNUSED *background, hid_t UNUSED dxpl_id)
@@@ -1045,7 -1045,7 +1045,7 @@@
size_t i;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(FAIL)
+ FUNC_ENTER_PACKAGE
switch(cdata->command) {
case H5T_CONV_INIT:
@@@ -1415,11 -1415,11 +1415,11 @@@
done:
FUNC_LEAVE_NOAPI(ret_value)
- } /* end H5T_conv_order_opt() */
+ } /* end H5T__conv_order_opt() */
/*-------------------------------------------------------------------------
- * Function: H5T_conv_order
+ * Function: H5T__conv_order
*
* Purpose: Convert one type to another when byte order is the only
* difference.
@@@ -1442,7 -1442,7 +1442,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_order(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+ H5T__conv_order(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
size_t buf_stride, size_t UNUSED bkg_stride, void *_buf,
void UNUSED *background, hid_t UNUSED dxpl_id)
{
@@@ -1453,7 -1453,7 +1453,7 @@@
size_t j, md;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(FAIL)
+ FUNC_ENTER_PACKAGE
switch(cdata->command) {
case H5T_CONV_INIT:
@@@ -1515,11 -1515,11 +1515,11 @@@
done:
FUNC_LEAVE_NOAPI(ret_value)
- } /* end H5T_conv_order() */
+ } /* end H5T__conv_order() */
/*-------------------------------------------------------------------------
- * Function: H5T_conv_b_b
+ * Function: H5T__conv_b_b
*
* Purpose: Convert from one bitfield to any other bitfield.
*
@@@ -1537,7 -1537,7 +1537,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+ H5T__conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
size_t buf_stride, size_t UNUSED bkg_stride, void *_buf,
void UNUSED *background, hid_t dxpl_id)
{
@@@ -1558,7 -1558,7 +1558,7 @@@
hbool_t reverse; /*if reverse the order of destination */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(FAIL)
+ FUNC_ENTER_PACKAGE
switch(cdata->command) {
case H5T_CONV_INIT:
@@@ -1676,7 -1676,7 +1676,7 @@@
} /* end if */
if(except_ret == H5T_CONV_UNHANDLED) {
- H5T_bit_copy(d, dst->shared->u.atomic.offset,
+ H5T__bit_copy(d, dst->shared->u.atomic.offset,
s, src->shared->u.atomic.offset, dst->shared->u.atomic.prec);
} else if(except_ret == H5T_CONV_ABORT)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
@@@ -1684,10 -1684,10 +1684,10 @@@
/*Don't reverse because user handles it*/
reverse = FALSE;
} else {
- H5T_bit_copy(d, dst->shared->u.atomic.offset,
+ H5T__bit_copy(d, dst->shared->u.atomic.offset,
s, src->shared->u.atomic.offset,
src->shared->u.atomic.prec);
- H5T_bit_set(d, dst->shared->u.atomic.offset+src->shared->u.atomic.prec,
+ H5T__bit_set(d, dst->shared->u.atomic.offset+src->shared->u.atomic.prec,
dst->shared->u.atomic.prec-src->shared->u.atomic.prec, FALSE);
}
@@@ -1696,11 -1696,11 +1696,11 @@@
*/
switch(dst->shared->u.atomic.lsb_pad) {
case H5T_PAD_ZERO:
- H5T_bit_set(d, (size_t)0, dst->shared->u.atomic.offset, FALSE);
+ H5T__bit_set(d, (size_t)0, dst->shared->u.atomic.offset, FALSE);
break;
case H5T_PAD_ONE:
- H5T_bit_set(d, (size_t)0, dst->shared->u.atomic.offset, TRUE);
+ H5T__bit_set(d, (size_t)0, dst->shared->u.atomic.offset, TRUE);
break;
default:
@@@ -1709,11 -1709,11 +1709,11 @@@
msb_pad_offset = dst->shared->u.atomic.offset + dst->shared->u.atomic.prec;
switch(dst->shared->u.atomic.msb_pad) {
case H5T_PAD_ZERO:
- H5T_bit_set(d, msb_pad_offset, 8 * dst->shared->size - msb_pad_offset, FALSE);
+ H5T__bit_set(d, msb_pad_offset, 8 * dst->shared->size - msb_pad_offset, FALSE);
break;
case H5T_PAD_ONE:
- H5T_bit_set(d, msb_pad_offset, 8 * dst->shared->size - msb_pad_offset, TRUE);
+ H5T__bit_set(d, msb_pad_offset, 8 * dst->shared->size - msb_pad_offset, TRUE);
break;
default:
HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "unsupported MSB padding")
@@@ -1758,7 -1758,7 +1758,7 @@@ done
if(src_rev)
H5MM_free(src_rev);
FUNC_LEAVE_NOAPI(ret_value)
- } /* end H5T_conv_b_b() */
+ } /* end H5T__conv_b_b() */
/*-------------------------------------------------------------------------
@@@ -1887,8 -1887,8 +1887,8 @@@ H5T_conv_struct_init(H5T_t *src, H5T_t
/*
* Insure that members are sorted.
*/
- H5T_sort_value(src, NULL);
- H5T_sort_value(dst, NULL);
+ H5T__sort_value(src, NULL);
+ H5T__sort_value(dst, NULL);
/*
* Build a mapping from source member number to destination member
@@@ -1924,8 -1924,8 +1924,8 @@@
else {
/* Restore sorted conditions for the datatypes */
/* (Required for the src2dst array to be valid) */
- H5T_sort_value(src, NULL);
- H5T_sort_value(dst, NULL);
+ H5T__sort_value(src, NULL);
+ H5T__sort_value(dst, NULL);
} /* end else */
/*
@@@ -1999,7 -1999,7 +1999,7 @@@ done
/*-------------------------------------------------------------------------
- * Function: H5T_conv_struct_subset
+ * Function: H5T__conv_struct_subset
*
* Purpose: A quick way to return a field in a struct private in this
* file. The flag SMEMBS_SUBSET indicates whether the source
@@@ -2023,11 -2023,11 +2023,11 @@@
*-------------------------------------------------------------------------
*/
H5T_subset_info_t *
- H5T_conv_struct_subset(const H5T_cdata_t *cdata)
+ H5T__conv_struct_subset(const H5T_cdata_t *cdata)
{
H5T_conv_struct_t *priv;
- FUNC_ENTER_NOAPI_NOINIT_NOERR
+ FUNC_ENTER_PACKAGE_NOERR
HDassert(cdata);
HDassert(cdata->priv);
@@@ -2035,11 -2035,11 +2035,11 @@@
priv = (H5T_conv_struct_t *)(cdata->priv);
FUNC_LEAVE_NOAPI((H5T_subset_info_t *) &priv->subset_info)
- } /* end H5T_conv_struct_subset() */
+ } /* end H5T__conv_struct_subset() */
/*-------------------------------------------------------------------------
- * Function: H5T_conv_struct
+ * Function: H5T__conv_struct
*
* Purpose: Converts between compound datatypes. This is a soft
* conversion function. The algorithm is basically:
@@@ -2079,7 -2079,7 +2079,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+ H5T__conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
size_t buf_stride, size_t bkg_stride, void *_buf, void *_bkg, hid_t dxpl_id)
{
uint8_t *buf = (uint8_t *)_buf; /*cast for pointer arithmetic */
@@@ -2098,7 -2098,7 +2098,7 @@@
H5T_conv_struct_t *priv = (H5T_conv_struct_t *)(cdata->priv);
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(FAIL)
+ FUNC_ENTER_PACKAGE
switch(cdata->command) {
case H5T_CONV_INIT:
@@@ -2141,8 -2141,8 +2141,8 @@@
/*
* Insure that members are sorted.
*/
- H5T_sort_value(src, NULL);
- H5T_sort_value(dst, NULL);
+ H5T__sort_value(src, NULL);
+ H5T__sort_value(dst, NULL);
src2dst = priv->src2dst;
/*
@@@ -2254,14 -2254,14 +2254,14 @@@
done:
FUNC_LEAVE_NOAPI(ret_value)
- } /* end H5T_conv_struct() */
+ } /* end H5T__conv_struct() */
/*-------------------------------------------------------------------------
- * Function: H5T_conv_struct_opt
+ * Function: H5T__conv_struct_opt
*
* Purpose: Converts between compound datatypes in a manner more
- * efficient than the general-purpose H5T_conv_struct()
+ * efficient than the general-purpose H5T__conv_struct()
* function. This function isn't applicable if the destination
* is larger than the source type. This is a soft conversion
* function. The algorithm is basically:
@@@ -2326,7 -2326,7 +2326,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t bkg_stride, void *_buf,
void *_bkg, hid_t dxpl_id)
{
@@@ -2348,7 -2348,7 +2348,7 @@@
int i; /*counters */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(FAIL)
+ FUNC_ENTER_PACKAGE
switch(cdata->command) {
case H5T_CONV_INIT:
@@@ -2431,8 -2431,8 +2431,8 @@@
/*
* Insure that members are sorted.
*/
- H5T_sort_value(src, NULL);
- H5T_sort_value(dst, NULL);
+ H5T__sort_value(src, NULL);
+ H5T__sort_value(dst, NULL);
/*
* Calculate strides. If BUF_STRIDE is non-zero then convert one
@@@ -2550,13 -2550,13 +2550,13 @@@
done:
FUNC_LEAVE_NOAPI(ret_value)
- } /* end H5T_conv_struct_opt() */
+ } /* end H5T__conv_struct_opt() */
/*-------------------------------------------------------------------------
* Function: H5T_conv_enum_init
*
- * Purpose: Initialize information for H5T_conv_enum().
+ * Purpose: Initialize information for H5T__conv_enum().
*
* Return: Success: Non-negative
*
@@@ -2593,8 -2593,8 +2593,8 @@@ H5T_conv_enum_init(H5T_t *src, H5T_t *d
* symbol names and build a map from source member index to destination
* member index.
*/
- H5T_sort_name(src, NULL);
- H5T_sort_name(dst, NULL);
+ H5T__sort_name(src, NULL);
+ H5T__sort_name(dst, NULL);
if(NULL == (priv->src2dst = (int *)H5MM_malloc(src->shared->u.enumer.nmembs * sizeof(int))))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
for(i = 0, j = 0;
@@@ -2686,7 -2686,7 +2686,7 @@@
}
/* Sort source type by value and adjust src2dst[] appropriately */
- H5T_sort_value(src, priv->src2dst);
+ H5T__sort_value(src, priv->src2dst);
done:
if (ret_value<0 && priv) {
@@@ -2699,7 -2699,7 +2699,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_enum
+ * Function: H5T__conv_enum
*
* Purpose: Converts one type of enumerated data to another.
*
@@@ -2712,7 -2712,7 +2712,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+ H5T__conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
size_t buf_stride, size_t UNUSED bkg_stride, void *_buf,
void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -2729,7 -2729,7 +2729,7 @@@
size_t i; /*counters */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(FAIL)
+ FUNC_ENTER_PACKAGE
switch(cdata->command) {
case H5T_CONV_INIT:
@@@ -2777,9 -2777,9 +2777,9 @@@
* sort keys are used here during conversion. See H5T_conv_enum_init(). But
* we actually don't care about the source type's order when doing the O(1)
* conversion algorithm, which is turned on by non-zero priv->length */
- H5T_sort_name(dst, NULL);
+ H5T__sort_name(dst, NULL);
if(!priv->length)
- H5T_sort_value(src, NULL);
+ H5T__sort_value(src, NULL);
/*
* Direction of conversion.
@@@ -2885,11 -2885,91 +2885,91 @@@
done:
FUNC_LEAVE_NOAPI(ret_value)
- } /* end H5T_conv_enum() */
+ } /* end H5T__conv_enum() */
+
+
+ /*-------------------------------------------------------------------------
+ * Function: H5T__conv_enum_numeric
+ *
+ * Purpose: Converts enumerated data to a numeric type (integer or
+ * floating-point number). This function is registered into
+ * the conversion table twice in H5T_init_interface in H5T.c.
+ * Once for enum-integer conversion. Once for enum-float conversion.
+ *
+ * Return: Success: Non-negative
+ *
+ * Failure: negative
+ *
+ * Programmer: Raymond Lu
+ * 12 October 2012
+ *-------------------------------------------------------------------------
+ */
+ herr_t
+ H5T__conv_enum_numeric(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+ size_t buf_stride, size_t UNUSED bkg_stride, void *_buf,
+ void UNUSED *bkg, hid_t UNUSED dxpl_id)
+ {
+ H5T_t *src, *dst; /*src and dst datatypes */
+ H5T_t *src_parent; /*parent type for src */
+ hid_t src_parent_id = -1; /*ID for parent of the source */
+ H5T_path_t *tpath; /* Conversion information */
+ herr_t ret_value = SUCCEED; /* Return value */
+
+ FUNC_ENTER_PACKAGE
+
+ switch(cdata->command) {
+ case H5T_CONV_INIT:
+ /*
+ * Determine if this conversion function applies to the conversion
+ * path SRC_ID->DST_ID. If not, return failure.
+ */
+ if(NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
+ HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a datatype")
+ if(H5T_ENUM != src->shared->type)
+ HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "source type is not a H5T_ENUM datatype")
+ if(H5T_INTEGER != dst->shared->type && H5T_FLOAT != dst->shared->type)
+ HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "destination is not an integer type")
+
+ cdata->need_bkg = H5T_BKG_NO;
+ break;
+
+ case H5T_CONV_FREE:
+ break;
+
+ case H5T_CONV_CONV:
+ if(NULL == (src = (H5T_t *)H5I_object(src_id)) || NULL == (dst = (H5T_t *)H5I_object(dst_id)))
+ HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
+
+ src_parent = src->shared->parent;
+
+ if(NULL == (tpath = H5T_path_find(src_parent, dst, NULL, NULL, dxpl_id, FALSE))) {
+ HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unable to convert between src and dest datatype")
+ } else if(!H5T_path_noop(tpath)) {
+ if((src_parent_id = H5I_register(H5I_DATATYPE, H5T_copy(src_parent, H5T_COPY_ALL), FALSE)) < 0)
+ HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register types for conversion")
+
+ /* Convert the data */
+ if(H5T_convert(tpath, src_parent_id, dst_id, nelmts, buf_stride, bkg_stride, _buf, bkg, dxpl_id) < 0)
+ HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "datatype conversion failed")
+ }
+ break;
+
+ default:
+ /* Some other command we don't know about yet.*/
+ HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "unknown conversion command")
+ } /* end switch */
+
+ done:
+ /* Release the temporary datatype IDs used */
+ if(src_parent_id >= 0)
+ H5I_dec_ref(src_parent_id);
+
+ FUNC_LEAVE_NOAPI(ret_value)
+ } /* end H5T__conv_enum_numeric() */
/*-------------------------------------------------------------------------
- * Function: H5T_conv_vlen
+ * Function: H5T__conv_vlen
*
* Purpose: Converts between VL datatypes in memory and on disk.
* This is a soft conversion function. The algorithm is
@@@ -2929,22 -3009,22 +3009,22 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+ H5T__conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dxpl_id)
{
H5T_vlen_alloc_info_t _vl_alloc_info; /* VL allocation info buffer */
H5T_vlen_alloc_info_t *vl_alloc_info = &_vl_alloc_info; /* VL allocation info */
- H5T_path_t *tpath; /* Type conversion path */
+ H5T_path_t *tpath = NULL; /* Type conversion path */
hbool_t noop_conv = FALSE; /* Flag to indicate a noop conversion */
hbool_t write_to_file = FALSE; /* Flag to indicate writing to file */
hbool_t parent_is_vlen; /* Flag to indicate parent is vlen datatyp */
hid_t tsrc_id = -1, tdst_id = -1;/*temporary type atoms */
- H5T_t *src; /*source datatype */
- H5T_t *dst; /*destination datatype */
+ H5T_t *src = NULL; /*source datatype */
+ H5T_t *dst = NULL; /*destination datatype */
H5HG_t bg_hobjid, parent_hobjid;
- uint8_t *s; /*source buffer */
- uint8_t *d; /*destination buffer */
- uint8_t *b; /*background buffer */
+ uint8_t *s = NULL; /*source buffer */
+ uint8_t *d = NULL; /*destination buffer */
+ uint8_t *b = NULL; /*background buffer */
ssize_t s_stride, d_stride; /*src and dst strides */
ssize_t b_stride; /*bkg stride */
size_t safe; /*how many elements are safe to process in each pass */
@@@ -2959,7 -3039,7 +3039,7 @@@
size_t elmtno; /*element number counter */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(FAIL)
+ FUNC_ENTER_PACKAGE
switch(cdata->command) {
case H5T_CONV_INIT:
@@@ -3040,7 -3120,7 +3120,7 @@@
if(tpath->cdata.need_bkg || parent_is_vlen) {
/* Set up initial background buffer */
tmp_buf_size = MAX(src_base_size, dst_base_size);
- if(NULL == (tmp_buf = H5FL_BLK_MALLOC(vlen_seq,tmp_buf_size)))
+ if(NULL == (tmp_buf = H5FL_BLK_CALLOC(vlen_seq,tmp_buf_size)))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion")
} /* end if */
@@@ -3120,7 -3200,7 +3200,7 @@@
*/
if(!seq_len && !conv_buf) {
conv_buf_size = ((1 / H5T_VLEN_MIN_CONF_BUF_SIZE) + 1) * H5T_VLEN_MIN_CONF_BUF_SIZE;
- if(NULL == (conv_buf = H5FL_BLK_MALLOC(vlen_seq, conv_buf_size)))
+ if(NULL == (conv_buf = H5FL_BLK_CALLOC(vlen_seq, conv_buf_size)))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion")
}
else if(conv_buf_size < MAX(src_size, dst_size)) {
@@@ -3128,6 -3208,7 +3208,7 @@@
conv_buf_size = ((MAX(src_size, dst_size) / H5T_VLEN_MIN_CONF_BUF_SIZE) + 1) * H5T_VLEN_MIN_CONF_BUF_SIZE;
if(NULL == (conv_buf = H5FL_BLK_REALLOC(vlen_seq, conv_buf, conv_buf_size)))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion")
+ HDmemset(conv_buf, 0, conv_buf_size);
} /* end if */
/* Read in VL sequence */
@@@ -3143,6 -3224,7 +3224,7 @@@
tmp_buf_size = conv_buf_size;
if(NULL == (tmp_buf = H5FL_BLK_REALLOC(vlen_seq, tmp_buf, tmp_buf_size)))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion")
+ HDmemset(tmp_buf, 0, tmp_buf_size);
} /* end if */
/* If we are writing and there is a nested VL type, read
@@@ -3156,6 -3238,7 +3238,7 @@@
tmp_buf_size = (bg_seq_len * MAX(src_base_size, dst_base_size));
if(NULL == (tmp_buf = H5FL_BLK_REALLOC(vlen_seq, tmp_buf, tmp_buf_size)))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion")
+ HDmemset(tmp_buf, 0, tmp_buf_size);
} /* end if */
H5F_addr_decode(dst->shared->u.vlen.f, (const uint8_t **)&tmp, &(bg_hobjid.addr));
INT32DECODE(tmp, bg_hobjid.idx);
@@@ -3232,11 -3315,11 +3315,11 @@@ done
tmp_buf = H5FL_BLK_FREE(vlen_seq, tmp_buf);
FUNC_LEAVE_NOAPI(ret_value)
- } /* end H5T_conv_vlen() */
+ } /* end H5T__conv_vlen() */
/*-------------------------------------------------------------------------
- * Function: H5T_conv_array
+ * Function: H5T__conv_array
*
* Purpose: Converts between array datatypes in memory and on disk.
* This is a soft conversion function.
@@@ -3251,7 -3334,7 +3334,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_array(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+ H5T__conv_array(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
size_t buf_stride, size_t bkg_stride, void *_buf,
void UNUSED *_bkg, hid_t dxpl_id)
{
@@@ -3267,7 -3350,7 +3350,7 @@@
void *bkg_buf = NULL; /*temporary background buffer */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(FAIL)
+ FUNC_ENTER_PACKAGE
switch (cdata->command) {
case H5T_CONV_INIT:
@@@ -3378,11 -3461,11 +3461,11 @@@ done
bkg_buf = H5FL_BLK_FREE(array_seq, bkg_buf);
FUNC_LEAVE_NOAPI(ret_value)
- } /* end H5T_conv_array() */
+ } /* end H5T__conv_array() */
/*-------------------------------------------------------------------------
- * Function: H5T_conv_i_i
+ * Function: H5T__conv_i_i
*
* Purpose: Convert one integer type to another. This is the catch-all
* function for integer conversions and is probably not
@@@ -3410,7 -3493,7 +3493,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_i_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+ H5T__conv_i_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t dxpl_id)
{
@@@ -3432,7 -3515,7 +3515,7 @@@
hbool_t reverse; /*if reverse the order of destination */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(FAIL)
+ FUNC_ENTER_PACKAGE
switch(cdata->command) {
case H5T_CONV_INIT:
@@@ -3532,7 -3615,7 +3615,7 @@@
* What is the bit number for the msb bit of S which is set? The
* bit number is relative to the significant part of the number.
*/
- sfirst = H5T_bit_find (s, src->shared->u.atomic.offset, src->shared->u.atomic.prec,
+ sfirst = H5T__bit_find (s, src->shared->u.atomic.offset, src->shared->u.atomic.prec,
H5T_BIT_MSB, TRUE);
first = (size_t)sfirst;
@@@ -3545,7 -3628,7 +3628,7 @@@
* The source has no bits set and must therefore be zero.
* Set the destination to zero.
*/
- H5T_bit_set (d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec, FALSE);
+ H5T__bit_set (d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec, FALSE);
} else if (H5T_SGN_NONE==src->shared->u.atomic.u.i.sign &&
H5T_SGN_NONE==dst->shared->u.atomic.u.i.sign) {
@@@ -3556,9 -3639,9 +3639,9 @@@
* destination will be set to the maximum possible value.
*/
if (src->shared->u.atomic.prec <= dst->shared->u.atomic.prec) {
- H5T_bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
+ H5T__bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
src->shared->u.atomic.prec);
- H5T_bit_set (d, dst->shared->u.atomic.offset+src->shared->u.atomic.prec,
+ H5T__bit_set (d, dst->shared->u.atomic.offset+src->shared->u.atomic.prec,
dst->shared->u.atomic.prec-src->shared->u.atomic.prec, FALSE);
} else if (first>=dst->shared->u.atomic.prec) {
/*overflow*/
@@@ -3569,14 -3652,14 +3652,14 @@@
}
if(except_ret == H5T_CONV_UNHANDLED) {
- H5T_bit_set (d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec, TRUE);
+ H5T__bit_set (d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec, TRUE);
} else if(except_ret == H5T_CONV_ABORT)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
else if(except_ret == H5T_CONV_HANDLED)
/*Don't reverse because user handles it already*/
reverse = FALSE;
} else {
- H5T_bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
+ H5T__bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
dst->shared->u.atomic.prec);
}
@@@ -3598,16 -3681,16 +3681,16 @@@
}
if(except_ret == H5T_CONV_UNHANDLED) {
- H5T_bit_set (d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec, FALSE);
+ H5T__bit_set (d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec, FALSE);
} else if(except_ret == H5T_CONV_ABORT)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
else if(except_ret == H5T_CONV_HANDLED)
/*Don't reverse because user handles it already*/
reverse = FALSE;
} else if (src->shared->u.atomic.prec < dst->shared->u.atomic.prec) {
- H5T_bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
+ H5T__bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
src->shared->u.atomic.prec-1);
- H5T_bit_set (d, dst->shared->u.atomic.offset+src->shared->u.atomic.prec-1,
+ H5T__bit_set (d, dst->shared->u.atomic.offset+src->shared->u.atomic.prec-1,
(dst->shared->u.atomic.prec-src->shared->u.atomic.prec)+1, FALSE);
} else if (first>=dst->shared->u.atomic.prec) {
/*overflow - source is positive*/
@@@ -3618,14 -3701,14 +3701,14 @@@
}
if(except_ret == H5T_CONV_UNHANDLED)
- H5T_bit_set (d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec, TRUE);
+ H5T__bit_set (d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec, TRUE);
else if(except_ret == H5T_CONV_ABORT)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
else if(except_ret == H5T_CONV_HANDLED)
/*Don't reverse because user handles it already*/
reverse = FALSE;
} else {
- H5T_bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
+ H5T__bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
dst->shared->u.atomic.prec);
}
@@@ -3645,20 -3728,20 +3728,20 @@@
}
if(except_ret == H5T_CONV_UNHANDLED) {
- H5T_bit_set(d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec-1, TRUE);
- H5T_bit_set(d, (dst->shared->u.atomic.offset + dst->shared->u.atomic.prec-1), (size_t)1, FALSE);
+ H5T__bit_set(d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec-1, TRUE);
+ H5T__bit_set(d, (dst->shared->u.atomic.offset + dst->shared->u.atomic.prec-1), (size_t)1, FALSE);
} else if(except_ret == H5T_CONV_ABORT)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
else if(except_ret == H5T_CONV_HANDLED)
/*Don't reverse because user handles it already*/
reverse = FALSE;
} else if (src->shared->u.atomic.prec<dst->shared->u.atomic.prec) {
- H5T_bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
+ H5T__bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
src->shared->u.atomic.prec);
- H5T_bit_set (d, dst->shared->u.atomic.offset+src->shared->u.atomic.prec,
+ H5T__bit_set (d, dst->shared->u.atomic.offset+src->shared->u.atomic.prec,
dst->shared->u.atomic.prec-src->shared->u.atomic.prec, FALSE);
} else {
- H5T_bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
+ H5T__bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
dst->shared->u.atomic.prec);
}
} else if (first+1 == src->shared->u.atomic.prec) {
@@@ -3669,7 -3752,7 +3752,7 @@@
* destination is set to a negative number with the largest
* possible magnitude.
*/
- ssize_t sfz = H5T_bit_find (s, src->shared->u.atomic.offset,
+ ssize_t sfz = H5T__bit_find (s, src->shared->u.atomic.offset,
src->shared->u.atomic.prec-1, H5T_BIT_MSB, FALSE);
size_t fz = (size_t)sfz;
@@@ -3682,18 -3765,18 +3765,18 @@@
}
if(except_ret == H5T_CONV_UNHANDLED) {
- H5T_bit_set(d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec-1, FALSE);
- H5T_bit_set(d, (dst->shared->u.atomic.offset + dst->shared->u.atomic.prec-1), (size_t)1, TRUE);
+ H5T__bit_set(d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec-1, FALSE);
+ H5T__bit_set(d, (dst->shared->u.atomic.offset + dst->shared->u.atomic.prec-1), (size_t)1, TRUE);
} else if(except_ret == H5T_CONV_ABORT)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
else if(except_ret == H5T_CONV_HANDLED)
/*Don't reverse because user handles it already*/
reverse = FALSE;
} else if (src->shared->u.atomic.prec<dst->shared->u.atomic.prec) {
- H5T_bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset, src->shared->u.atomic.prec);
- H5T_bit_set (d, dst->shared->u.atomic.offset+src->shared->u.atomic.prec, dst->shared->u.atomic.prec-src->shared->u.atomic.prec, TRUE);
+ H5T__bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset, src->shared->u.atomic.prec);
+ H5T__bit_set (d, dst->shared->u.atomic.offset+src->shared->u.atomic.prec, dst->shared->u.atomic.prec-src->shared->u.atomic.prec, TRUE);
} else {
- H5T_bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset, dst->shared->u.atomic.prec);
+ H5T__bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset, dst->shared->u.atomic.prec);
}
} else {
@@@ -3712,20 -3795,20 +3795,20 @@@
}
if(except_ret == H5T_CONV_UNHANDLED) {
- H5T_bit_set(d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec-1, TRUE);
- H5T_bit_set(d, (dst->shared->u.atomic.offset + dst->shared->u.atomic.prec-1), (size_t)1, FALSE);
+ H5T__bit_set(d, dst->shared->u.atomic.offset, dst->shared->u.atomic.prec-1, TRUE);
+ H5T__bit_set(d, (dst->shared->u.atomic.offset + dst->shared->u.atomic.prec-1), (size_t)1, FALSE);
} else if(except_ret == H5T_CONV_ABORT)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
else if(except_ret == H5T_CONV_HANDLED)
/*Don't reverse because user handles it already*/
reverse = FALSE;
} else if (src->shared->u.atomic.prec<dst->shared->u.atomic.prec) {
- H5T_bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
+ H5T__bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
src->shared->u.atomic.prec);
- H5T_bit_set (d, dst->shared->u.atomic.offset+src->shared->u.atomic.prec,
+ H5T__bit_set (d, dst->shared->u.atomic.offset+src->shared->u.atomic.prec,
dst->shared->u.atomic.prec-src->shared->u.atomic.prec, FALSE);
} else {
- H5T_bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
+ H5T__bit_copy (d, dst->shared->u.atomic.offset, s, src->shared->u.atomic.offset,
dst->shared->u.atomic.prec);
}
}
@@@ -3735,11 -3818,11 +3818,11 @@@
*/
if (dst->shared->u.atomic.offset>0) {
assert(H5T_PAD_ZERO==dst->shared->u.atomic.lsb_pad || H5T_PAD_ONE==dst->shared->u.atomic.lsb_pad);
- H5T_bit_set(d, (size_t)0, dst->shared->u.atomic.offset, (hbool_t)(H5T_PAD_ONE==dst->shared->u.atomic.lsb_pad));
+ H5T__bit_set(d, (size_t)0, dst->shared->u.atomic.offset, (hbool_t)(H5T_PAD_ONE==dst->shared->u.atomic.lsb_pad));
}
if (dst->shared->u.atomic.offset+dst->shared->u.atomic.prec!=8*dst->shared->size) {
assert (H5T_PAD_ZERO==dst->shared->u.atomic.msb_pad || H5T_PAD_ONE==dst->shared->u.atomic.msb_pad);
- H5T_bit_set (d, dst->shared->u.atomic.offset+dst->shared->u.atomic.prec,
+ H5T__bit_set (d, dst->shared->u.atomic.offset+dst->shared->u.atomic.prec,
8*dst->shared->size - (dst->shared->u.atomic.offset+ dst->shared->u.atomic.prec),
(hbool_t)(H5T_PAD_ONE==dst->shared->u.atomic.msb_pad));
}
@@@ -3782,11 -3865,11 +3865,11 @@@ done
if(src_rev)
H5MM_free(src_rev);
FUNC_LEAVE_NOAPI(ret_value)
- } /* end H5T_conv_i_i() */
+ } /* end H5T__conv_i_i() */
/*-------------------------------------------------------------------------
- * Function: H5T_conv_f_f
+ * Function: H5T__conv_f_f
*
* Purpose: Convert one floating point type to another. This is a catch
* all for floating point conversions and is probably not
@@@ -3817,7 -3900,7 +3900,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+ H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t dxpl_id)
{
@@@ -3854,7 -3937,7 +3937,7 @@@
hbool_t reverse; /*if reverse the order of destination */
herr_t ret_value = SUCCEED; /*return value */
- FUNC_ENTER_NOAPI(FAIL)
+ FUNC_ENTER_PACKAGE
switch(cdata->command) {
case H5T_CONV_INIT:
@@@ -3978,21 -4061,21 +4061,21 @@@
/*
* Find the sign bit value of the source.
*/
- sign = H5T_bit_get_d(s, src.u.f.sign, (size_t)1);
+ sign = H5T__bit_get_d(s, src.u.f.sign, (size_t)1);
/*
* Check for special cases: +0, -0, +Inf, -Inf, NaN
*/
- if (H5T_bit_find (s, src.u.f.mpos, src.u.f.msize,
+ if (H5T__bit_find (s, src.u.f.mpos, src.u.f.msize,
H5T_BIT_LSB, TRUE)<0) {
- if (H5T_bit_find (s, src.u.f.epos, src.u.f.esize,
+ if (H5T__bit_find (s, src.u.f.epos, src.u.f.esize,
H5T_BIT_LSB, TRUE)<0) {
/* +0 or -0 */
- H5T_bit_copy (d, dst.u.f.sign, s, src.u.f.sign, (size_t)1);
- H5T_bit_set (d, dst.u.f.epos, dst.u.f.esize, FALSE);
- H5T_bit_set (d, dst.u.f.mpos, dst.u.f.msize, FALSE);
+ H5T__bit_copy (d, dst.u.f.sign, s, src.u.f.sign, (size_t)1);
+ H5T__bit_set (d, dst.u.f.epos, dst.u.f.esize, FALSE);
+ H5T__bit_set (d, dst.u.f.mpos, dst.u.f.msize, FALSE);
goto padding;
- } else if (H5T_bit_find (s, src.u.f.epos, src.u.f.esize,
+ } else if (H5T__bit_find (s, src.u.f.epos, src.u.f.esize,
H5T_BIT_LSB, FALSE)<0) {
/* +Inf or -Inf */
if(cb_struct.func) { /*If user's exception handler is present, use it*/
@@@ -4007,14 -4090,14 +4090,14 @@@
}
if(except_ret == H5T_CONV_UNHANDLED) {
- H5T_bit_copy (d, dst.u.f.sign, s, src.u.f.sign, (size_t)1);
- H5T_bit_set (d, dst.u.f.epos, dst.u.f.esize, TRUE);
- H5T_bit_set (d, dst.u.f.mpos, dst.u.f.msize, FALSE);
+ H5T__bit_copy (d, dst.u.f.sign, s, src.u.f.sign, (size_t)1);
+ H5T__bit_set (d, dst.u.f.epos, dst.u.f.esize, TRUE);
+ H5T__bit_set (d, dst.u.f.mpos, dst.u.f.msize, FALSE);
/*If the destination no implied mantissa bit, we'll need to set
*the 1st bit of mantissa to 1. The Intel-Linux long double is
*this case.*/
if (H5T_NORM_NONE==dst.u.f.norm)
- H5T_bit_set (d, dst.u.f.mpos+dst.u.f.msize-1, (size_t)1, TRUE);
+ H5T__bit_set (d, dst.u.f.mpos+dst.u.f.msize-1, (size_t)1, TRUE);
} else if(except_ret == H5T_CONV_HANDLED) {
/*No need to reverse the order of destination because user handles it*/
reverse = FALSE;
@@@ -4024,8 -4107,8 +4107,8 @@@
goto padding;
}
- } else if (H5T_NORM_NONE==src.u.f.norm && H5T_bit_find (s, src.u.f.mpos, src.u.f.msize-1,
- H5T_BIT_LSB, TRUE)<0 && H5T_bit_find (s, src.u.f.epos, src.u.f.esize,
+ } else if (H5T_NORM_NONE==src.u.f.norm && H5T__bit_find (s, src.u.f.mpos, src.u.f.msize-1,
+ H5T_BIT_LSB, TRUE)<0 && H5T__bit_find (s, src.u.f.epos, src.u.f.esize,
H5T_BIT_LSB, FALSE)<0) {
/*This is a special case for the source of no implied mantissa bit.
*If the exponent bits are all 1s and only the 1st bit of mantissa
@@@ -4043,14 -4126,14 +4126,14 @@@
}
if(except_ret == H5T_CONV_UNHANDLED) {
- H5T_bit_copy (d, dst.u.f.sign, s, src.u.f.sign, (size_t)1);
- H5T_bit_set (d, dst.u.f.epos, dst.u.f.esize, TRUE);
- H5T_bit_set (d, dst.u.f.mpos, dst.u.f.msize, FALSE);
+ H5T__bit_copy (d, dst.u.f.sign, s, src.u.f.sign, (size_t)1);
+ H5T__bit_set (d, dst.u.f.epos, dst.u.f.esize, TRUE);
+ H5T__bit_set (d, dst.u.f.mpos, dst.u.f.msize, FALSE);
/*If the destination no implied mantissa bit, we'll need to set
*the 1st bit of mantissa to 1. The Intel-Linux long double is
*this case.*/
if (H5T_NORM_NONE==dst.u.f.norm)
- H5T_bit_set (d, dst.u.f.mpos+dst.u.f.msize-1, (size_t)1, TRUE);
+ H5T__bit_set (d, dst.u.f.mpos+dst.u.f.msize-1, (size_t)1, TRUE);
} else if(except_ret == H5T_CONV_HANDLED) {
/*No need to reverse the order of destination because user handles it*/
reverse = FALSE;
@@@ -4062,7 -4145,7 +4145,7 @@@
#ifdef H5_VMS
} /*Temporary solution to handle VAX special values*/
#else /*H5_VMS*/
- } else if (H5T_bit_find (s, src.u.f.epos, src.u.f.esize,
+ } else if (H5T__bit_find (s, src.u.f.epos, src.u.f.esize,
H5T_BIT_LSB, FALSE)<0) {
/* NaN */
if(cb_struct.func) { /*If user's exception handler is present, use it*/
@@@ -4075,9 -4158,9 +4158,9 @@@
if(except_ret == H5T_CONV_UNHANDLED) {
/* There are many NaN values, so we just set all bits of
* the significand. */
- H5T_bit_copy (d, dst.u.f.sign, s, src.u.f.sign, (size_t)1);
- H5T_bit_set (d, dst.u.f.epos, dst.u.f.esize, TRUE);
- H5T_bit_set(d, dst.u.f.mpos, dst.u.f.msize, TRUE);
+ H5T__bit_copy (d, dst.u.f.sign, s, src.u.f.sign, (size_t)1);
+ H5T__bit_set (d, dst.u.f.epos, dst.u.f.esize, TRUE);
+ H5T__bit_set(d, dst.u.f.mpos, dst.u.f.msize, TRUE);
} else if(except_ret == H5T_CONV_HANDLED) {
/*No need to reverse the order of destination because user handles it*/
reverse = FALSE;
@@@ -4094,7 -4177,7 +4177,7 @@@
* the source bit field where it's located. Don't worry about
* the exponent bias yet.
*/
- expo = H5T_bit_get_d(s, src.u.f.epos, src.u.f.esize);
+ expo = H5T__bit_get_d(s, src.u.f.epos, src.u.f.esize);
if(expo==0)
denormalized=TRUE;
@@@ -4107,12 -4190,12 +4190,12 @@@
mpos = src.u.f.mpos;
mrsh = 0;
if (0==expo || H5T_NORM_NONE==src.u.f.norm) {
- if ((bitno=H5T_bit_find(s, src.u.f.mpos, src.u.f.msize,
+ if ((bitno=H5T__bit_find(s, src.u.f.mpos, src.u.f.msize,
H5T_BIT_MSB, TRUE))>0) {
msize = bitno;
} else if (0==bitno) {
msize = 1;
- H5T_bit_set(s, src.u.f.mpos, (size_t)1, FALSE);
+ H5T__bit_set(s, src.u.f.mpos, (size_t)1, FALSE);
}
} else if (H5T_NORM_IMPLIED==src.u.f.norm) {
msize = src.u.f.msize;
@@@ -4125,7 -4208,7 +4208,7 @@@
* The sign for the destination is the same as the sign for the
* source in all cases.
*/
- H5T_bit_copy (d, dst.u.f.sign, s, src.u.f.sign, (size_t)1);
+ H5T__bit_copy (d, dst.u.f.sign, s, src.u.f.sign, (size_t)1);
/*
* Calculate the true source exponent by adjusting according to
@@@ -4158,7 -4241,7 +4241,7 @@@
if (expo < -(hssize_t)(dst.u.f.msize)) {
/* The exponent is way too small. Result is zero. */
expo = 0;
- H5T_bit_set(d, dst.u.f.mpos, dst.u.f.msize, FALSE);
+ H5T__bit_set(d, dst.u.f.mpos, dst.u.f.msize, FALSE);
msize = 0;
} else if (expo<=0) {
/*
@@@ -4188,7 -4271,7 +4271,7 @@@
if(except_ret == H5T_CONV_UNHANDLED) {
expo = expo_max;
- H5T_bit_set(d, dst.u.f.mpos, dst.u.f.msize, FALSE);
+ H5T__bit_set(d, dst.u.f.mpos, dst.u.f.msize, FALSE);
msize = 0;
} else if(except_ret == H5T_CONV_ABORT)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
@@@ -4209,17 -4292,17 +4292,17 @@@
bitno = (ssize_t)(mrsh+msize - dst.u.f.msize);
assert(bitno>=0 && (size_t)bitno<=msize);
/*If the 1st bit being cut off is set and source isn't denormalized.*/
- if(H5T_bit_get_d(s, (mpos + bitno) - 1, (size_t)1) && !denormalized) {
+ if(H5T__bit_get_d(s, (mpos + bitno) - 1, (size_t)1) && !denormalized) {
/*Don't do rounding if exponent is 111...110 and mantissa is 111...11.
*To do rounding and increment exponent in this case will create an infinity value.*/
- if((H5T_bit_find(s, mpos+bitno, msize-bitno, H5T_BIT_LSB, FALSE)>=0 || expo<expo_max-1)) {
- carry = H5T_bit_inc(s, mpos+bitno-1, 1+msize-bitno);
+ if((H5T__bit_find(s, mpos+bitno, msize-bitno, H5T_BIT_LSB, FALSE)>=0 || expo<expo_max-1)) {
+ carry = H5T__bit_inc(s, mpos+bitno-1, 1+msize-bitno);
if (carry)
implied = 2;
}
- } else if(H5T_bit_get_d(s, (mpos + bitno) - 1, (size_t)1) && denormalized)
+ } else if(H5T__bit_get_d(s, (mpos + bitno) - 1, (size_t)1) && denormalized)
/*For either source or destination, denormalized value doesn't increment carry.*/
- H5T_bit_inc(s, mpos+bitno-1, 1+msize-bitno);
+ H5T__bit_inc(s, mpos+bitno-1, 1+msize-bitno);
}
else
carry=0;
@@@ -4228,28 -4311,28 +4311,28 @@@
* Write the mantissa to the destination
*/
if (mrsh>dst.u.f.msize+1) {
- H5T_bit_set(d, dst.u.f.mpos, dst.u.f.msize, FALSE);
+ H5T__bit_set(d, dst.u.f.mpos, dst.u.f.msize, FALSE);
} else if (mrsh==dst.u.f.msize+1) {
- H5T_bit_set(d, dst.u.f.mpos+1, dst.u.f.msize-1, FALSE);
- H5T_bit_set(d, dst.u.f.mpos, (size_t)1, TRUE);
+ H5T__bit_set(d, dst.u.f.mpos+1, dst.u.f.msize-1, FALSE);
+ H5T__bit_set(d, dst.u.f.mpos, (size_t)1, TRUE);
} else if (mrsh==dst.u.f.msize) {
- H5T_bit_set(d, dst.u.f.mpos, dst.u.f.msize, FALSE);
- H5T_bit_set_d(d, dst.u.f.mpos, MIN(2, dst.u.f.msize), (hsize_t)implied);
+ H5T__bit_set(d, dst.u.f.mpos, dst.u.f.msize, FALSE);
+ H5T__bit_set_d(d, dst.u.f.mpos, MIN(2, dst.u.f.msize), (hsize_t)implied);
} else {
if (mrsh>0) {
- H5T_bit_set(d, dst.u.f.mpos+dst.u.f.msize-mrsh, mrsh,
+ H5T__bit_set(d, dst.u.f.mpos+dst.u.f.msize-mrsh, mrsh,
FALSE);
- H5T_bit_set_d(d, dst.u.f.mpos+dst.u.f.msize-mrsh, (size_t)2,
+ H5T__bit_set_d(d, dst.u.f.mpos+dst.u.f.msize-mrsh, (size_t)2,
(hsize_t)implied);
}
if (mrsh+msize>=dst.u.f.msize) {
- H5T_bit_copy(d, dst.u.f.mpos,
+ H5T__bit_copy(d, dst.u.f.mpos,
s, (mpos+msize+mrsh-dst.u.f.msize),
dst.u.f.msize-mrsh);
} else {
- H5T_bit_copy(d, dst.u.f.mpos+dst.u.f.msize-(mrsh+msize),
+ H5T__bit_copy(d, dst.u.f.mpos+dst.u.f.msize-(mrsh+msize),
s, mpos, msize);
- H5T_bit_set(d, dst.u.f.mpos, dst.u.f.msize-(mrsh+msize),
+ H5T__bit_set(d, dst.u.f.mpos, dst.u.f.msize-(mrsh+msize),
FALSE);
}
}
@@@ -4275,7 -4358,7 +4358,7 @@@
if(except_ret == H5T_CONV_UNHANDLED) {
expo = expo_max;
- H5T_bit_set(d, dst.u.f.mpos, dst.u.f.msize, FALSE);
+ H5T__bit_set(d, dst.u.f.mpos, dst.u.f.msize, FALSE);
} else if(except_ret == H5T_CONV_ABORT)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
else if(except_ret == H5T_CONV_HANDLED) {
@@@ -4288,7 -4371,7 +4371,7 @@@
carry = 0;
H5_CHECK_OVERFLOW(expo,hssize_t,hsize_t);
- H5T_bit_set_d(d, dst.u.f.epos, dst.u.f.esize, (hsize_t)expo);
+ H5T__bit_set_d(d, dst.u.f.epos, dst.u.f.esize, (hsize_t)expo);
padding:
@@@ -4297,11 -4380,11 +4380,11 @@@
*/
if (dst.offset>0) {
assert (H5T_PAD_ZERO==dst.lsb_pad || H5T_PAD_ONE==dst.lsb_pad);
- H5T_bit_set (d, (size_t)0, dst.offset, (hbool_t)(H5T_PAD_ONE==dst.lsb_pad));
+ H5T__bit_set (d, (size_t)0, dst.offset, (hbool_t)(H5T_PAD_ONE==dst.lsb_pad));
}
if (dst.offset+dst.prec!=8*dst_p->shared->size) {
assert (H5T_PAD_ZERO==dst.msb_pad || H5T_PAD_ONE==dst.msb_pad);
- H5T_bit_set (d, dst.offset+dst.prec, 8*dst_p->shared->size - (dst.offset+dst.prec),
+ H5T__bit_set (d, dst.offset+dst.prec, 8*dst_p->shared->size - (dst.offset+dst.prec),
(hbool_t)(H5T_PAD_ONE==dst.msb_pad));
}
@@@ -4359,11 -4442,11 +4442,11 @@@ done
H5MM_free(src_rev);
FUNC_LEAVE_NOAPI(ret_value)
- } /* end H5T_conv_f_f() */
+ } /* end H5T__conv_f_f() */
/*-------------------------------------------------------------------------
- * Function: H5T_conv_s_s
+ * Function: H5T__conv_s_s
*
* Purpose: Convert one fixed-length string type to another.
*
@@@ -4385,7 -4468,7 +4468,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_s_s(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+ H5T__conv_s_s(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
size_t buf_stride, size_t UNUSED bkg_stride, void *buf,
void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -4399,7 -4482,7 +4482,7 @@@
uint8_t *dbuf=NULL; /*temp buf for overlap convers. */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(FAIL)
+ FUNC_ENTER_PACKAGE
switch(cdata->command) {
case H5T_CONV_INIT:
@@@ -4592,11 -4675,11 +4675,11 @@@ done
H5MM_xfree(dbuf);
FUNC_LEAVE_NOAPI(ret_value)
- } /* end H5T_conv_s_s() */
+ } /* end H5T__conv_s_s() */
/*-------------------------------------------------------------------------
- * Function: H5T_conv_schar_uchar
+ * Function: H5T__conv_schar_uchar
*
* Purpose: Converts `signed char' to `unsigned char'
*
@@@ -4612,7 -4695,7 +4695,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_schar_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_schar_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -4622,7 -4705,7 +4705,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_uchar_schar
+ * Function: H5T__conv_uchar_schar
*
* Purpose: Converts `unsigned char' to `signed char'
*
@@@ -4638,7 -4721,7 +4721,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_uchar_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_uchar_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -4648,7 -4731,7 +4731,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_schar_short
+ * Function: H5T__conv_schar_short
*
* Purpose: Converts `signed char' to `short'
*
@@@ -4664,7 -4747,7 +4747,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_schar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_schar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -4674,7 -4757,7 +4757,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_schar_ushort
+ * Function: H5T__conv_schar_ushort
*
* Purpose: Converts `signed char' to `unsigned short'
*
@@@ -4690,7 -4773,7 +4773,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_schar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_schar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -4700,7 -4783,7 +4783,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_uchar_short
+ * Function: H5T__conv_uchar_short
*
* Purpose: Converts `unsigned char' to `short'
*
@@@ -4716,7 -4799,7 +4799,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_uchar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_uchar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -4726,7 -4809,7 +4809,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_uchar_ushort
+ * Function: H5T__conv_uchar_ushort
*
* Purpose: Converts `unsigned char' to `unsigned short'
*
@@@ -4742,7 -4825,7 +4825,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_uchar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_uchar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -4752,7 -4835,7 +4835,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_schar_int
+ * Function: H5T__conv_schar_int
*
* Purpose: Converts `signed char' to `int'
*
@@@ -4768,7 -4851,7 +4851,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_schar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_schar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -4777,7 -4860,7 +4860,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_schar_uint
+ * Function: H5T__conv_schar_uint
*
* Purpose: Converts `signed char' to `unsigned int'
*
@@@ -4793,7 -4876,7 +4876,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_schar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_schar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -4802,7 -4885,7 +4885,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_uchar_int
+ * Function: H5T__conv_uchar_int
*
* Purpose: Converts `unsigned char' to `int'
*
@@@ -4818,7 -4901,7 +4901,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_uchar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_uchar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -4827,7 -4910,7 +4910,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_uchar_uint
+ * Function: H5T__conv_uchar_uint
*
* Purpose: Converts `unsigned char' to `unsigned int'
*
@@@ -4843,7 -4926,7 +4926,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_uchar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_uchar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -4852,7 -4935,7 +4935,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_schar_long
+ * Function: H5T__conv_schar_long
*
* Purpose: Converts `signed char' to `long'
*
@@@ -4868,7 -4951,7 +4951,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_schar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_schar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -4877,7 -4960,7 +4960,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_schar_ulong
+ * Function: H5T__conv_schar_ulong
*
* Purpose: Converts `signed char' to `unsigned long'
*
@@@ -4893,7 -4976,7 +4976,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_schar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_schar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -4903,7 -4986,7 +4986,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_uchar_long
+ * Function: H5T__conv_uchar_long
*
* Purpose: Converts `unsigned char' to `long'
*
@@@ -4919,7 -5002,7 +5002,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_uchar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_uchar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -4928,7 -5011,7 +5011,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_uchar_ulong
+ * Function: H5T__conv_uchar_ulong
*
* Purpose: Converts `unsigned char' to `unsigned long'
*
@@@ -4944,7 -5027,7 +5027,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_uchar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_uchar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -4954,7 -5037,7 +5037,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_schar_llong
+ * Function: H5T__conv_schar_llong
*
* Purpose: Converts `signed char' to `long long'
*
@@@ -4970,7 -5053,7 +5053,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_schar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_schar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -4980,7 -5063,7 +5063,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_schar_ullong
+ * Function: H5T__conv_schar_ullong
*
* Purpose: Converts `signed char' to `unsigned long long'
*
@@@ -4996,7 -5079,7 +5079,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_schar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_schar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5006,7 -5089,7 +5089,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_uchar_llong
+ * Function: H5T__conv_uchar_llong
*
* Purpose: Converts `unsigned char' to `long long'
*
@@@ -5022,7 -5105,7 +5105,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_uchar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_uchar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5032,7 -5115,7 +5115,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_uchar_ullong
+ * Function: H5T__conv_uchar_ullong
*
* Purpose: Converts `unsigned char' to `unsigned long long'
*
@@@ -5048,7 -5131,7 +5131,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_uchar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_uchar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5058,7 -5141,7 +5141,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_short_schar
+ * Function: H5T__conv_short_schar
*
* Purpose: Converts `short' to `signed char'
*
@@@ -5074,7 -5157,7 +5157,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_short_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_short_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5084,7 -5167,7 +5167,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_short_uchar
+ * Function: H5T__conv_short_uchar
*
* Purpose: Converts `short' to `unsigned char'
*
@@@ -5100,7 -5183,7 +5183,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_short_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_short_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5110,7 -5193,7 +5193,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ushort_schar
+ * Function: H5T__conv_ushort_schar
*
* Purpose: Converts `unsigned short' to `signed char'
*
@@@ -5126,7 -5209,7 +5209,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ushort_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ushort_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5136,7 -5219,7 +5219,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ushort_uchar
+ * Function: H5T__conv_ushort_uchar
*
* Purpose: Converts `unsigned short' to `unsigned char'
*
@@@ -5152,7 -5235,7 +5235,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ushort_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ushort_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5162,7 -5245,7 +5245,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_short_ushort
+ * Function: H5T__conv_short_ushort
*
* Purpose: Converts `short' to `unsigned short'
*
@@@ -5178,7 -5261,7 +5261,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_short_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_short_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5188,7 -5271,7 +5271,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ushort_short
+ * Function: H5T__conv_ushort_short
*
* Purpose: Converts `unsigned short' to `short'
*
@@@ -5204,7 -5287,7 +5287,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ushort_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ushort_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5214,7 -5297,7 +5297,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_short_int
+ * Function: H5T__conv_short_int
*
* Purpose: Converts `short' to `int'
*
@@@ -5230,7 -5313,7 +5313,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_short_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_short_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5240,7 -5323,7 +5323,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_short_uint
+ * Function: H5T__conv_short_uint
*
* Purpose: Converts `short' to `unsigned int'
*
@@@ -5256,7 -5339,7 +5339,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_short_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_short_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5266,7 -5349,7 +5349,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ushort_int
+ * Function: H5T__conv_ushort_int
*
* Purpose: Converts `unsigned short' to `int'
*
@@@ -5282,7 -5365,7 +5365,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ushort_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ushort_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5292,7 -5375,7 +5375,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ushort_uint
+ * Function: H5T__conv_ushort_uint
*
* Purpose: Converts `unsigned short' to `unsigned int'
*
@@@ -5308,7 -5391,7 +5391,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ushort_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ushort_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5318,7 -5401,7 +5401,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_short_long
+ * Function: H5T__conv_short_long
*
* Purpose: Converts `short' to `long'
*
@@@ -5334,7 -5417,7 +5417,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_short_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_short_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5344,7 -5427,7 +5427,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_short_ulong
+ * Function: H5T__conv_short_ulong
*
* Purpose: Converts `short' to `unsigned long'
*
@@@ -5360,7 -5443,7 +5443,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_short_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_short_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5370,7 -5453,7 +5453,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ushort_long
+ * Function: H5T__conv_ushort_long
*
* Purpose: Converts `unsigned short' to `long'
*
@@@ -5386,7 -5469,7 +5469,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ushort_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ushort_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5396,7 -5479,7 +5479,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ushort_ulong
+ * Function: H5T__conv_ushort_ulong
*
* Purpose: Converts `unsigned short' to `unsigned long'
*
@@@ -5412,7 -5495,7 +5495,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ushort_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ushort_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5422,7 -5505,7 +5505,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_short_llong
+ * Function: H5T__conv_short_llong
*
* Purpose: Converts `short' to `long long'
*
@@@ -5438,7 -5521,7 +5521,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_short_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_short_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5448,7 -5531,7 +5531,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_short_ullong
+ * Function: H5T__conv_short_ullong
*
* Purpose: Converts `short' to `unsigned long long'
*
@@@ -5464,7 -5547,7 +5547,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_short_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_short_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5474,7 -5557,7 +5557,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ushort_llong
+ * Function: H5T__conv_ushort_llong
*
* Purpose: Converts `unsigned short' to `long long'
*
@@@ -5490,7 -5573,7 +5573,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ushort_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ushort_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5500,7 -5583,7 +5583,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ushort_ullong
+ * Function: H5T__conv_ushort_ullong
*
* Purpose: Converts `unsigned short' to `unsigned long long'
*
@@@ -5516,7 -5599,7 +5599,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ushort_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ushort_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5526,7 -5609,7 +5609,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_int_schar
+ * Function: H5T__conv_int_schar
*
* Purpose: Converts `int' to `signed char'
*
@@@ -5542,7 -5625,7 +5625,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_int_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_int_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5552,7 -5635,7 +5635,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_int_uchar
+ * Function: H5T__conv_int_uchar
*
* Purpose: Converts `int' to `unsigned char'
*
@@@ -5568,7 -5651,7 +5651,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_int_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_int_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5578,7 -5661,7 +5661,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_uint_schar
+ * Function: H5T__conv_uint_schar
*
* Purpose: Converts `unsigned int' to `signed char'
*
@@@ -5594,7 -5677,7 +5677,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_uint_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_uint_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5604,7 -5687,7 +5687,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_uint_uchar
+ * Function: H5T__conv_uint_uchar
*
* Purpose: Converts `unsigned int' to `unsigned char'
*
@@@ -5620,7 -5703,7 +5703,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_uint_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_uint_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5630,7 -5713,7 +5713,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_int_short
+ * Function: H5T__conv_int_short
*
* Purpose: Converts `int' to `short'
*
@@@ -5646,7 -5729,7 +5729,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_int_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_int_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5656,7 -5739,7 +5739,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_int_ushort
+ * Function: H5T__conv_int_ushort
*
* Purpose: Converts `int' to `unsigned short'
*
@@@ -5672,7 -5755,7 +5755,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_int_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_int_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5682,7 -5765,7 +5765,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_uint_short
+ * Function: H5T__conv_uint_short
*
* Purpose: Converts `unsigned int' to `short'
*
@@@ -5698,7 -5781,7 +5781,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_uint_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_uint_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5708,7 -5791,7 +5791,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_uint_ushort
+ * Function: H5T__conv_uint_ushort
*
* Purpose: Converts `unsigned int' to `unsigned short'
*
@@@ -5724,7 -5807,7 +5807,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_uint_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_uint_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5734,7 -5817,7 +5817,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_int_uint
+ * Function: H5T__conv_int_uint
*
* Purpose: Converts `int' to `unsigned int'
*
@@@ -5750,7 -5833,7 +5833,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_int_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_int_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -5759,7 -5842,7 +5842,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_uint_int
+ * Function: H5T__conv_uint_int
*
* Purpose: Converts `unsigned int' to `int'
*
@@@ -5775,7 -5858,7 +5858,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_uint_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_uint_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -5784,7 -5867,7 +5867,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_int_long
+ * Function: H5T__conv_int_long
*
* Purpose: Converts `int' to `long'
*
@@@ -5800,7 -5883,7 +5883,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_int_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_int_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -5809,7 -5892,7 +5892,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_int_ulong
+ * Function: H5T__conv_int_ulong
*
* Purpose: Converts `int' to `unsigned long'
*
@@@ -5825,7 -5908,7 +5908,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_int_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_int_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -5834,7 -5917,7 +5917,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_uint_long
+ * Function: H5T__conv_uint_long
*
* Purpose: Converts `unsigned int' to `long'
*
@@@ -5850,7 -5933,7 +5933,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_uint_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_uint_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -5859,7 -5942,7 +5942,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_uint_ulong
+ * Function: H5T__conv_uint_ulong
*
* Purpose: Converts `unsigned int' to `unsigned long'
*
@@@ -5875,7 -5958,7 +5958,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_uint_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_uint_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -5884,7 -5967,7 +5967,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_int_llong
+ * Function: H5T__conv_int_llong
*
* Purpose: Converts `int' to `long long'
*
@@@ -5900,7 -5983,7 +5983,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_int_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_int_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -5909,7 -5992,7 +5992,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_int_ullong
+ * Function: H5T__conv_int_ullong
*
* Purpose: Converts `int' to `unsigned long long'
*
@@@ -5925,7 -6008,7 +6008,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_int_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_int_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -5934,7 -6017,7 +6017,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_uint_llong
+ * Function: H5T__conv_uint_llong
*
* Purpose: Converts `unsigned int' to `long long'
*
@@@ -5950,7 -6033,7 +6033,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_uint_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_uint_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -5959,7 -6042,7 +6042,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_uint_ullong
+ * Function: H5T__conv_uint_ullong
*
* Purpose: Converts `unsigned int' to `unsigned long long'
*
@@@ -5975,7 -6058,7 +6058,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_uint_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_uint_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -5985,7 -6068,7 +6068,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_long_schar
+ * Function: H5T__conv_long_schar
*
* Purpose: Converts `long' to `signed char'
*
@@@ -6001,7 -6084,7 +6084,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_long_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_long_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -6010,7 -6093,7 +6093,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_long_uchar
+ * Function: H5T__conv_long_uchar
*
* Purpose: Converts `long' to `unsigned char'
*
@@@ -6026,7 -6109,7 +6109,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_long_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_long_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -6035,7 -6118,7 +6118,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ulong_schar
+ * Function: H5T__conv_ulong_schar
*
* Purpose: Converts `unsigned long' to `signed char'
*
@@@ -6051,7 -6134,7 +6134,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ulong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ulong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -6061,7 -6144,7 +6144,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ulong_uchar
+ * Function: H5T__conv_ulong_uchar
*
* Purpose: Converts `unsigned long' to `unsigned char'
*
@@@ -6077,7 -6160,7 +6160,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ulong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ulong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -6087,7 -6170,7 +6170,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_long_short
+ * Function: H5T__conv_long_short
*
* Purpose: Converts `long' to `short'
*
@@@ -6103,7 -6186,7 +6186,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_long_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_long_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -6112,7 -6195,7 +6195,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_long_ushort
+ * Function: H5T__conv_long_ushort
*
* Purpose: Converts `long' to `unsigned short'
*
@@@ -6128,7 -6211,7 +6211,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_long_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_long_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -6138,7 -6221,7 +6221,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ulong_short
+ * Function: H5T__conv_ulong_short
*
* Purpose: Converts `unsigned long' to `short'
*
@@@ -6154,7 -6237,7 +6237,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ulong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ulong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -6163,7 -6246,7 +6246,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ulong_ushort
+ * Function: H5T__conv_ulong_ushort
*
* Purpose: Converts `unsigned long' to `unsigned short'
*
@@@ -6179,7 -6262,7 +6262,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ulong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ulong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -6189,7 -6272,7 +6272,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_long_int
+ * Function: H5T__conv_long_int
*
* Purpose: Converts `long' to `int'
*
@@@ -6205,7 -6288,7 +6288,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_long_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_long_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -6214,7 -6297,7 +6297,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_long_uint
+ * Function: H5T__conv_long_uint
*
* Purpose: Converts `long' to `unsigned int'
*
@@@ -6230,7 -6313,7 +6313,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_long_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_long_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -6239,7 -6322,7 +6322,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ulong_int
+ * Function: H5T__conv_ulong_int
*
* Purpose: Converts `unsigned long' to `int'
*
@@@ -6255,7 -6338,7 +6338,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ulong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ulong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -6264,7 -6347,7 +6347,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ulong_uint
+ * Function: H5T__conv_ulong_uint
*
* Purpose: Converts `unsigned long' to `unsigned int'
*
@@@ -6280,7 -6363,7 +6363,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ulong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ulong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -6289,7 -6372,7 +6372,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_long_ulong
+ * Function: H5T__conv_long_ulong
*
* Purpose: Converts `long' to `unsigned long'
*
@@@ -6305,7 -6388,7 +6388,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_long_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_long_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -6314,7 -6397,7 +6397,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ulong_long
+ * Function: H5T__conv_ulong_long
*
* Purpose: Converts `unsigned long' to `long'
*
@@@ -6330,7 -6413,7 +6413,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ulong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ulong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -6339,7 -6422,7 +6422,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_long_llong
+ * Function: H5T__conv_long_llong
*
* Purpose: Converts `long' to `long long'
*
@@@ -6355,7 -6438,7 +6438,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_long_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_long_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -6364,7 -6447,7 +6447,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_long_ullong
+ * Function: H5T__conv_long_ullong
*
* Purpose: Converts `long' to `unsigned long long'
*
@@@ -6380,7 -6463,7 +6463,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_long_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_long_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -6390,7 -6473,7 +6473,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ulong_llong
+ * Function: H5T__conv_ulong_llong
*
* Purpose: Converts `unsigned long' to `long long'
*
@@@ -6406,7 -6489,7 +6489,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ulong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ulong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -6416,7 -6499,7 +6499,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ulong_ullong
+ * Function: H5T__conv_ulong_ullong
*
* Purpose: Converts `unsigned long' to `unsigned long long'
*
@@@ -6432,7 -6515,7 +6515,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ulong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ulong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -6442,7 -6525,7 +6525,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_llong_schar
+ * Function: H5T__conv_llong_schar
*
* Purpose: Converts `long long' to `signed char'
*
@@@ -6458,7 -6541,7 +6541,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_llong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_llong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -6468,7 -6551,7 +6551,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_llong_uchar
+ * Function: H5T__conv_llong_uchar
*
* Purpose: Converts `long long' to `unsigned char'
*
@@@ -6484,7 -6567,7 +6567,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_llong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_llong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -6494,7 -6577,7 +6577,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ullong_schar
+ * Function: H5T__conv_ullong_schar
*
* Purpose: Converts `unsigned long long' to `signed char'
*
@@@ -6510,7 -6593,7 +6593,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ullong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ullong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -6520,7 -6603,7 +6603,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ullong_uchar
+ * Function: H5T__conv_ullong_uchar
*
* Purpose: Converts `unsigned long long' to `unsigned char'
*
@@@ -6536,7 -6619,7 +6619,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ullong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ullong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -6546,7 -6629,7 +6629,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_llong_short
+ * Function: H5T__conv_llong_short
*
* Purpose: Converts `long long' to `short'
*
@@@ -6562,7 -6645,7 +6645,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_llong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_llong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -6572,7 -6655,7 +6655,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_llong_ushort
+ * Function: H5T__conv_llong_ushort
*
* Purpose: Converts `long long' to `unsigned short'
*
@@@ -6588,7 -6671,7 +6671,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_llong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_llong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -6598,7 -6681,7 +6681,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ullong_short
+ * Function: H5T__conv_ullong_short
*
* Purpose: Converts `unsigned long long' to `short'
*
@@@ -6614,7 -6697,7 +6697,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ullong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ullong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -6624,7 -6707,7 +6707,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ullong_ushort
+ * Function: H5T__conv_ullong_ushort
*
* Purpose: Converts `unsigned long long' to `unsigned short'
*
@@@ -6640,7 -6723,7 +6723,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ullong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ullong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -6650,7 -6733,7 +6733,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_llong_int
+ * Function: H5T__conv_llong_int
*
* Purpose: Converts `long long' to `int'
*
@@@ -6666,7 -6749,7 +6749,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_llong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_llong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -6675,7 -6758,7 +6758,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_llong_uint
+ * Function: H5T__conv_llong_uint
*
* Purpose: Converts `long long' to `unsigned int'
*
@@@ -6691,7 -6774,7 +6774,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_llong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_llong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -6700,7 -6783,7 +6783,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ullong_int
+ * Function: H5T__conv_ullong_int
*
* Purpose: Converts `unsigned long long' to `int'
*
@@@ -6716,7 -6799,7 +6799,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ullong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ullong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -6725,7 -6808,7 +6808,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ullong_uint
+ * Function: H5T__conv_ullong_uint
*
* Purpose: Converts `unsigned long long' to `unsigned int'
*
@@@ -6741,7 -6824,7 +6824,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ullong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ullong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -6751,7 -6834,7 +6834,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_llong_long
+ * Function: H5T__conv_llong_long
*
* Purpose: Converts `long long' to `long'
*
@@@ -6767,7 -6850,7 +6850,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_llong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_llong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
@@@ -6776,7 -6859,7 +6859,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_llong_ulong
+ * Function: H5T__conv_llong_ulong
*
* Purpose: Converts `long long' to `unsigned long'
*
@@@ -6792,7 -6875,7 +6875,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_llong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_llong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -6802,7 -6885,7 +6885,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ullong_long
+ * Function: H5T__conv_ullong_long
*
* Purpose: Converts `unsigned long long' to `long'
*
@@@ -6818,7 -6901,7 +6901,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ullong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ullong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -6828,7 -6911,7 +6911,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ullong_ulong
+ * Function: H5T__conv_ullong_ulong
*
* Purpose: Converts `unsigned long long' to `unsigned long'
*
@@@ -6844,7 -6927,7 +6927,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ullong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ullong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -6854,7 -6937,7 +6937,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_llong_ullong
+ * Function: H5T__conv_llong_ullong
*
* Purpose: Converts `long long' to `unsigned long long'
*
@@@ -6870,7 -6953,7 +6953,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_llong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_llong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -6880,7 -6963,7 +6963,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ullong_llong
+ * Function: H5T__conv_ullong_llong
*
* Purpose: Converts `unsigned long long' to `long long'
*
@@@ -6896,7 -6979,7 +6979,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ullong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ullong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -6906,7 -6989,7 +6989,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_float_double
+ * Function: H5T__conv_float_double
*
* Purpose: Convert native `float' to native `double' using hardware.
* This is a fast special case.
@@@ -6926,7 -7009,7 +7009,7 @@@
*/
#if H5T_CONV_INTERNAL_FP_FP
herr_t
- H5T_conv_float_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_float_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -6937,7 -7020,7 +7020,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_float_ldouble
+ * Function: H5T__conv_float_ldouble
*
* Purpose: Convert native `float' to native `long double' using hardware.
* This is a fast special case.
@@@ -6953,7 -7036,7 +7036,7 @@@
*/
#if H5T_CONV_INTERNAL_FP_LDOUBLE
herr_t
- H5T_conv_float_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_float_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -6964,7 -7047,7 +7047,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_double_float
+ * Function: H5T__conv_double_float
*
* Purpose: Convert native `double' to native `float' using hardware.
* This is a fast special case.
@@@ -6987,7 -7070,7 +7070,7 @@@
*/
#if H5T_CONV_INTERNAL_FP_FP
herr_t
- H5T_conv_double_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_double_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -6998,7 -7081,7 +7081,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_double_ldouble
+ * Function: H5T__conv_double_ldouble
*
* Purpose: Convert native `double' to native `long double' using hardware.
* This is a fast special case.
@@@ -7014,7 -7097,7 +7097,7 @@@
*/
#if H5T_CONV_INTERNAL_FP_LDOUBLE
herr_t
- H5T_conv_double_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_double_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7025,7 -7108,7 +7108,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ldouble_float
+ * Function: H5T__conv_ldouble_float
*
* Purpose: Convert native `long double' to native `float' using hardware.
* This is a fast special case.
@@@ -7041,7 -7124,7 +7124,7 @@@
*/
#if H5T_CONV_INTERNAL_FP_LDOUBLE
herr_t
- H5T_conv_ldouble_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ldouble_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7052,7 -7135,7 +7135,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ldouble_double
+ * Function: H5T__conv_ldouble_double
*
* Purpose: Convert native `long double' to native `double' using hardware.
* This is a fast special case.
@@@ -7068,7 -7151,7 +7151,7 @@@
*/
#if H5T_CONV_INTERNAL_FP_LDOUBLE
herr_t
- H5T_conv_ldouble_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ldouble_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7079,7 -7162,7 +7162,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_schar_float
+ * Function: H5T__conv_schar_float
*
* Purpose: Convert native signed char to native float using hardware.
* This is a fast special case.
@@@ -7094,7 -7177,7 +7177,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_schar_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_schar_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7104,7 -7187,7 +7187,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_schar_double
+ * Function: H5T__conv_schar_double
*
* Purpose: Convert native signed char to native double using hardware.
* This is a fast special case.
@@@ -7119,7 -7202,7 +7202,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_schar_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_schar_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7129,7 -7212,7 +7212,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_schar_ldouble
+ * Function: H5T__conv_schar_ldouble
*
* Purpose: Convert native signed char to native long double using
* hardware. This is a fast special case.
@@@ -7145,7 -7228,7 +7228,7 @@@
*/
#if H5T_CONV_INTERNAL_INTEGER_LDOUBLE
herr_t
- H5T_conv_schar_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_schar_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7156,7 -7239,7 +7239,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_uchar_float
+ * Function: H5T__conv_uchar_float
*
* Purpose: Convert native unsigned char to native float using hardware.
* This is a fast special case.
@@@ -7171,7 -7254,7 +7254,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_uchar_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_uchar_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7181,7 -7264,7 +7264,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_uchar_double
+ * Function: H5T__conv_uchar_double
*
* Purpose: Convert native unsigned char to native double using hardware.
* This is a fast special case.
@@@ -7196,7 -7279,7 +7279,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_uchar_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_uchar_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7206,7 -7289,7 +7289,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_uchar_ldouble
+ * Function: H5T__conv_uchar_ldouble
*
* Purpose: Convert native unsigned char to native long double using
* hardware. This is a fast special case.
@@@ -7222,7 -7305,7 +7305,7 @@@
*/
#if H5T_CONV_INTERNAL_INTEGER_LDOUBLE
herr_t
- H5T_conv_uchar_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_uchar_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7233,7 -7316,7 +7316,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_short_float
+ * Function: H5T__conv_short_float
*
* Purpose: Convert native short to native float using hardware.
* This is a fast special case.
@@@ -7248,7 -7331,7 +7331,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_short_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_short_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7258,7 -7341,7 +7341,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_short_double
+ * Function: H5T__conv_short_double
*
* Purpose: Convert native short to native double using hardware.
* This is a fast special case.
@@@ -7273,7 -7356,7 +7356,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_short_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_short_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7283,7 -7366,7 +7366,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_short_ldouble
+ * Function: H5T__conv_short_ldouble
*
* Purpose: Convert native short to native long double using hardware.
* This is a fast special case.
@@@ -7299,7 -7382,7 +7382,7 @@@
*/
#if H5T_CONV_INTERNAL_INTEGER_LDOUBLE
herr_t
- H5T_conv_short_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_short_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7310,7 -7393,7 +7393,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ushort_float
+ * Function: H5T__conv_ushort_float
*
* Purpose: Convert native unsigned short to native float using hardware.
* This is a fast special case.
@@@ -7325,7 -7408,7 +7408,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ushort_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ushort_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7335,7 -7418,7 +7418,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ushort_double
+ * Function: H5T__conv_ushort_double
*
* Purpose: Convert native unsigned short to native double using hardware.
* This is a fast special case.
@@@ -7350,7 -7433,7 +7433,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_ushort_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ushort_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7360,7 -7443,7 +7443,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ushort_ldouble
+ * Function: H5T__conv_ushort_ldouble
*
* Purpose: Convert native unsigned short to native long double using
* hardware. This is a fast special case.
@@@ -7376,7 -7459,7 +7459,7 @@@
*/
#if H5T_CONV_INTERNAL_INTEGER_LDOUBLE
herr_t
- H5T_conv_ushort_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ushort_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7387,7 -7470,7 +7470,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_int_float
+ * Function: H5T__conv_int_float
*
* Purpose: Convert native integer to native float using hardware.
* This is a fast special case.
@@@ -7402,7 -7485,7 +7485,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_int_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_int_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7412,7 -7495,7 +7495,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_int_double
+ * Function: H5T__conv_int_double
*
* Purpose: Convert native integer to native double using hardware.
* This is a fast special case.
@@@ -7427,7 -7510,7 +7510,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_int_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_int_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7437,7 -7520,7 +7520,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_int_ldouble
+ * Function: H5T__conv_int_ldouble
*
* Purpose: Convert native integer to native long double using hardware.
* This is a fast special case.
@@@ -7453,7 -7536,7 +7536,7 @@@
*/
#if H5T_CONV_INTERNAL_INTEGER_LDOUBLE
herr_t
- H5T_conv_int_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_int_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7464,7 -7547,7 +7547,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_uint_float
+ * Function: H5T__conv_uint_float
*
* Purpose: Convert native unsigned integer to native float using
* hardware. This is a fast special case.
@@@ -7479,7 -7562,7 +7562,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_uint_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_uint_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7489,7 -7572,7 +7572,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_uint_double
+ * Function: H5T__conv_uint_double
*
* Purpose: Convert native unsigned integer to native double using
* hardware. This is a fast special case.
@@@ -7504,7 -7587,7 +7587,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_uint_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_uint_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7514,7 -7597,7 +7597,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_uint_ldouble
+ * Function: H5T__conv_uint_ldouble
*
* Purpose: Convert native unsigned integer to native long double using
* hardware. This is a fast special case.
@@@ -7530,7 -7613,7 +7613,7 @@@
*/
#if H5T_CONV_INTERNAL_INTEGER_LDOUBLE
herr_t
- H5T_conv_uint_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_uint_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7541,7 -7624,7 +7624,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_long_float
+ * Function: H5T__conv_long_float
*
* Purpose: Convert native long to native float using hardware.
* This is a fast special case.
@@@ -7556,7 -7639,7 +7639,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_long_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_long_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7566,7 -7649,7 +7649,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_long_double
+ * Function: H5T__conv_long_double
*
* Purpose: Convert native long to native double using hardware.
* This is a fast special case.
@@@ -7581,7 -7664,7 +7664,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_long_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_long_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7591,7 -7674,7 +7674,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_long_ldouble
+ * Function: H5T__conv_long_ldouble
*
* Purpose: Convert native long to native long double using hardware.
* This is a fast special case.
@@@ -7607,7 -7690,7 +7690,7 @@@
*/
#if H5T_CONV_INTERNAL_INTEGER_LDOUBLE
herr_t
- H5T_conv_long_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_long_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7618,7 -7701,7 +7701,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ulong_float
+ * Function: H5T__conv_ulong_float
*
* Purpose: Convert native unsigned long to native float using hardware.
* This is a fast special case.
@@@ -7634,7 -7717,7 +7717,7 @@@
*/
#if H5T_CONV_INTERNAL_ULONG_FLT
herr_t
- H5T_conv_ulong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ulong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7645,7 -7728,7 +7728,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ulong_double
+ * Function: H5T__conv_ulong_double
*
* Purpose: Convert native unsigned long to native double using hardware.
* This is a fast special case.
@@@ -7661,7 -7744,7 +7744,7 @@@
*/
#if H5T_CONV_INTERNAL_ULONG_DBL
herr_t
- H5T_conv_ulong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ulong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7672,7 -7755,7 +7755,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ulong_ldouble
+ * Function: H5T__conv_ulong_ldouble
*
* Purpose: Convert native unsigned long to native long double using
* hardware. This is a fast special case.
@@@ -7688,7 -7771,7 +7771,7 @@@
*/
#if H5T_CONV_INTERNAL_ULONG_LDOUBLE
herr_t
- H5T_conv_ulong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ulong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7699,7 -7782,7 +7782,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_llong_float
+ * Function: H5T__conv_llong_float
*
* Purpose: Convert native long long to native float using hardware.
* This is a fast special case.
@@@ -7714,7 -7797,7 +7797,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_llong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_llong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7724,7 -7807,7 +7807,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_llong_double
+ * Function: H5T__conv_llong_double
*
* Purpose: Convert native long long to native double using hardware.
* This is a fast special case.
@@@ -7739,7 -7822,7 +7822,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_llong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_llong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7749,7 -7832,7 +7832,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_llong_ldouble
+ * Function: H5T__conv_llong_ldouble
*
* Purpose: Convert native long long to native long double using
* hardware. This is a fast special case.
@@@ -7765,7 -7848,7 +7848,7 @@@
*/
#if H5T_CONV_INTERNAL_LLONG_LDOUBLE
herr_t
- H5T_conv_llong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_llong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7776,7 -7859,7 +7859,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ullong_float
+ * Function: H5T__conv_ullong_float
*
* Purpose: Convert native unsigned long long to native float using
* hardware. This is a fast special case.
@@@ -7792,7 -7875,7 +7875,7 @@@
*/
#if H5T_CONV_INTERNAL_ULLONG_FP
herr_t
- H5T_conv_ullong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ullong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7803,7 -7886,7 +7886,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ullong_double
+ * Function: H5T__conv_ullong_double
*
* Purpose: Convert native unsigned long long to native double using
* hardware. This is a fast special case.
@@@ -7819,7 -7902,7 +7902,7 @@@
*/
#if H5T_CONV_INTERNAL_ULLONG_FP
herr_t
- H5T_conv_ullong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ullong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7830,7 -7913,7 +7913,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ullong_ldouble
+ * Function: H5T__conv_ullong_ldouble
*
* Purpose: Convert native unsigned long long to native long double using
* hardware. This is a fast special case.
@@@ -7846,7 -7929,7 +7929,7 @@@
*/
#if H5T_CONV_INTERNAL_ULLONG_LDOUBLE
herr_t
- H5T_conv_ullong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ullong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7857,7 -7940,7 +7940,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_float_schar
+ * Function: H5T__conv_float_schar
*
* Purpose: Convert native float to native signed char using
* hardware. This is a fast special case.
@@@ -7872,7 -7955,7 +7955,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_float_schar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_float_schar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7882,7 -7965,7 +7965,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_float_uchar
+ * Function: H5T__conv_float_uchar
*
* Purpose: Convert native float to native unsigned char using
* hardware. This is a fast special case.
@@@ -7897,7 -7980,7 +7980,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_float_uchar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_float_uchar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7907,7 -7990,7 +7990,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_double_schar
+ * Function: H5T__conv_double_schar
*
* Purpose: Convert native double to native signed char using
* hardware. This is a fast special case.
@@@ -7922,7 -8005,7 +8005,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_double_schar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_double_schar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7932,7 -8015,7 +8015,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_double_uchar
+ * Function: H5T__conv_double_uchar
*
* Purpose: Convert native double to native unsigned char using
* hardware. This is a fast special case.
@@@ -7947,7 -8030,7 +8030,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_double_uchar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_double_uchar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7957,7 -8040,7 +8040,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ldouble_schar
+ * Function: H5T__conv_ldouble_schar
*
* Purpose: Convert native long double to native signed char using
* hardware. This is a fast special case.
@@@ -7973,7 -8056,7 +8056,7 @@@
*/
#if H5T_CONV_INTERNAL_LDOUBLE_INTEGER
herr_t
- H5T_conv_ldouble_schar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ldouble_schar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -7984,7 -8067,7 +8067,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ldouble_uchar
+ * Function: H5T__conv_ldouble_uchar
*
* Purpose: Convert native long double to native unsigned char using
* hardware. This is a fast special case.
@@@ -8000,7 -8083,7 +8083,7 @@@
*/
#if H5T_CONV_INTERNAL_LDOUBLE_INTEGER
herr_t
- H5T_conv_ldouble_uchar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ldouble_uchar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -8011,7 -8094,7 +8094,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_float_short
+ * Function: H5T__conv_float_short
*
* Purpose: Convert native float to native short using
* hardware. This is a fast special case.
@@@ -8026,7 -8109,7 +8109,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_float_short (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_float_short (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -8036,7 -8119,7 +8119,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_float_ushort
+ * Function: H5T__conv_float_ushort
*
* Purpose: Convert native float to native unsigned short using
* hardware. This is a fast special case.
@@@ -8051,7 -8134,7 +8134,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_float_ushort (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_float_ushort (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -8061,7 -8144,7 +8144,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_double_short
+ * Function: H5T__conv_double_short
*
* Purpose: Convert native double to native short using
* hardware. This is a fast special case.
@@@ -8076,7 -8159,7 +8159,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_double_short (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_double_short (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -8086,7 -8169,7 +8169,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_double_ushort
+ * Function: H5T__conv_double_ushort
*
* Purpose: Convert native double to native unsigned short using
* hardware. This is a fast special case.
@@@ -8101,7 -8184,7 +8184,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_double_ushort (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_double_ushort (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -8111,7 -8194,7 +8194,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ldouble_short
+ * Function: H5T__conv_ldouble_short
*
* Purpose: Convert native long double to native short using
* hardware. This is a fast special case.
@@@ -8127,7 -8210,7 +8210,7 @@@
*/
#if H5T_CONV_INTERNAL_LDOUBLE_INTEGER
herr_t
- H5T_conv_ldouble_short (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ldouble_short (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -8138,7 -8221,7 +8221,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ldouble_ushort
+ * Function: H5T__conv_ldouble_ushort
*
* Purpose: Convert native long double to native unsigned short using
* hardware. This is a fast special case.
@@@ -8154,7 -8237,7 +8237,7 @@@
*/
#if H5T_CONV_INTERNAL_LDOUBLE_INTEGER
herr_t
- H5T_conv_ldouble_ushort (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ldouble_ushort (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -8165,7 -8248,7 +8248,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_float_int
+ * Function: H5T__conv_float_int
*
* Purpose: Convert native float to native int using
* hardware. This is a fast special case.
@@@ -8180,7 -8263,7 +8263,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_float_int (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_float_int (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -8190,7 -8273,7 +8273,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_float_uint
+ * Function: H5T__conv_float_uint
*
* Purpose: Convert native float to native unsigned int using
* hardware. This is a fast special case.
@@@ -8205,7 -8288,7 +8288,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_float_uint (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_float_uint (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -8215,7 -8298,7 +8298,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_double_int
+ * Function: H5T__conv_double_int
*
* Purpose: Convert native double to native int using
* hardware. This is a fast special case.
@@@ -8230,7 -8313,7 +8313,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_double_int (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_double_int (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -8240,7 -8323,7 +8323,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_double_uint
+ * Function: H5T__conv_double_uint
*
* Purpose: Convert native double to native unsigned int using
* hardware. This is a fast special case.
@@@ -8255,7 -8338,7 +8338,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_double_uint (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_double_uint (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -8265,7 -8348,7 +8348,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ldouble_int
+ * Function: H5T__conv_ldouble_int
*
* Purpose: Convert native long double to native int using
* hardware. This is a fast special case.
@@@ -8281,7 -8364,7 +8364,7 @@@
*/
#if H5T_CONV_INTERNAL_LDOUBLE_INTEGER
herr_t
- H5T_conv_ldouble_int (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ldouble_int (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -8292,7 -8375,7 +8375,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ldouble_uint
+ * Function: H5T__conv_ldouble_uint
*
* Purpose: Convert native long double to native unsigned int using
* hardware. This is a fast special case.
@@@ -8308,7 -8391,7 +8391,7 @@@
*/
#if H5T_CONV_INTERNAL_LDOUBLE_UINT
herr_t
- H5T_conv_ldouble_uint (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ldouble_uint (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -8319,7 -8402,7 +8402,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_float_long
+ * Function: H5T__conv_float_long
*
* Purpose: Convert native float to native long using
* hardware. This is a fast special case.
@@@ -8334,7 -8417,7 +8417,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_float_long (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_float_long (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -8344,7 -8427,7 +8427,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_float_ulong
+ * Function: H5T__conv_float_ulong
*
* Purpose: Convert native float to native unsigned long using
* hardware. This is a fast special case.
@@@ -8359,7 -8442,7 +8442,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_float_ulong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_float_ulong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -8369,7 -8452,7 +8452,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_double_long
+ * Function: H5T__conv_double_long
*
* Purpose: Convert native double to native long using
* hardware. This is a fast special case.
@@@ -8384,7 -8467,7 +8467,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_double_long (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_double_long (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -8394,7 -8477,7 +8477,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_double_ulong
+ * Function: H5T__conv_double_ulong
*
* Purpose: Convert native double to native unsigned long using
* hardware. This is a fast special case.
@@@ -8409,7 -8492,7 +8492,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_double_ulong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_double_ulong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -8419,7 -8502,7 +8502,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ldouble_long
+ * Function: H5T__conv_ldouble_long
*
* Purpose: Convert native long double to native long using
* hardware. This is a fast special case.
@@@ -8435,7 -8518,7 +8518,7 @@@
*/
#if H5T_CONV_INTERNAL_LDOUBLE_INTEGER
herr_t
- H5T_conv_ldouble_long (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ldouble_long (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -8446,7 -8529,7 +8529,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ldouble_ulong
+ * Function: H5T__conv_ldouble_ulong
*
* Purpose: Convert native long double to native unsigned long using
* hardware. This is a fast special case.
@@@ -8462,7 -8545,7 +8545,7 @@@
*/
#if H5T_CONV_INTERNAL_LDOUBLE_INTEGER
herr_t
- H5T_conv_ldouble_ulong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ldouble_ulong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -8473,7 -8556,7 +8556,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_float_llong
+ * Function: H5T__conv_float_llong
*
* Purpose: Convert native float to native long long using
* hardware. This is a fast special case.
@@@ -8489,7 -8572,7 +8572,7 @@@
*/
#if H5T_CONV_INTERNAL_FP_LLONG
herr_t
- H5T_conv_float_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_float_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -8500,7 -8583,7 +8583,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_float_ullong
+ * Function: H5T__conv_float_ullong
*
* Purpose: Convert native float to native unsigned long long using
* hardware. This is a fast special case.
@@@ -8514,18 -8597,20 +8597,18 @@@
*
*-------------------------------------------------------------------------
*/
-#if H5T_CONV_INTERNAL_FP_ULLONG
herr_t
- H5T_conv_float_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_float_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
H5T_CONV_Fx(FLOAT, ULLONG, float, unsigned long long, 0, ULLONG_MAX);
}
/*-------------------------------------------------------------------------
- * Function: H5T_conv_double_llong
+ * Function: H5T__conv_double_llong
*
* Purpose: Convert native double to native long long using
* hardware. This is a fast special case.
@@@ -8541,7 -8626,7 +8624,7 @@@
*/
#if H5T_CONV_INTERNAL_FP_LLONG
herr_t
- H5T_conv_double_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_double_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -8552,7 -8637,7 +8635,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_double_ullong
+ * Function: H5T__conv_double_ullong
*
* Purpose: Convert native double to native unsigned long long using
* hardware. This is a fast special case.
@@@ -8566,18 -8651,20 +8649,18 @@@
*
*-------------------------------------------------------------------------
*/
-#if H5T_CONV_INTERNAL_FP_ULLONG
herr_t
- H5T_conv_double_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_double_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t dxpl_id)
{
H5T_CONV_Fx(DOUBLE, ULLONG, double, unsigned long long, 0, ULLONG_MAX);
}
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ldouble_llong
+ * Function: H5T__conv_ldouble_llong
*
* Purpose: Convert native long double to native long long using
* hardware. This is a fast special case.
@@@ -8593,7 -8680,7 +8676,7 @@@
*/
#if H5T_CONV_INTERNAL_LDOUBLE_LLONG
herr_t
- H5T_conv_ldouble_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ldouble_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
@@@ -8604,7 -8691,7 +8687,7 @@@
/*-------------------------------------------------------------------------
- * Function: H5T_conv_ldouble_ullong
+ * Function: H5T__conv_ldouble_ullong
*
* Purpose: Convert native long double to native unsigned long long using
* hardware. This is a fast special case.
@@@ -8618,18 -8705,20 +8701,18 @@@
*
*-------------------------------------------------------------------------
*/
-#if H5T_CONV_INTERNAL_LDOUBLE_ULLONG
herr_t
- H5T_conv_ldouble_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ H5T__conv_ldouble_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t dxpl_id)
{
H5T_CONV_Fx(LDOUBLE, ULLONG, long double, unsigned long long, 0, ULLONG_MAX);
}
/*-------------------------------------------------------------------------
- * Function: H5T_conv_f_i
+ * Function: H5T__conv_f_i
*
* Purpose: Convert one floating-point type to an integer. This is
* the catch-all function for float-integer conversions and
@@@ -8653,7 -8742,7 +8736,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_f_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+ H5T__conv_f_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t dxpl_id)
{
@@@ -8687,7 -8776,7 +8770,7 @@@
H5T_conv_ret_t except_ret; /*return of callback function */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(FAIL)
+ FUNC_ENTER_PACKAGE
switch(cdata->command) {
case H5T_CONV_INIT:
@@@ -8812,24 -8901,24 +8895,24 @@@
}
/*zero-set all destination bits*/
- H5T_bit_set (d, dst.offset, dst.prec, FALSE);
+ H5T__bit_set (d, dst.offset, dst.prec, FALSE);
/*
* Find the sign bit value of the source.
*/
- sign = H5T_bit_get_d(s, src.u.f.sign, (size_t)1);
+ sign = H5T__bit_get_d(s, src.u.f.sign, (size_t)1);
/*
* Check for special cases: +0, -0, +Inf, -Inf, NaN
*/
- if (H5T_bit_find (s, src.u.f.mpos, src.u.f.msize,
+ if (H5T__bit_find (s, src.u.f.mpos, src.u.f.msize,
H5T_BIT_LSB, TRUE)<0) {
- if (H5T_bit_find (s, src.u.f.epos, src.u.f.esize,
+ if (H5T__bit_find (s, src.u.f.epos, src.u.f.esize,
H5T_BIT_LSB, TRUE)<0) {
/* +0 or -0 */
/* Set all bits to zero */
goto padding;
- } else if (H5T_bit_find (s, src.u.f.epos, src.u.f.esize,
+ } else if (H5T__bit_find (s, src.u.f.epos, src.u.f.esize,
H5T_BIT_LSB, FALSE)<0) {
/* +Infinity or -Infinity */
if(sign) { /* -Infinity */
@@@ -8842,7 -8931,7 +8925,7 @@@
if(except_ret == H5T_CONV_UNHANDLED) {
if (H5T_SGN_2==dst.u.i.sign)
- H5T_bit_set (d, dst.prec-1, (size_t)1, TRUE);
+ H5T__bit_set (d, dst.prec-1, (size_t)1, TRUE);
} else if(except_ret == H5T_CONV_HANDLED) {
/*No need to reverse the order of destination because user handles it*/
reverse = FALSE;
@@@ -8859,9 -8948,9 +8942,9 @@@
if(except_ret == H5T_CONV_UNHANDLED) {
if (H5T_SGN_NONE==dst.u.i.sign)
- H5T_bit_set (d, dst.offset, dst.prec, TRUE);
+ H5T__bit_set (d, dst.offset, dst.prec, TRUE);
else if (H5T_SGN_2==dst.u.i.sign)
- H5T_bit_set (d, dst.offset, dst.prec-1, TRUE);
+ H5T__bit_set (d, dst.offset, dst.prec-1, TRUE);
} else if(except_ret == H5T_CONV_HANDLED) {
/*No need to reverse the order of destination because user handles it*/
reverse = FALSE;
@@@ -8871,8 -8960,8 +8954,8 @@@
}
goto padding;
}
- } else if (H5T_NORM_NONE==src.u.f.norm && H5T_bit_find (s, src.u.f.mpos, src.u.f.msize-1,
- H5T_BIT_LSB, TRUE)<0 && H5T_bit_find (s, src.u.f.epos, src.u.f.esize,
+ } else if (H5T_NORM_NONE==src.u.f.norm && H5T__bit_find (s, src.u.f.mpos, src.u.f.msize-1,
+ H5T_BIT_LSB, TRUE)<0 && H5T__bit_find (s, src.u.f.epos, src.u.f.esize,
H5T_BIT_LSB, FALSE)<0) {
/*This is a special case for the source of no implied mantissa bit.
*If the exponent bits are all 1s and only the 1st bit of mantissa
@@@ -8888,7 -8977,7 +8971,7 @@@
if(except_ret == H5T_CONV_UNHANDLED) {
if (H5T_SGN_2==dst.u.i.sign)
- H5T_bit_set (d, dst.prec-1, (size_t)1, TRUE);
+ H5T__bit_set (d, dst.prec-1, (size_t)1, TRUE);
} else if(except_ret == H5T_CONV_HANDLED) {
/*No need to reverse the order of destination because user handles it*/
reverse = FALSE;
@@@ -8905,9 -8994,9 +8988,9 @@@
if(except_ret == H5T_CONV_UNHANDLED) {
if (H5T_SGN_NONE==dst.u.i.sign)
- H5T_bit_set (d, dst.offset, dst.prec, TRUE);
+ H5T__bit_set (d, dst.offset, dst.prec, TRUE);
else if (H5T_SGN_2==dst.u.i.sign)
- H5T_bit_set (d, dst.offset, dst.prec-1, TRUE);
+ H5T__bit_set (d, dst.offset, dst.prec-1, TRUE);
} else if(except_ret == H5T_CONV_HANDLED) {
/*No need to reverse the order of destination because user handles it*/
reverse = FALSE;
@@@ -8916,7 -9005,7 +8999,7 @@@
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
}
goto padding;
- } else if (H5T_bit_find (s, src.u.f.epos, src.u.f.esize,
+ } else if (H5T__bit_find (s, src.u.f.epos, src.u.f.esize,
H5T_BIT_LSB, FALSE)<0) {
/* NaN */
if(cb_struct.func) { /*If user's exception handler is present, use it*/
@@@ -8944,7 -9033,7 +9027,7 @@@
* the source bit field where it's located. Not expecting
* exponent to be greater than the maximal value of hssize_t.
*/
- expo = H5T_bit_get_d(s, src.u.f.epos, src.u.f.esize);
+ expo = H5T__bit_get_d(s, src.u.f.epos, src.u.f.esize);
/*
* Calculate the true source exponent by adjusting according to
@@@ -8969,14 -9058,14 +9052,14 @@@
* V V V V
* buf[0] buf[1] buf[2] buf[3]
*/
- H5T_bit_copy(int_buf, (size_t)0, s, src.u.f.mpos, src.u.f.msize);
+ H5T__bit_copy(int_buf, (size_t)0, s, src.u.f.mpos, src.u.f.msize);
/*
* Restore the implicit bit for mantissa if it's implied.
* Equivalent to mantissa |= (hsize_t)1<<src.u.f.msize.
*/
if(H5T_NORM_IMPLIED == src.u.f.norm)
- H5T_bit_inc(int_buf, src.u.f.msize, 8 * buf_size - src.u.f.msize);
+ H5T__bit_inc(int_buf, src.u.f.msize, 8 * buf_size - src.u.f.msize);
/*
* Shift mantissa part by exponent minus mantissa size(right shift),
@@@ -8984,7 -9073,7 +9067,7 @@@
* 10...010111, expo=20, expo-msize=-3. Right-shift the sequence, we get
* 00010...10. The last three bits were dropped.
*/
- H5T_bit_shift(int_buf, (ssize_t)(expo-src.u.f.msize), (size_t)0, buf_size * 8);
+ H5T__bit_shift(int_buf, (ssize_t)(expo-src.u.f.msize), (size_t)0, buf_size * 8);
/*
* If expo is less than mantissa size, the frantional value is dropped off
@@@ -8998,7 -9087,7 +9081,7 @@@
* which is set? This is checked before converted to negative
* integer.
*/
- sfirst = H5T_bit_find(int_buf, (size_t)0, 8 * buf_size, H5T_BIT_MSB, TRUE);
+ sfirst = H5T__bit_find(int_buf, (size_t)0, 8 * buf_size, H5T_BIT_MSB, TRUE);
first = (size_t)sfirst;
if(sfirst < 0) {
@@@ -9040,7 -9129,7 +9123,7 @@@
}
if(except_ret == H5T_CONV_UNHANDLED)
- H5T_bit_set (d, dst.offset, dst.prec, TRUE);
+ H5T__bit_set (d, dst.offset, dst.prec, TRUE);
else if(except_ret == H5T_CONV_HANDLED) {
/*No need to reverse the order of destination because user handles it*/
reverse = FALSE;
@@@ -9057,7 -9146,7 +9140,7 @@@
if(except_ret == H5T_CONV_UNHANDLED)
/*copy source value into it if case is ignored by user handler*/
- H5T_bit_copy (d, dst.offset, int_buf, (size_t)0, first+1);
+ H5T__bit_copy (d, dst.offset, int_buf, (size_t)0, first+1);
else if(except_ret == H5T_CONV_HANDLED) {
/*No need to reverse the order of destination because user handles it*/
reverse = FALSE;
@@@ -9078,12 -9167,12 +9161,12 @@@
if(except_ret == H5T_CONV_UNHANDLED) { /*If this case ignored by user handler*/
/*Convert to integer representation. Equivalent to ~(value - 1).*/
- H5T_bit_dec(int_buf, (size_t)0, 8 * buf_size);
- H5T_bit_neg(int_buf, (size_t)0, 8 * buf_size);
+ H5T__bit_dec(int_buf, (size_t)0, 8 * buf_size);
+ H5T__bit_neg(int_buf, (size_t)0, 8 * buf_size);
/*copy source value into destination*/
- H5T_bit_copy(d, dst.offset, int_buf, (size_t)0, dst.prec-1);
- H5T_bit_set(d, (dst.offset + dst.prec-1), (size_t)1, TRUE);
+ H5T__bit_copy(d, dst.offset, int_buf, (size_t)0, dst.prec-1);
+ H5T__bit_set(d, (dst.offset + dst.prec-1), (size_t)1, TRUE);
} else if(except_ret == H5T_CONV_ABORT)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
else if(except_ret == H5T_CONV_HANDLED) {
@@@ -9103,7 -9192,7 +9186,7 @@@
}
if(except_ret == H5T_CONV_UNHANDLED)
- H5T_bit_set(d, (dst.offset + dst.prec-1), (size_t)1, TRUE);
+ H5T__bit_set(d, (dst.offset + dst.prec-1), (size_t)1, TRUE);
else if(except_ret == H5T_CONV_ABORT)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
else if(except_ret == H5T_CONV_HANDLED) {
@@@ -9123,7 -9212,7 +9206,7 @@@
}
if(except_ret == H5T_CONV_UNHANDLED)
- H5T_bit_set(d, dst.offset, dst.prec-1, TRUE);
+ H5T__bit_set(d, dst.offset, dst.prec-1, TRUE);
else if(except_ret == H5T_CONV_ABORT)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
else if(except_ret == H5T_CONV_HANDLED) {
@@@ -9141,7 -9230,7 +9224,7 @@@
if(except_ret == H5T_CONV_UNHANDLED) {
/*copy source value into it if case is ignored by user handler*/
- H5T_bit_copy (d, dst.offset, int_buf, (size_t)0, first+1);
+ H5T__bit_copy (d, dst.offset, int_buf, (size_t)0, first+1);
} else if(except_ret == H5T_CONV_ABORT)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception")
else if(except_ret == H5T_CONV_HANDLED) {
@@@ -9159,11 -9248,11 +9242,11 @@@
*/
if (dst.offset>0) {
assert (H5T_PAD_ZERO==dst.lsb_pad || H5T_PAD_ONE==dst.lsb_pad);
- H5T_bit_set(d, (size_t)0, dst.offset, (hbool_t)(H5T_PAD_ONE==dst.lsb_pad));
+ H5T__bit_set(d, (size_t)0, dst.offset, (hbool_t)(H5T_PAD_ONE==dst.lsb_pad));
}
if (dst.offset+dst.prec!=8*dst_p->shared->size) {
assert (H5T_PAD_ZERO==dst.msb_pad || H5T_PAD_ONE==dst.msb_pad);
- H5T_bit_set(d, dst.offset+dst.prec,
+ H5T__bit_set(d, dst.offset+dst.prec,
8*dst_p->shared->size - (dst.offset+ dst.prec),
(hbool_t)(H5T_PAD_ONE==dst.msb_pad));
}
@@@ -9212,11 -9301,11 +9295,11 @@@ done
H5MM_free(src_rev);
FUNC_LEAVE_NOAPI(ret_value)
- } /* end H5T_conv_f_i() */
+ } /* end H5T__conv_f_i() */
/*-------------------------------------------------------------------------
- * Function: H5T_conv_i_f
+ * Function: H5T__conv_i_f
*
* Purpose: Convert one integer type to a floating-point type. This is
* the catch-all function for integer-float conversions and
@@@ -9240,7 -9329,7 +9323,7 @@@
*-------------------------------------------------------------------------
*/
herr_t
- H5T_conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
+ H5T__conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t dxpl_id)
{
@@@ -9276,7 -9365,7 +9359,7 @@@
hbool_t reverse; /*if reverse the order of destination */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(FAIL)
+ FUNC_ENTER_PACKAGE
switch(cdata->command) {
case H5T_CONV_INIT:
@@@ -9393,28 -9482,28 +9476,28 @@@
}
/*zero-set all destination bits*/
- H5T_bit_set (d, dst.offset, dst.prec, FALSE);
+ H5T__bit_set (d, dst.offset, dst.prec, FALSE);
/* Copy source into a temporary buffer */
- H5T_bit_copy(int_buf, (size_t)0, s, src.offset, src.prec);
+ H5T__bit_copy(int_buf, (size_t)0, s, src.offset, src.prec);
/*
* Find the sign bit value of the source.
*/
if(H5T_SGN_2 == src.u.i.sign)
- sign = (size_t)H5T_bit_get_d(int_buf, src.prec - 1, (size_t)1);
+ sign = (size_t)H5T__bit_get_d(int_buf, src.prec - 1, (size_t)1);
/*
* What is the bit position(starting from 0 as first one) for the most significant
* bit(MSB) of S which is set?
*/
if(H5T_SGN_2 == src.u.i.sign) {
- sfirst = H5T_bit_find(int_buf, (size_t)0, src.prec - 1, H5T_BIT_MSB, TRUE);
+ sfirst = H5T__bit_find(int_buf, (size_t)0, src.prec - 1, H5T_BIT_MSB, TRUE);
if(sign && sfirst < 0)
/* The case 0x80...00, which is negative with maximal value */
is_max_neg = 1;
} else if(H5T_SGN_NONE == src.u.i.sign)
- sfirst = H5T_bit_find(int_buf, (size_t)0, src.prec, H5T_BIT_MSB, TRUE);
+ sfirst = H5T__bit_find(int_buf, (size_t)0, src.prec, H5T_BIT_MSB, TRUE);
/* Handle special cases here. Integer is zero */
if(!sign && sfirst < 0)
@@@ -9426,9 -9515,9 +9509,9 @@@
if(H5T_SGN_2 == src.u.i.sign && sign) {
if(!is_max_neg) {
/* Equivalent to ~(i - 1) */
- H5T_bit_dec(int_buf, (size_t)0, buf_size * 8);
- H5T_bit_neg(int_buf, (size_t)0, buf_size * 8);
- sfirst = H5T_bit_find(int_buf, (size_t)0, src.prec - 1, H5T_BIT_MSB, TRUE);
+ H5T__bit_dec(int_buf, (size_t)0, buf_size * 8);
+ H5T__bit_neg(int_buf, (size_t)0, buf_size * 8);
+ sfirst = H5T__bit_find(int_buf, (size_t)0, src.prec - 1, H5T_BIT_MSB, TRUE);
} else {
/* If it's maximal negative number 0x80...000, treat it as if it overflowed
* (create a carry) to help conversion. i.e. a character type number 0x80
@@@ -9443,10 -9532,10 +9526,10 @@@
/* Sign bit has been negated if bit vector isn't 0x80...00. Set all bits in front of
* sign bit to 0 in the temporary buffer because they're all negated from the previous
* step. */
- H5T_bit_set(int_buf, src.prec, (buf_size * 8) - src.prec, 0);
+ H5T__bit_set(int_buf, src.prec, (buf_size * 8) - src.prec, 0);
/* Set sign bit in destination */
- H5T_bit_set_d(d, dst.u.f.sign, (size_t)1, (hsize_t)sign);
+ H5T__bit_set_d(d, dst.u.f.sign, (size_t)1, (hsize_t)sign);
} /* end if */
first = (size_t)sfirst;
@@@ -9466,7 -9555,7 +9549,7 @@@
/* Handle mantissa part here */
if (H5T_NORM_IMPLIED==dst.u.f.norm) {
/* Imply first bit */
- H5T_bit_set(int_buf, first, (size_t)1, 0);
+ H5T__bit_set(int_buf, first, (size_t)1, 0);
} else if (H5T_NORM_NONE==dst.u.f.norm) {
first++;
}
@@@ -9495,28 -9584,28 +9578,28 @@@
*/
/* Check 1st dropoff bit, see if it's set. */
- if(H5T_bit_get_d(int_buf, ((first - dst.u.f.msize) - 1), (size_t)1)) {
+ if(H5T__bit_get_d(int_buf, ((first - dst.u.f.msize) - 1), (size_t)1)) {
/* Check all bits after 1st dropoff bit, see if any of them is set. */
- if(((first - dst.u.f.msize) - 1) > 0 && H5T_bit_get_d(int_buf, (size_t)0, ((first - dst.u.f.msize) - 1)))
+ if(((first - dst.u.f.msize) - 1) > 0 && H5T__bit_get_d(int_buf, (size_t)0, ((first - dst.u.f.msize) - 1)))
do_round = 1;
else { /* The .50...0 case */
/* Check if the least significant bit is odd. */
- if(H5T_bit_get_d(int_buf, (first - dst.u.f.msize), (size_t)1))
+ if(H5T__bit_get_d(int_buf, (first - dst.u.f.msize), (size_t)1))
do_round = 1;
}
}
/* Right shift to drop off extra bits */
- H5T_bit_shift(int_buf, (ssize_t)(dst.u.f.msize - first), (size_t)0, buf_size * 8);
+ H5T__bit_shift(int_buf, (ssize_t)(dst.u.f.msize - first), (size_t)0, buf_size * 8);
if(do_round) {
- H5T_bit_inc(int_buf, (size_t)0, buf_size * 8);
+ H5T__bit_inc(int_buf, (size_t)0, buf_size * 8);
do_round = 0;
/* If integer is like 0x0ff...fff and we need to round up the
* last f, we get 0x100...000. Treat this special case here.
*/
- if(H5T_bit_get_d(int_buf, dst.u.f.msize, (size_t)1)) {
+ if(H5T__bit_get_d(int_buf, dst.u.f.msize, (size_t)1)) {
if (H5T_NORM_IMPLIED==dst.u.f.norm) {
/* The bit at this 1's position was impled already, so this
* number should be 0x200...000. We need to increment the
@@@ -9527,7 -9616,7 +9610,7 @@@
/* Right shift 1 bit to let the carried 1 fit in the mantissa,
* and increment exponent by 1.
*/
- H5T_bit_shift(int_buf, (ssize_t)-1, (size_t)0, buf_size * 8);
+ H5T__bit_shift(int_buf, (ssize_t)-1, (size_t)0, buf_size * 8);
expo++;
}
}
@@@ -9535,7 -9624,7 +9618,7 @@@
} else {
/* The bit sequence can fit mantissa part. Left shift to fit in from high-order of
* bit position. */
- H5T_bit_shift(int_buf, (ssize_t)(dst.u.f.msize - first), (size_t)0, dst.u.f.msize);
+ H5T__bit_shift(int_buf, (ssize_t)(dst.u.f.msize - first), (size_t)0, dst.u.f.msize);
}
@@@ -9564,10 -9653,10 +9647,10 @@@
if(except_ret == H5T_CONV_UNHANDLED) {
/* Set exponent in destination */
- H5T_bit_set_d(d, dst.u.f.epos, dst.u.f.esize, expo);
+ H5T__bit_set_d(d, dst.u.f.epos, dst.u.f.esize, expo);
/* Copy mantissa into destination */
- H5T_bit_copy(d, dst.u.f.mpos, int_buf, (size_t)0, (buf_size * 8) > dst.u.f.msize ? dst.u.f.msize : buf_size * 8);
+ H5T__bit_copy(d, dst.u.f.mpos, int_buf, (size_t)0, (buf_size * 8) > dst.u.f.msize ? dst.u.f.msize : buf_size * 8);
}
padding:
@@@ -9576,11 -9665,11 +9659,11 @@@
*/
if(dst.offset > 0) {
HDassert(H5T_PAD_ZERO == dst.lsb_pad || H5T_PAD_ONE == dst.lsb_pad);
- H5T_bit_set(d, (size_t)0, dst.offset, (hbool_t)(H5T_PAD_ONE==dst.lsb_pad));
+ H5T__bit_set(d, (size_t)0, dst.offset, (hbool_t)(H5T_PAD_ONE==dst.lsb_pad));
}
if(dst.offset + dst.prec != 8 * dst_p->shared->size) {
HDassert(H5T_PAD_ZERO == dst.msb_pad || H5T_PAD_ONE == dst.msb_pad);
- H5T_bit_set(d, dst.offset + dst.prec,
+ H5T__bit_set(d, dst.offset + dst.prec,
8 * dst_p->shared->size - (dst.offset + dst.prec),
(hbool_t)(H5T_PAD_ONE == dst.msb_pad));
}
@@@ -9642,7 -9731,7 +9725,7 @@@ done
H5MM_free(src_rev);
FUNC_LEAVE_NOAPI(ret_value)
- } /* end H5T_conv_i_f() */
+ } /* end H5T__conv_i_f() */
/*-------------------------------------------------------------------------
diff --combined src/H5public.h
index 4ac9aa5,b022ca7..3f0624c
--- a/src/H5public.h
+++ b/src/H5public.h
@@@ -59,6 -59,9 +59,6 @@@
#endif
#ifdef H5_HAVE_PARALLEL
# include <mpi.h>
-#ifndef MPI_FILE_NULL /*MPIO may be defined in mpi.h already */
-# include <mpio.h>
-#endif
#endif
@@@ -72,10 -75,10 +72,10 @@@ extern "C"
/* Version numbers */
#define H5_VERS_MAJOR 1 /* For major interface/format changes */
#define H5_VERS_MINOR 8 /* For minor interface/format changes */
- #define H5_VERS_RELEASE 9 /* For tweaks, bug-fixes, or development */
+ #define H5_VERS_RELEASE 11 /* For tweaks, bug-fixes, or development */
#define H5_VERS_SUBRELEASE "" /* For pre-releases like snap0 */
/* Empty string for real releases. */
- #define H5_VERS_INFO "HDF5 library version: 1.8.9" /* Full version string */
+ #define H5_VERS_INFO "HDF5 library version: 1.8.11" /* Full version string */
#define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \
H5_VERS_RELEASE)
diff --combined testpar/t_cache.c
index fb3b6b4,234df01..6a4893a
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@@ -35,10 -35,6 +35,10 @@@
#include "H5Fpkg.h"
+#ifndef PATH_MAX
+#define PATH_MAX 512
+#endif /* !PATH_MAX */
+
int nerrors = 0;
int failures = 0;
@@@ -4219,125 -4215,6 +4219,6 @@@ verify_writes(int num_writes
/*****************************************************************************
*
- * Function: setup_noblock_dxpl_id()
- *
- * Purpose: Setup the noblock_dxpl_id global. Increment nerrors if
- * errors are detected. Do nothing if nerrors is non-zero
- * on entry.
- *
- * Return: void.
- *
- * Programmer: JRM -- 1/5/06
- *
- * Modifications:
- *
- * None.
- *
- *****************************************************************************/
- /* So far we haven't needed this, but that may change.
- * Keep it around for now
- */
- #if 0
- void
- setup_noblock_dxpl_id(void)
- {
- const char * fcn_name = "setup_noblock_dxpl_id()";
- H5P_genclass_t *xfer_pclass; /* Dataset transfer property list
- * class object
- */
- H5P_genplist_t *xfer_plist; /* Dataset transfer property list object */
- unsigned block_before_meta_write; /* "block before meta write"
- * property value
- */
- unsigned library_internal = 1; /* "library internal" property value */
- H5FD_mpio_xfer_t xfer_mode; /* I/O transfer mode property value */
-
- /* Sanity check */
- HDassert(H5P_CLS_DATASET_XFER_g!=(-1));
-
- /* Get the dataset transfer property list class object */
- if ( ( nerrors == 0 ) &&
- ( NULL == (xfer_pclass = H5I_object(H5P_CLS_DATASET_XFER_g)) ) ) {
-
- nerrors++;
- if ( verbose ) {
- HDfprintf(stdout, "%d:%s: can't get property list class.\n",
- world_mpi_rank, fcn_name);
- }
- }
-
- /* Get an ID for the non-blocking, collective H5AC dxpl */
- if ( ( nerrors == 0 ) &&
- ( (noblock_dxpl_id = H5P_create_id(xfer_pclass)) < 0 ) ) {
-
- nerrors++;
- if ( verbose ) {
- HDfprintf(stdout, "%d:%s: can't register property list.\n",
- world_mpi_rank, fcn_name);
- }
- }
-
- /* Get the property list object */
- if ( ( nerrors == 0 ) &&
- ( NULL == (xfer_plist = H5I_object(H5AC_noblock_dxpl_id)) ) ) {
-
- nerrors++;
- if ( verbose ) {
- HDfprintf(stdout, "%d:%s: can't get new property list object.\n",
- world_mpi_rank, fcn_name);
- }
- }
-
- /* Insert 'block before metadata write' property */
- block_before_meta_write=0;
- if ( ( nerrors == 0 ) &&
- ( H5P_insert(xfer_plist, H5AC_BLOCK_BEFORE_META_WRITE_NAME,
- H5AC_BLOCK_BEFORE_META_WRITE_SIZE,
- &block_before_meta_write,
- NULL, NULL, NULL, NULL, NULL, NULL) < 0 ) ) {
-
- nerrors++;
- if ( verbose ) {
- HDfprintf(stdout,
- "%d:%s: can't insert metadata cache dxpl property 1.\n",
- world_mpi_rank, fcn_name);
- }
- }
-
- /* Insert 'library internal' property */
- if ( ( nerrors == 0 ) &&
- ( H5P_insert(xfer_plist, H5AC_LIBRARY_INTERNAL_NAME,
- H5AC_LIBRARY_INTERNAL_SIZE, &library_internal,
- NULL, NULL, NULL, NULL, NULL, NULL ) < 0 ) ) {
-
- nerrors++;
- if ( verbose ) {
- HDfprintf(stdout,
- "%d:%s: can't insert metadata cache dxpl property 2.\n",
- world_mpi_rank, fcn_name);
- }
- }
-
- /* Set the transfer mode */
- xfer_mode = H5FD_MPIO_COLLECTIVE;
- if ( ( nerrors == 0 ) &&
- ( H5P_set(xfer_plist, H5D_XFER_IO_XFER_MODE_NAME, &xfer_mode) < 0 ) ) {
-
- nerrors++;
- if ( verbose ) {
- HDfprintf(stdout, "%d:%s: unable to set value.\n", world_mpi_rank,
- fcn_name);
- }
- }
-
- return(success);
-
- } /* setup_noblock_dxpl_id() */
- #endif
-
-
- /*****************************************************************************
- *
* Function: setup_rand()
*
* Purpose: Use gettimeofday() to obtain a seed for rand(), print the
--
Hierarchical Data Format 5 (HDF5)
More information about the Pkg-grass-devel
mailing list