diff options
108 files changed, 659 insertions, 239 deletions
@@ -846,7 +846,7 @@ ./test/earray.c ./test/efc.c ./test/enc_dec_plist.c -./test/enc_dec_plist_with_endianess.c +./test/enc_dec_plist_cross_platform.c ./test/enum.c ./test/extend.c ./test/external.c @@ -1009,30 +1009,102 @@ ./test/testfiles/error_test_1 ./test/testfiles/error_test_2 ./test/testfiles/links_env.out -./test/testfiles/plist_files/acpl_be -./test/testfiles/plist_files/acpl_le -./test/testfiles/plist_files/dapl_be -./test/testfiles/plist_files/dapl_le -./test/testfiles/plist_files/dcpl_be -./test/testfiles/plist_files/dcpl_le -./test/testfiles/plist_files/dxpl_be -./test/testfiles/plist_files/dxpl_le -./test/testfiles/plist_files/fapl_be -./test/testfiles/plist_files/fapl_le -./test/testfiles/plist_files/fcpl_be -./test/testfiles/plist_files/fcpl_le -./test/testfiles/plist_files/gcpl_be -./test/testfiles/plist_files/gcpl_le -./test/testfiles/plist_files/lapl_be -./test/testfiles/plist_files/lapl_le -./test/testfiles/plist_files/lcpl_be -./test/testfiles/plist_files/lcpl_le -./test/testfiles/plist_files/ocpl_be -./test/testfiles/plist_files/ocpl_le -./test/testfiles/plist_files/ocpypl_be -./test/testfiles/plist_files/ocpypl_le -./test/testfiles/plist_files/strcpl_be -./test/testfiles/plist_files/strcpl_le +./test/testfiles/plist_files/acpl_32be +./test/testfiles/plist_files/acpl_32le +./test/testfiles/plist_files/acpl_64be +./test/testfiles/plist_files/acpl_64le +./test/testfiles/plist_files/dapl_32be +./test/testfiles/plist_files/dapl_32le +./test/testfiles/plist_files/dapl_64be +./test/testfiles/plist_files/dapl_64le +./test/testfiles/plist_files/dcpl_32be +./test/testfiles/plist_files/dcpl_32le +./test/testfiles/plist_files/dcpl_64be +./test/testfiles/plist_files/dcpl_64le +./test/testfiles/plist_files/def_acpl_32be +./test/testfiles/plist_files/def_acpl_32le +./test/testfiles/plist_files/def_acpl_64be +./test/testfiles/plist_files/def_acpl_64le +./test/testfiles/plist_files/def_dapl_32be +./test/testfiles/plist_files/def_dapl_32le +./test/testfiles/plist_files/def_dapl_64be +./test/testfiles/plist_files/def_dapl_64le +./test/testfiles/plist_files/def_dcpl_32be +./test/testfiles/plist_files/def_dcpl_32le +./test/testfiles/plist_files/def_dcpl_64be +./test/testfiles/plist_files/def_dcpl_64le +./test/testfiles/plist_files/def_dxpl_32be +./test/testfiles/plist_files/def_dxpl_32le +./test/testfiles/plist_files/def_dxpl_64be +./test/testfiles/plist_files/def_dxpl_64le +./test/testfiles/plist_files/def_fapl_32be +./test/testfiles/plist_files/def_fapl_32le +./test/testfiles/plist_files/def_fapl_64be +./test/testfiles/plist_files/def_fapl_64le +./test/testfiles/plist_files/def_fcpl_32be +./test/testfiles/plist_files/def_fcpl_32le +./test/testfiles/plist_files/def_fcpl_64be +./test/testfiles/plist_files/def_fcpl_64le +./test/testfiles/plist_files/def_gcpl_32be +./test/testfiles/plist_files/def_gcpl_32le +./test/testfiles/plist_files/def_gcpl_64be +./test/testfiles/plist_files/def_gcpl_64le +./test/testfiles/plist_files/def_lapl_32be +./test/testfiles/plist_files/def_lapl_32le +./test/testfiles/plist_files/def_lapl_64be +./test/testfiles/plist_files/def_lapl_64le +./test/testfiles/plist_files/def_lcpl_32be +./test/testfiles/plist_files/def_lcpl_32le +./test/testfiles/plist_files/def_lcpl_64be +./test/testfiles/plist_files/def_lcpl_64le +./test/testfiles/plist_files/def_ocpl_32be +./test/testfiles/plist_files/def_ocpl_32le +./test/testfiles/plist_files/def_ocpl_64be +./test/testfiles/plist_files/def_ocpl_64le +./test/testfiles/plist_files/def_ocpypl_32be +./test/testfiles/plist_files/def_ocpypl_32le +./test/testfiles/plist_files/def_ocpypl_64be +./test/testfiles/plist_files/def_ocpypl_64le +./test/testfiles/plist_files/def_strcpl_32be +./test/testfiles/plist_files/def_strcpl_32le +./test/testfiles/plist_files/def_strcpl_64be +./test/testfiles/plist_files/def_strcpl_64le +./test/testfiles/plist_files/dxpl_32be +./test/testfiles/plist_files/dxpl_32le +./test/testfiles/plist_files/dxpl_64be +./test/testfiles/plist_files/dxpl_64le +./test/testfiles/plist_files/fapl_32be +./test/testfiles/plist_files/fapl_32le +./test/testfiles/plist_files/fapl_64be +./test/testfiles/plist_files/fapl_64le +./test/testfiles/plist_files/fcpl_32be +./test/testfiles/plist_files/fcpl_32le +./test/testfiles/plist_files/fcpl_64be +./test/testfiles/plist_files/fcpl_64le +./test/testfiles/plist_files/gcpl_32be +./test/testfiles/plist_files/gcpl_32le +./test/testfiles/plist_files/gcpl_64be +./test/testfiles/plist_files/gcpl_64le +./test/testfiles/plist_files/lapl_32be +./test/testfiles/plist_files/lapl_32le +./test/testfiles/plist_files/lapl_64be +./test/testfiles/plist_files/lapl_64le +./test/testfiles/plist_files/lcpl_32be +./test/testfiles/plist_files/lcpl_32le +./test/testfiles/plist_files/lcpl_64be +./test/testfiles/plist_files/lcpl_64le +./test/testfiles/plist_files/ocpl_32be +./test/testfiles/plist_files/ocpl_32le +./test/testfiles/plist_files/ocpl_64be +./test/testfiles/plist_files/ocpl_64le +./test/testfiles/plist_files/ocpypl_32be +./test/testfiles/plist_files/ocpypl_32le +./test/testfiles/plist_files/ocpypl_64be +./test/testfiles/plist_files/ocpypl_64le +./test/testfiles/plist_files/strcpl_32be +./test/testfiles/plist_files/strcpl_32le +./test/testfiles/plist_files/strcpl_64be +./test/testfiles/plist_files/strcpl_64le ./testpar/COPYING ./testpar/Makefile.am diff --git a/src/H5Dint.c b/src/H5Dint.c index de71be8..d74144b 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -1449,12 +1449,6 @@ done: static herr_t H5D__append_flush_setup(H5D_t *dset, hid_t dapl_id) { - H5P_genplist_t *dapl; /* data access property list object pointer */ - hsize_t curr_dims[H5S_MAX_RANK]; /* current dimension sizes */ - hsize_t max_dims[H5S_MAX_RANK]; /* current dimension sizes */ - int rank; /* dataspace # of dimensions */ - int i; /* local index variable */ - H5D_append_flush_t info; herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_NOAPI(FAIL) @@ -1463,49 +1457,57 @@ H5D__append_flush_setup(H5D_t *dset, hid_t dapl_id) HDassert(dset); HDassert(dset->shared); + /* Set default append flush values */ dset->shared->append_flush.ndims = 0; dset->shared->append_flush.func = NULL; dset->shared->append_flush.udata = NULL; HDmemset(dset->shared->append_flush.boundary, 0, sizeof(dset->shared->append_flush.boundary)); if(dapl_id != H5P_DATASET_ACCESS_DEFAULT && dset->shared->layout.type == H5D_CHUNKED) { + H5P_genplist_t *dapl; /* data access property list object pointer */ + /* Get dataset access property list */ if(NULL == (dapl = (H5P_genplist_t *)H5I_object(dapl_id))) HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for dapl ID"); /* Check if append flush property exists */ if(H5P_exist_plist(dapl, H5D_ACS_APPEND_FLUSH_NAME) > 0) { + H5D_append_flush_t info; /* Get append flush property */ if(H5P_get(dapl, H5D_ACS_APPEND_FLUSH_NAME, &info) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get append flush info") else if(info.ndims > 0) { + hsize_t curr_dims[H5S_MAX_RANK]; /* current dimension sizes */ + hsize_t max_dims[H5S_MAX_RANK]; /* current dimension sizes */ + int rank; /* dataspace # of dimensions */ + unsigned u; /* local index variable */ /* Get dataset rank */ if((rank = H5S_get_simple_extent_dims(dset->shared->space, curr_dims, max_dims)) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get dataset dimensions") - if(info.ndims != rank) + if(info.ndims != (unsigned)rank) HGOTO_ERROR(H5E_DATASET, H5E_BADVALUE, FAIL, "boundary dimension rank does not match dataset rank") /* Validate boundary sizes */ - for(i = 0; i < info.ndims; i++) { - if(info.boundary[i] != 0) /* when a non-zero boundary is set */ + for(u = 0; u < info.ndims; u++) { + if(info.boundary[u] != 0) /* when a non-zero boundary is set */ /* the dimension is extendible? */ - if(max_dims[i] != H5S_UNLIMITED && max_dims[i] == curr_dims[i]) + if(max_dims[u] != H5S_UNLIMITED && max_dims[u] == curr_dims[u]) break; - } + } /* end for */ - if(i != info.ndims) /* at least one boundary dimension is not extendible */ + if(u != info.ndims) /* at least one boundary dimension is not extendible */ HGOTO_ERROR(H5E_DATASET, H5E_BADVALUE, FAIL, "boundary dimension is not valid") dset->shared->append_flush.ndims = info.ndims; dset->shared->append_flush.func = info.func; dset->shared->append_flush.udata = info.udata; HDmemcpy(dset->shared->append_flush.boundary, info.boundary, sizeof(info.boundary)); - } - } - } + } /* end else-if */ + } /* end if */ + } /* end if */ done: FUNC_LEAVE_NOAPI(ret_value) diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h index 9fe3e1b..7d1fe66 100644 --- a/src/H5Dprivate.h +++ b/src/H5Dprivate.h @@ -149,7 +149,7 @@ typedef struct H5D_copy_file_ud_t { /* Structure for dataset append flush property (H5Pset_append_flush) */ typedef struct H5D_append_flush_t { - int ndims; /* The # of dimensions for "boundary" */ + unsigned ndims; /* The # of dimensions for "boundary" */ hsize_t boundary[H5S_MAX_RANK]; /* The dimension sizes for determining boundary */ H5D_append_cb_t func; /* The callback function */ void *udata; /* User data */ diff --git a/src/H5Pdapl.c b/src/H5Pdapl.c index 19c6f2d..fe68c11 100644 --- a/src/H5Pdapl.c +++ b/src/H5Pdapl.c @@ -49,13 +49,13 @@ /* Definitions for size of raw data chunk cache(slots) */ #define H5D_ACS_DATA_CACHE_NUM_SLOTS_SIZE sizeof(size_t) #define H5D_ACS_DATA_CACHE_NUM_SLOTS_DEF H5D_CHUNK_CACHE_NSLOTS_DEFAULT -#define H5D_ACS_DATA_CACHE_NUM_SLOTS_ENC H5P__encode_size_t -#define H5D_ACS_DATA_CACHE_NUM_SLOTS_DEC H5P__decode_size_t +#define H5D_ACS_DATA_CACHE_NUM_SLOTS_ENC H5P__encode_chunk_cache_nslots +#define H5D_ACS_DATA_CACHE_NUM_SLOTS_DEC H5P__decode_chunk_cache_nslots /* Definition for size of raw data chunk cache(bytes) */ #define H5D_ACS_DATA_CACHE_BYTE_SIZE_SIZE sizeof(size_t) #define H5D_ACS_DATA_CACHE_BYTE_SIZE_DEF H5D_CHUNK_CACHE_NBYTES_DEFAULT -#define H5D_ACS_DATA_CACHE_BYTE_SIZE_ENC H5P__encode_size_t -#define H5D_ACS_DATA_CACHE_BYTE_SIZE_DEC H5P__decode_size_t +#define H5D_ACS_DATA_CACHE_BYTE_SIZE_ENC H5P__encode_chunk_cache_nbytes +#define H5D_ACS_DATA_CACHE_BYTE_SIZE_DEC H5P__decode_chunk_cache_nbytes /* Definition for preemption read chunks first */ #define H5D_ACS_PREEMPT_READ_CHUNKS_SIZE sizeof(double) #define H5D_ACS_PREEMPT_READ_CHUNKS_DEF H5D_CHUNK_CACHE_W0_DEFAULT @@ -83,6 +83,12 @@ /* Property class callbacks */ static herr_t H5P__dacc_reg_prop(H5P_genclass_t *pclass); +static herr_t H5P__encode_chunk_cache_nslots(const void *value, void **_pp, + size_t *size); +static herr_t H5P__decode_chunk_cache_nslots(const void **_pp, void *_value); +static herr_t H5P__encode_chunk_cache_nbytes(const void *value, void **_pp, + size_t *size); +static herr_t H5P__decode_chunk_cache_nbytes(const void **_pp, void *_value); /*********************/ @@ -295,6 +301,226 @@ done: /*------------------------------------------------------------------------- + * Function: H5P__encode_chunk_cache_nslots + * + * Purpose: Encode the rdcc_nslots parameter to a serialized + * property list. Similar to H5P__encode_size_t except + * the value of 255 for the enc_size field is reserved to + * indicate H5D_ACS_DATA_CACHE_NUM_SLOTS_DEF, in which + * nothing further is encoded. + * + * Return: Success: Non-negative + * Failure: Negative + * + * Programmer: Neil Fortner + * Wednesday, January 23, 2013 + * + *------------------------------------------------------------------------- + */ +static herr_t +H5P__encode_chunk_cache_nslots(const void *value, void **_pp, size_t *size) +{ + uint64_t enc_value; /* Property value to encode */ + uint8_t **pp = (uint8_t **)_pp; + unsigned enc_size; /* Size of encoded property */ + + FUNC_ENTER_PACKAGE_NOERR + + /* Sanity checks */ + HDcompile_assert(sizeof(size_t) <= sizeof(uint64_t)); + HDassert(size); + + /* Determine if this is the default value, in which case only encode + * enc_size (as 255). Also set size needed for encoding. */ + if(*(const size_t *)value == H5D_ACS_DATA_CACHE_NUM_SLOTS_DEF) { + enc_size = 0; + *size += 1; + } /* end if */ + else { + enc_value = (uint64_t)*(const size_t *)value; + enc_size = H5VM_limit_enc_size(enc_value); + HDassert(enc_size > 0); + *size += (1 + enc_size); + } /* end else */ + + HDassert(enc_size < 256); + + if(NULL != *pp) { + /* Encode the size */ + *(*pp)++ = (uint8_t)enc_size; + + /* Encode the value if necessary */ + if(enc_size != 0) { + UINT64ENCODE_VAR(*pp, enc_value, enc_size); + } /* end if */ + } /* end if */ + + FUNC_LEAVE_NOAPI(SUCCEED) +} /* end H5P__encode_chunk_cache_nslots() */ + + +/*------------------------------------------------------------------------- + * Function: H5P__decode_chunk_cache_nslots + * + * Purpose: Decode the rdcc_nslots parameter from a serialized + * property list. Similar to H5P__decode_size_t except + * the value of 255 for the enc_size field is reserved to + * indicate H5D_ACS_DATA_CACHE_NUM_SLOTS_DEF, in which + * nothing further needs to be decoded. + * + * Return: Success: Non-negative + * Failure: Negative + * + * Programmer: Neil Fortner + * Wednesday, January 23, 2013 + * + *------------------------------------------------------------------------- + */ +static herr_t +H5P__decode_chunk_cache_nslots(const void **_pp, void *_value) +{ + size_t *value = (size_t *)_value; /* Property value to return */ + const uint8_t **pp = (const uint8_t **)_pp; + uint64_t enc_value; /* Decoded property value */ + unsigned enc_size; /* Size of encoded property */ + + FUNC_ENTER_PACKAGE_NOERR + + /* Sanity check */ + HDcompile_assert(sizeof(size_t) <= sizeof(uint64_t)); + HDassert(pp); + HDassert(*pp); + HDassert(value); + + /* Decode the size */ + enc_size = *(*pp)++; + HDassert(enc_size < 256); + + /* Determine if enc_size indicates that this is the default value, in which + * case set value to H5D_ACS_DATA_CACHE_NUM_SLOTS_DEF and return */ + if(enc_size == 0) + *value = H5D_ACS_DATA_CACHE_NUM_SLOTS_DEF; + else { + /* Decode the value */ + UINT64DECODE_VAR(*pp, enc_value, enc_size); + H5_CHECKED_ASSIGN(*value, uint64_t, enc_value, size_t); + } /* end else */ + + FUNC_LEAVE_NOAPI(SUCCEED) +} /* end H5P__decode_chunk_cache_nslots() */ + + +/*------------------------------------------------------------------------- + * Function: H5P__encode_chunk_cache_nbytes + * + * Purpose: Encode the rdcc_nbytes parameter to a serialized + * property list. Similar to H5P__encode_size_t except + * the value of 255 for the enc_size field is reserved to + * indicate H5D_ACS_DATA_CACHE_BYTE_SIZE_DEF, in which + * nothing further is encoded. + * + * Return: Success: Non-negative + * Failure: Negative + * + * Programmer: Neil Fortner + * Wednesday, January 23, 2013 + * + *------------------------------------------------------------------------- + */ +static herr_t +H5P__encode_chunk_cache_nbytes(const void *value, void **_pp, size_t *size) +{ + uint64_t enc_value; /* Property value to encode */ + uint8_t **pp = (uint8_t **)_pp; + unsigned enc_size; /* Size of encoded property */ + + FUNC_ENTER_PACKAGE_NOERR + + /* Sanity checks */ + HDcompile_assert(sizeof(size_t) <= sizeof(uint64_t)); + HDassert(size); + + /* Determine if this is the default value, in which case only encode + * enc_size (as 255). Also set size needed for encoding. */ + if(*(const size_t *)value == H5D_ACS_DATA_CACHE_BYTE_SIZE_DEF) { + enc_size = 0; + *size += 1; + } /* end if */ + else { + enc_value = (uint64_t)*(const size_t *)value; + enc_size = H5VM_limit_enc_size(enc_value); + HDassert(enc_size > 0); + *size += (1 + enc_size); + } /* end else */ + + HDassert(enc_size < 256); + + if(NULL != *pp) { + /* Encode the size */ + *(*pp)++ = (uint8_t)enc_size; + + /* Encode the value if necessary */ + if(enc_size != 0) { + UINT64ENCODE_VAR(*pp, enc_value, enc_size); + } /* end if */ + } /* end if */ + + FUNC_LEAVE_NOAPI(SUCCEED) +} /* end H5P__encode_chunk_cache_nbytes() */ + + +/*------------------------------------------------------------------------- + * Function: H5P__decode_chunk_cache_nbytes + * + * Purpose: Decode the rdcc_nbytes parameter from a serialized + * property list. Similar to H5P__decode_size_t except + * the value of 255 for the enc_size field is reserved to + * indicate H5D_ACS_DATA_CACHE_BYTE_SIZE_DEF, in which + * nothing further needs to be decoded. + * + * Return: Success: Non-negative + * Failure: Negative + * + * Programmer: Neil Fortner + * Wednesday, January 23, 2013 + * + *------------------------------------------------------------------------- + */ +static herr_t +H5P__decode_chunk_cache_nbytes(const void **_pp, void *_value) +{ + size_t *value = (size_t *)_value; /* Property value to return */ + const uint8_t **pp = (const uint8_t **)_pp; + uint64_t enc_value; /* Decoded property value */ + unsigned enc_size; /* Size of encoded property */ + + FUNC_ENTER_PACKAGE_NOERR + + /* Sanity check */ + HDcompile_assert(sizeof(size_t) <= sizeof(uint64_t)); + HDassert(pp); + HDassert(*pp); + HDassert(value); + + /* Decode the size */ + enc_size = *(*pp)++; + HDassert(enc_size < 256); + + /* Determine if enc_size indicates that this is the default value, in which + * case set value to H5D_ACS_DATA_CACHE_BYTE_SIZE_DEF and return */ + if(enc_size == 0) + *value = H5D_ACS_DATA_CACHE_BYTE_SIZE_DEF; + else { + /* Decode the value */ + UINT64DECODE_VAR(*pp, enc_value, enc_size); + H5_CHECKED_ASSIGN(*value, uint64_t, enc_value, size_t); + } /* end else */ + + FUNC_LEAVE_NOAPI(SUCCEED) +} /* end H5P__decode_chunk_cache_nbytes() */ + + +/*------------------------------------------------------------------------- * Function: H5Pset_append_flush * * Purpose: Sets the boundary, callback function, and user data in the @@ -313,7 +539,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Pset_append_flush(hid_t plist_id, int ndims, const hsize_t *boundary, H5D_append_cb_t func, void *udata) +H5Pset_append_flush(hid_t plist_id, unsigned ndims, const hsize_t *boundary, H5D_append_cb_t func, void *udata) { H5P_genplist_t *plist; /* property list pointer */ H5D_append_flush_t info; @@ -321,7 +547,7 @@ H5Pset_append_flush(hid_t plist_id, int ndims, const hsize_t *boundary, H5D_appe herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "iIs*hx*x", plist_id, ndims, boundary, func, udata); + H5TRACE5("e", "iIu*hx*x", plist_id, ndims, boundary, func, udata); /* Check arguments */ if(ndims <= 0) @@ -347,11 +573,11 @@ H5Pset_append_flush(hid_t plist_id, int ndims, const hsize_t *boundary, H5D_appe HDmemset(info.boundary, 0, sizeof(info.boundary)); /* boundary can be 0 to indicate no boundary is set */ - for(u = 0; u < (unsigned)ndims; u++) { + for(u = 0; u < ndims; u++) { if(boundary[u] != (boundary[u] & 0xffffffff)) /* negative value (including H5S_UNLIMITED) */ HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "all boundary dimensions must be less than 2^32") info.boundary[u] = boundary[u]; /* Store user's boundary dimensions */ - } + } /* end for */ /* Set values */ if(H5P_set(plist, H5D_ACS_APPEND_FLUSH_NAME, &info) < 0) @@ -378,15 +604,15 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Pget_append_flush(hid_t plist_id, int ndims, hsize_t boundary[], H5D_append_cb_t *func, void **udata) +H5Pget_append_flush(hid_t plist_id, unsigned ndims, hsize_t boundary[], H5D_append_cb_t *func, void **udata) { H5P_genplist_t *plist; /* property list pointer */ H5D_append_flush_t info; - int i; /* local index variable */ + unsigned u; /* local index variable */ herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "iIs*h*x**x", plist_id, ndims, boundary, func, udata); + H5TRACE5("e", "iIu*h*x**x", plist_id, ndims, boundary, func, udata); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_ACCESS))) @@ -399,11 +625,10 @@ H5Pget_append_flush(hid_t plist_id, int ndims, hsize_t boundary[], H5D_append_cb /* Assign return values */ if(boundary) { HDmemset(boundary, 0, ndims * sizeof(hsize_t)); - if(info.ndims > 0) { - for(i = 0; i < info.ndims && i < ndims; i++) - boundary[i] = info.boundary[i]; - } - } + if(info.ndims > 0) + for(u = 0; u < info.ndims && u < ndims; u++) + boundary[u] = info.boundary[u]; + } /* end if */ if(func) *func = info.func; if(udata) @@ -412,3 +637,4 @@ H5Pget_append_flush(hid_t plist_id, int ndims, hsize_t boundary[], H5D_append_cb done: FUNC_LEAVE_API(ret_value) } /* H5Pget_append_flush() */ + diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c index eb1953a..3e87c33 100644 --- a/src/H5Pdcpl.c +++ b/src/H5Pdcpl.c @@ -640,7 +640,7 @@ H5P__fill_value_enc(const void *value, void **_pp, size_t *size) herr_t ret_value = SUCCEED; /* Return value */ uint8_t **pp = (uint8_t **)_pp; uint64_t enc_value; - unsigned enc_size; + unsigned enc_size = 0; FUNC_ENTER_STATIC diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h index 69de7ce..3606207 100644 --- a/src/H5Ppublic.h +++ b/src/H5Ppublic.h @@ -392,9 +392,9 @@ H5_DLL herr_t H5Pget_chunk_cache(hid_t dapl_id, size_t *rdcc_nbytes/*out*/, double *rdcc_w0/*out*/); H5_DLL herr_t H5Pset_append_flush(hid_t plist_id, - int ndims, const hsize_t boundary[], H5D_append_cb_t func, void *udata); + unsigned ndims, const hsize_t boundary[], H5D_append_cb_t func, void *udata); H5_DLL herr_t H5Pget_append_flush(hid_t plist_id, - int dims, hsize_t boundary[], H5D_append_cb_t *func, void **udata); + unsigned dims, hsize_t boundary[], H5D_append_cb_t *func, void **udata); /* Dataset xfer property list (DXPL) routines */ H5_DLL herr_t H5Pset_data_transform(hid_t plist_id, const char* expression); diff --git a/test/Makefile.am b/test/Makefile.am index dedb4a1..5763133 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -56,7 +56,7 @@ TEST_PROG= testhdf5 lheap ohdr stab gheap cache cache_api cache_tagging \ pool accum hyperslab istore bittests dt_arith \ dtypes dsets cmpd_dset filter_fail extend external efc objcopy links unlink \ twriteorder big mtime fillval mount flush1 flush2 app_ref enum \ - set_extent ttsafe enc_dec_plist enc_dec_plist_with_endianess\ + set_extent ttsafe enc_dec_plist enc_dec_plist_cross_platform\ getname vfd ntypes dangle dtransform reserved cross_read \ freespace mf farray earray btree2 fheap file_image unregister \ cache_logging cork swmr diff --git a/test/enc_dec_plist_cross_platform.c b/test/enc_dec_plist_cross_platform.c new file mode 100644 index 0000000..a5d5552 --- /dev/null +++ b/test/enc_dec_plist_cross_platform.c @@ -0,0 +1,235 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * + * Copyright by the Board of Trustees of the University of Illinois. * + * All rights reserved. * + * * + * This file is part of HDF5. The full HDF5 copyright notice, including * + * terms governing use, modification, and redistribution, is contained in * + * the files COPYING and Copyright.html. COPYING can be found at the root * + * of the source code distribution tree; Copyright.html can be found at the * + * root level of an installed copy of the electronic HDF5 document set and * + * is linked from the top-level documents page. It can also be found at * + * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +/* + * Serial tests for encoding/decoding plists + */ + +#include "h5test.h" +#include "H5srcdir.h" + +#define CONFIG_LE 0x01 +#define CONFIG_64 0x02 +#define NCONFIG 0x04 + +static int test_plists(const char *filename_prefix); + +int +main(void) +{ + if(VERBOSE_MED) + printf("Encode/Decode property list endianess\n"); + + /******* ENCODE/DECODE DCPLS *****/ + TESTING("Default DCPL Encoding/Decoding"); + if(test_plists("testfiles/plist_files/def_dcpl_") < 0) + FAIL_STACK_ERROR + PASSED(); + TESTING("DCPL Encoding/Decoding"); + if(test_plists("testfiles/plist_files/dcpl_") < 0) + FAIL_STACK_ERROR + PASSED(); + + /******* ENCODE/DECODE DAPLS *****/ + TESTING("Default DAPL Encoding/Decoding"); + if(test_plists("testfiles/plist_files/def_dapl_") < 0) + FAIL_STACK_ERROR + PASSED(); + TESTING("DAPL Encoding/Decoding"); + if(test_plists("testfiles/plist_files/dapl_") < 0) + FAIL_STACK_ERROR + PASSED(); + + /******* ENCODE/DECODE DXPLS *****/ + TESTING("Default DXPL Encoding/Decoding"); + if(test_plists("testfiles/plist_files/def_dxpl_") < 0) + FAIL_STACK_ERROR + PASSED(); + TESTING("DXPL Encoding/Decoding"); + if(test_plists("testfiles/plist_files/dxpl_") < 0) + FAIL_STACK_ERROR + PASSED(); + + /******* ENCODE/DECODE GCPLS *****/ + TESTING("Default GCPL Encoding/Decoding"); + if(test_plists("testfiles/plist_files/def_gcpl_") < 0) + FAIL_STACK_ERROR + PASSED(); + TESTING("GCPL Encoding/Decoding"); + if(test_plists("testfiles/plist_files/gcpl_") < 0) + FAIL_STACK_ERROR + PASSED(); + + /******* ENCODE/DECODE LCPLS *****/ + TESTING("Default LCPL Encoding/Decoding"); + if(test_plists("testfiles/plist_files/def_lcpl_") < 0) + FAIL_STACK_ERROR + PASSED(); + TESTING("LCPL Encoding/Decoding"); + if(test_plists("testfiles/plist_files/lcpl_") < 0) + FAIL_STACK_ERROR + PASSED(); + + /******* ENCODE/DECODE LAPLS *****/ + TESTING("Default LAPL Encoding/Decoding"); + if(test_plists("testfiles/plist_files/def_lapl_") < 0) + FAIL_STACK_ERROR + PASSED(); + TESTING("LAPL Encoding/Decoding"); + if(test_plists("testfiles/plist_files/lapl_") < 0) + FAIL_STACK_ERROR + PASSED(); + + /******* ENCODE/DECODE OCPLS *****/ + TESTING("Default OCPL Encoding/Decoding"); + if(test_plists("testfiles/plist_files/def_ocpl_") < 0) + FAIL_STACK_ERROR + PASSED(); + TESTING("OCPL Encoding/Decoding"); + if(test_plists("testfiles/plist_files/ocpl_") < 0) + FAIL_STACK_ERROR + PASSED(); + + /******* ENCODE/DECODE OCPYPLS *****/ + TESTING("Default OCPYPL Encoding/Decoding"); + if(test_plists("testfiles/plist_files/def_ocpypl_") < 0) + FAIL_STACK_ERROR + PASSED(); + TESTING("OCPYPL Encoding/Decoding"); + if(test_plists("testfiles/plist_files/ocpypl_") < 0) + FAIL_STACK_ERROR + PASSED(); + + /******* ENCODE/DECODE FCPLS *****/ + TESTING("Default FCPL Encoding/Decoding"); + if(test_plists("testfiles/plist_files/def_fcpl_") < 0) + FAIL_STACK_ERROR + PASSED(); + TESTING("FCPL Encoding/Decoding"); + if(test_plists("testfiles/plist_files/fcpl_") < 0) + FAIL_STACK_ERROR + PASSED(); + + /******* ENCODE/DECODE FAPLS *****/ + TESTING("Default FAPL Encoding/Decoding"); + if(test_plists("testfiles/plist_files/def_fapl_") < 0) + FAIL_STACK_ERROR + PASSED(); + TESTING("FAPL Encoding/Decoding"); + if(test_plists("testfiles/plist_files/fapl_") < 0) + FAIL_STACK_ERROR + PASSED(); + + /******* ENCODE/DECODE STRCPLS *****/ + TESTING("Default STRCPL Encoding/Decoding"); + if(test_plists("testfiles/plist_files/def_strcpl_") < 0) + FAIL_STACK_ERROR + PASSED(); + TESTING("STRCPL Encoding/Decoding"); + if(test_plists("testfiles/plist_files/strcpl_") < 0) + FAIL_STACK_ERROR + PASSED(); + + /******* ENCODE/DECODE ACPLS *****/ + TESTING("Default ACPL Encoding/Decoding"); + if(test_plists("testfiles/plist_files/def_acpl_") < 0) + FAIL_STACK_ERROR + PASSED(); + TESTING("ACPL Encoding/Decoding"); + if(test_plists("testfiles/plist_files/acpl_") < 0) + FAIL_STACK_ERROR + PASSED(); + + return 0; + +error: + return 1; +} + +static int +test_plists(const char *filename_prefix) +{ + unsigned config_1, config_2; + int fd_1, fd_2; + size_t size_1 = 0, size_2 = 0; + void *buf_1 = NULL, *buf_2 = NULL; + hid_t plist_1, plist_2; + char filename[1024]; + const char *testfile; + + /* Iterate over all combinations of configurations */ + for(config_1 = 0; config_1 < (NCONFIG - 1); config_1++) + for(config_2 = config_1 + 1; config_2 < NCONFIG; config_2++) { + /* Generate filename for file 1 */ + if(HDsnprintf(filename, sizeof(filename), "%s%s%s", filename_prefix, + config_1 & CONFIG_64 ? "64" : "32", + config_1 & CONFIG_LE ? "le" : "be") < 0) + TEST_ERROR + + /* Read file 1 */ + testfile = H5_get_srcdir_filename(filename); + if((fd_1 = HDopen(testfile, O_RDONLY, 0666)) < 0) + TEST_ERROR + size_1 = (size_t)HDlseek(fd_1, (HDoff_t)0, SEEK_END); + HDlseek(fd_1, (HDoff_t)0, SEEK_SET); + buf_1 = (void *)HDmalloc(size_1); + if(HDread(fd_1, buf_1, size_1) < 0) + TEST_ERROR + HDclose(fd_1); + + /* Generate filename for file 2 */ + if(HDsnprintf(filename, sizeof(filename), "%s%s%s", filename_prefix, + config_2 & CONFIG_64 ? "64" : "32", + config_2 & CONFIG_LE ? "le" : "be") < 0) + TEST_ERROR + + /* Read file 1 */ + testfile = H5_get_srcdir_filename(filename); + if((fd_2 = HDopen(testfile, O_RDONLY, 0666)) < 0) + TEST_ERROR + size_2 = (size_t)HDlseek(fd_2, (HDoff_t)0, SEEK_END); + HDlseek(fd_2, (HDoff_t)0, SEEK_SET); + buf_2 = (void *)HDmalloc(size_2); + if(HDread(fd_2, buf_2, size_2) < 0) + TEST_ERROR + HDclose(fd_2); + + /* Decode property lists */ + if((plist_1 = H5Pdecode(buf_1)) < 0) + FAIL_STACK_ERROR + if((plist_2 = H5Pdecode(buf_2)) < 0) + FAIL_STACK_ERROR + + /* Compare decoded property lists */ + if(!H5Pequal(plist_1, plist_2)) + FAIL_PUTS_ERROR("PLIST encoding/decoding comparison failed\n") + + /* Close */ + if((H5Pclose(plist_1)) < 0) + FAIL_STACK_ERROR + if((H5Pclose(plist_2)) < 0) + FAIL_STACK_ERROR + + HDfree(buf_1); + HDfree(buf_2); + } /* end for */ + + return 1; + +error: + printf("***** Plist Encode/Decode tests FAILED! *****\n"); + return -1; +} + diff --git a/test/enc_dec_plist_with_endianess.c b/test/enc_dec_plist_with_endianess.c deleted file mode 100644 index 4eff432..0000000 --- a/test/enc_dec_plist_with_endianess.c +++ /dev/null @@ -1,160 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the files COPYING and Copyright.html. COPYING can be found at the root * - * of the source code distribution tree; Copyright.html can be found at the * - * root level of an installed copy of the electronic HDF5 document set and * - * is linked from the top-level documents page. It can also be found at * - * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * - * access to either file, you may request a copy from help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -/* - * Serial tests for encoding/decoding plists - */ - -#include "h5test.h" -#include "H5srcdir.h" - -static int test_plists(const char *filename1, const char *filename2); - -int -main(void) -{ - if(VERBOSE_MED) - printf("Encode/Decode property list endianess\n"); - - /******* ENCODE/DECODE DCPLS *****/ - TESTING("DCPL Encoding/Decoding"); - if(test_plists("testfiles/plist_files/dcpl_le", "testfiles/plist_files/dcpl_be") < 0) - FAIL_STACK_ERROR - PASSED(); - - /******* ENCODE/DECODE DAPLS *****/ - TESTING("DAPL Encoding/Decoding"); - if(test_plists("testfiles/plist_files/dapl_le", "testfiles/plist_files/dapl_be") < 0) - FAIL_STACK_ERROR - PASSED(); - - /******* ENCODE/DECODE DXPLS *****/ - TESTING("DXPL Encoding/Decoding"); - if(test_plists("testfiles/plist_files/dxpl_le", "testfiles/plist_files/dxpl_be") < 0) - FAIL_STACK_ERROR - PASSED(); - - /******* ENCODE/DECODE GCPLS *****/ - TESTING("GCPL Encoding/Decoding"); - if(test_plists("testfiles/plist_files/gcpl_le", "testfiles/plist_files/gcpl_be") < 0) - FAIL_STACK_ERROR - PASSED(); - - /******* ENCODE/DECODE LCPLS *****/ - TESTING("LCPL Encoding/Decoding"); - if(test_plists("testfiles/plist_files/lcpl_le", "testfiles/plist_files/lcpl_be") < 0) - FAIL_STACK_ERROR - PASSED(); - - /******* ENCODE/DECODE LAPLS *****/ - TESTING("LAPL Encoding/Decoding"); - if(test_plists("testfiles/plist_files/lapl_le", "testfiles/plist_files/lapl_be") < 0) - FAIL_STACK_ERROR - PASSED(); - - /******* ENCODE/DECODE OCPLS *****/ - TESTING("OCPL Encoding/Decoding"); - if(test_plists("testfiles/plist_files/ocpl_le", "testfiles/plist_files/ocpl_be") < 0) - FAIL_STACK_ERROR - PASSED(); - - /******* ENCODE/DECODE OCPYPLS *****/ - TESTING("OCPYPL Encoding/Decoding"); - if(test_plists("testfiles/plist_files/ocpypl_le", "testfiles/plist_files/ocpypl_be") < 0) - FAIL_STACK_ERROR - PASSED(); - - /******* ENCODE/DECODE FCPLS *****/ - TESTING("FCPL Encoding/Decoding"); - if(test_plists("testfiles/plist_files/fcpl_le", "testfiles/plist_files/fcpl_be") < 0) - FAIL_STACK_ERROR - PASSED(); - - /******* ENCODE/DECODE FAPLS *****/ - TESTING("FAPL Encoding/Decoding"); - if(test_plists("testfiles/plist_files/fapl_le", "testfiles/plist_files/fapl_be") < 0) - FAIL_STACK_ERROR - PASSED(); - - /******* ENCODE/DECODE STRCPLS *****/ - TESTING("STRCPL Encoding/Decoding"); - if(test_plists("testfiles/plist_files/strcpl_le", "testfiles/plist_files/strcpl_be") < 0) - FAIL_STACK_ERROR - PASSED(); - - /******* ENCODE/DECODE ACPLS *****/ - TESTING("ACPL Encoding/Decoding"); - if(test_plists("testfiles/plist_files/acpl_le", "testfiles/plist_files/acpl_be") < 0) - FAIL_STACK_ERROR - PASSED(); - - return 0; - -error: - return 1; -} - -static int -test_plists(const char *filename1, const char *filename2) -{ - int fd_le, fd_be; - size_t size_le = 0, size_be = 0; - void *buf_le = NULL, *buf_be = NULL; - hid_t plist_le, plist_be; - const char *testfile; - - testfile = H5_get_srcdir_filename(filename1); - if((fd_le = HDopen(testfile, O_RDONLY, 0666)) < 0) - TEST_ERROR - size_le = HDlseek(fd_le, (HDoff_t)0, SEEK_END); - HDlseek(fd_le, (HDoff_t)0, SEEK_SET); - buf_le = (void *)HDmalloc(size_le); - if(HDread(fd_le, buf_le, size_le) < 0) - TEST_ERROR - HDclose(fd_le); - - testfile = H5_get_srcdir_filename(filename2); - if((fd_be = HDopen(testfile, O_RDONLY, 0666)) < 0) - TEST_ERROR - size_be = HDlseek(fd_be, (HDoff_t)0, SEEK_END); - HDlseek(fd_be, (HDoff_t)0, SEEK_SET); - buf_be = (void *)HDmalloc(size_be); - if(HDread(fd_be, buf_be, size_be) < 0) - TEST_ERROR - HDclose(fd_be); - - if((plist_le = H5Pdecode(buf_le)) < 0) - FAIL_STACK_ERROR - if((plist_be = H5Pdecode(buf_be)) < 0) - FAIL_STACK_ERROR - - if(!H5Pequal(plist_le, plist_be)) - FAIL_PUTS_ERROR("PLIST encoding/decoding comparison failed\n") - - if((H5Pclose(plist_le)) < 0) - FAIL_STACK_ERROR - if((H5Pclose(plist_be)) < 0) - FAIL_STACK_ERROR - - HDfree(buf_le); - HDfree(buf_be); - - return 1; - -error: - printf("***** Plist Encode/Decode tests FAILED! *****\n"); - return -1; -} - diff --git a/test/gen_plist.c b/test/gen_plist.c index 60f1784..b40a82e 100644 --- a/test/gen_plist.c +++ b/test/gen_plist.c @@ -25,7 +25,7 @@ #include "H5private.h" #include "hdf5.h" -static int encode_plist(hid_t plist_id, int little_endian, const char *filename_le, const char *filename_be); +static int encode_plist(hid_t plist_id, int little_endian, int word_length, const char *filename_prefix); int main(void) @@ -54,6 +54,7 @@ main(void) unsigned min_dense; const char* c_to_f = "x+32"; int little_endian; + int word_length; H5AC_cache_config_t my_cache_config = { H5AC__CURR_CACHE_CONFIG_VERSION, 1 /*TRUE*/, @@ -99,6 +100,11 @@ main(void) little_endian = 0; } + /* check word length */ + { + word_length = 8 * sizeof(void *); + } + /* Explicitly initialize the library, since we are including the private header file */ H5open(); @@ -106,6 +112,9 @@ main(void) if((dcpl1 = H5Pcreate(H5P_DATASET_CREATE)) < 0) assert(dcpl1 > 0); + if((ret = encode_plist(dcpl1, little_endian, word_length, "testfiles/plist_files/def_dcpl_")) < 0) + assert(ret > 0); + if((ret = H5Pset_chunk(dcpl1, 1, &chunk_size)) < 0) assert(ret > 0); @@ -131,7 +140,7 @@ main(void) (hsize_t)(max_size[0] * sizeof(int)/4))) < 0) assert(ret > 0); - if((ret = encode_plist(dcpl1, little_endian, "testfiles/plist_files/dcpl_le", "testfiles/plist_files/dcpl_be")) < 0) + if((ret = encode_plist(dcpl1, little_endian, word_length, "testfiles/plist_files/dcpl_")) < 0) assert(ret > 0); /* release resource */ @@ -143,10 +152,13 @@ main(void) if((dapl1 = H5Pcreate(H5P_DATASET_ACCESS)) < 0) assert(dapl1 > 0); + if((ret = encode_plist(dapl1, little_endian, word_length, "testfiles/plist_files/def_dapl_")) < 0) + assert(ret > 0); + if((ret = H5Pset_chunk_cache(dapl1, nslots, nbytes, w0)) < 0) assert(ret > 0); - if((ret = encode_plist(dapl1, little_endian, "testfiles/plist_files/dapl_le", "testfiles/plist_files/dapl_be")) < 0) + if((ret = encode_plist(dapl1, little_endian, word_length, "testfiles/plist_files/dapl_")) < 0) assert(ret > 0); /* release resource */ @@ -156,6 +168,10 @@ main(void) /******* ENCODE/DECODE DXPLS *****/ if((dxpl1 = H5Pcreate(H5P_DATASET_XFER)) < 0) assert(dxpl1 > 0); + + if((ret = encode_plist(dxpl1, little_endian, word_length, "testfiles/plist_files/def_dxpl_")) < 0) + assert(ret > 0); + if((ret = H5Pset_btree_ratios(dxpl1, 0.2f, 0.6f, 0.2f)) < 0) assert(ret > 0); if((ret = H5Pset_hyper_vector_size(dxpl1, 5)) < 0) @@ -177,7 +193,7 @@ main(void) if((ret = H5Pset_data_transform(dxpl1, c_to_f)) < 0) assert(ret > 0); - if((ret = encode_plist(dxpl1, little_endian, "testfiles/plist_files/dxpl_le", "testfiles/plist_files/dxpl_be")) < 0) + if((ret = encode_plist(dxpl1, little_endian, word_length, "testfiles/plist_files/dxpl_")) < 0) assert(ret > 0); /* release resource */ @@ -189,6 +205,9 @@ main(void) if((gcpl1 = H5Pcreate(H5P_GROUP_CREATE)) < 0) assert(gcpl1 > 0); + if((ret = encode_plist(gcpl1, little_endian, word_length, "testfiles/plist_files/def_gcpl_")) < 0) + assert(ret > 0); + if((ret = H5Pset_local_heap_size_hint(gcpl1, 256)) < 0) assert(ret > 0); @@ -205,7 +224,7 @@ main(void) if((ret = H5Pset_link_creation_order(gcpl1, (H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED))) < 0) assert(ret > 0); - if((ret = encode_plist(gcpl1, little_endian, "testfiles/plist_files/gcpl_le", "testfiles/plist_files/gcpl_be")) < 0) + if((ret = encode_plist(gcpl1, little_endian, word_length, "testfiles/plist_files/gcpl_")) < 0) assert(ret > 0); /* release resource */ @@ -216,10 +235,13 @@ main(void) if((lcpl1 = H5Pcreate(H5P_LINK_CREATE)) < 0) assert(lcpl1 > 0); + if((ret = encode_plist(lcpl1, little_endian, word_length, "testfiles/plist_files/def_lcpl_")) < 0) + assert(ret > 0); + if((ret = H5Pset_create_intermediate_group(lcpl1, 1 /*TRUE*/)) < 0) assert(ret > 0); - if((ret = encode_plist(lcpl1, little_endian, "testfiles/plist_files/lcpl_le", "testfiles/plist_files/lcpl_be")) < 0) + if((ret = encode_plist(lcpl1, little_endian, word_length, "testfiles/plist_files/lcpl_")) < 0) assert(ret > 0); /* release resource */ @@ -230,6 +252,9 @@ main(void) if((ocpypl1 = H5Pcreate(H5P_OBJECT_COPY)) < 0) assert(ocpypl1 > 0); + if((ret = encode_plist(ocpypl1, little_endian, word_length, "testfiles/plist_files/def_ocpypl_")) < 0) + assert(ret > 0); + ret = H5Pset_copy_object(ocpypl1, H5O_COPY_EXPAND_EXT_LINK_FLAG); assert(ret >= 0); @@ -239,7 +264,7 @@ main(void) ret = H5Padd_merge_committed_dtype_path(ocpypl1, "bar"); assert(ret >= 0); - if((ret = encode_plist(ocpypl1, little_endian, "testfiles/plist_files/ocpypl_le", "testfiles/plist_files/ocpypl_be")) < 0) + if((ret = encode_plist(ocpypl1, little_endian, word_length, "testfiles/plist_files/ocpypl_")) < 0) assert(ret > 0); /* release resource */ @@ -250,6 +275,9 @@ main(void) if((ocpl1 = H5Pcreate(H5P_OBJECT_CREATE)) < 0) assert(ocpl1 > 0); + if((ret = encode_plist(ocpl1, little_endian, word_length, "testfiles/plist_files/def_ocpl_")) < 0) + assert(ret > 0); + if((ret = H5Pset_attr_creation_order(ocpl1, (H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED))) < 0) assert(ret > 0); @@ -259,7 +287,7 @@ main(void) if((ret = H5Pset_filter (ocpl1, H5Z_FILTER_FLETCHER32, 0, (size_t)0, NULL)) < 0) assert(ret > 0); - if((ret = encode_plist(ocpl1, little_endian, "testfiles/plist_files/ocpl_le", "testfiles/plist_files/ocpl_be")) < 0) + if((ret = encode_plist(ocpl1, little_endian, word_length, "testfiles/plist_files/ocpl_")) < 0) assert(ret > 0); /* release resource */ @@ -270,6 +298,9 @@ main(void) if((lapl1 = H5Pcreate(H5P_LINK_ACCESS)) < 0) assert(lapl1 > 0); + if((ret = encode_plist(lapl1, little_endian, word_length, "testfiles/plist_files/def_lapl_")) < 0) + assert(ret > 0); + if((ret = H5Pset_nlinks(lapl1, (size_t)134)) < 0) assert(ret > 0); @@ -292,7 +323,7 @@ main(void) if((ret = H5Pclose(fapl1)) < 0) assert(ret > 0); - if((ret = encode_plist(lapl1, little_endian, "testfiles/plist_files/lapl_le", "testfiles/plist_files/lapl_be")) < 0) + if((ret = encode_plist(lapl1, little_endian, word_length, "testfiles/plist_files/lapl_")) < 0) assert(ret > 0); /* release resource */ @@ -303,6 +334,9 @@ main(void) if((fapl1 = H5Pcreate(H5P_FILE_ACCESS)) < 0) assert(fapl1 > 0); + if((ret = encode_plist(fapl1, little_endian, word_length, "testfiles/plist_files/def_fapl_")) < 0) + assert(ret > 0); + if((ret = H5Pset_family_offset(fapl1, 1024)) < 0) assert(ret > 0); if((ret = H5Pset_meta_block_size(fapl1, 2098452)) < 0) @@ -330,7 +364,7 @@ main(void) if((ret = H5Pset_core_write_tracking(fapl1, TRUE, (size_t)(1024 * 1024))) < 0) assert(ret > 0); - if((ret = encode_plist(fapl1, little_endian, "testfiles/plist_files/fapl_le", "testfiles/plist_files/fapl_be")) < 0) + if((ret = encode_plist(fapl1, little_endian, word_length, "testfiles/plist_files/fapl_")) < 0) assert(ret > 0); /* release resource */ @@ -341,6 +375,9 @@ main(void) if((fcpl1 = H5Pcreate(H5P_FILE_CREATE)) < 0) assert(fcpl1 > 0); + if((ret = encode_plist(fcpl1, little_endian, word_length, "testfiles/plist_files/def_fcpl_")) < 0) + assert(ret > 0); + if((ret = H5Pset_userblock(fcpl1, 1024) < 0)) assert(ret > 0); @@ -362,7 +399,7 @@ main(void) if((ret = H5Pset_sizes(fcpl1, 8, 4) < 0)) assert(ret > 0); - if((ret = encode_plist(fcpl1, little_endian, "testfiles/plist_files/fcpl_le", "testfiles/plist_files/fcpl_be")) < 0) + if((ret = encode_plist(fcpl1, little_endian, word_length, "testfiles/plist_files/fcpl_")) < 0) assert(ret > 0); /* release resource */ @@ -373,10 +410,13 @@ main(void) strcpl1 = H5Pcreate(H5P_STRING_CREATE); assert(strcpl1 > 0); + ret = encode_plist(strcpl1, little_endian, word_length, "testfiles/plist_files/def_strcpl_"); + assert(ret > 0); + ret = H5Pset_char_encoding(strcpl1, H5T_CSET_UTF8); assert(ret >= 0); - ret = encode_plist(strcpl1, little_endian, "testfiles/plist_files/strcpl_le", "testfiles/plist_files/strcpl_be"); + ret = encode_plist(strcpl1, little_endian, word_length, "testfiles/plist_files/strcpl_"); assert(ret > 0); /* release resource */ @@ -387,10 +427,13 @@ main(void) acpl1 = H5Pcreate(H5P_ATTRIBUTE_CREATE); assert(acpl1 > 0); + ret = encode_plist(acpl1, little_endian, word_length, "testfiles/plist_files/def_acpl_"); + assert(ret > 0); + ret = H5Pset_char_encoding(acpl1, H5T_CSET_UTF8); assert(ret >= 0); - ret = encode_plist(acpl1, little_endian, "testfiles/plist_files/acpl_le", "testfiles/plist_files/acpl_be"); + ret = encode_plist(acpl1, little_endian, word_length, "testfiles/plist_files/acpl_"); assert(ret > 0); /* release resource */ @@ -401,13 +444,18 @@ main(void) } static int -encode_plist(hid_t plist_id, int little_endian, const char *filename_le, const char *filename_be) +encode_plist(hid_t plist_id, int little_endian, int word_length, const char *filename_prefix) { int fd = 0; /* file descriptor */ herr_t ret = 0; void *temp_buf = NULL; size_t temp_size = 0; ssize_t write_size; + char filename[1024]; + + /* Generate filename */ + if((ret = HDsnprintf(filename, sizeof(filename), "%s%d%s", filename_prefix, word_length, little_endian ? "le" : "be")) < 0) + assert(ret > 0); /* first call to encode returns only the size of the buffer needed */ if((ret = H5Pencode(plist_id, NULL, &temp_size)) < 0) @@ -419,10 +467,7 @@ encode_plist(hid_t plist_id, int little_endian, const char *filename_le, const c if((ret = H5Pencode(plist_id, temp_buf, &temp_size)) < 0) assert(ret > 0); - if(little_endian) - fd = HDopen(filename_le, O_RDWR | O_CREAT | O_TRUNC, 0666); - else - fd = HDopen(filename_be, O_RDWR | O_CREAT | O_TRUNC, 0666); + fd = HDopen(filename, O_RDWR | O_CREAT | O_TRUNC, 0666); assert(fd > 0); write_size = HDwrite(fd, temp_buf, temp_size); diff --git a/test/testfiles/plist_files/acpl_le b/test/testfiles/plist_files/acpl_32be Binary files differindex ba342d9..ba342d9 100644 --- a/test/testfiles/plist_files/acpl_le +++ b/test/testfiles/plist_files/acpl_32be diff --git a/test/testfiles/plist_files/acpl_be b/test/testfiles/plist_files/acpl_32le Binary files differindex ba342d9..ba342d9 100644 --- a/test/testfiles/plist_files/acpl_be +++ b/test/testfiles/plist_files/acpl_32le diff --git a/test/testfiles/plist_files/acpl_64be b/test/testfiles/plist_files/acpl_64be Binary files differnew file mode 100644 index 0000000..ba342d9 --- /dev/null +++ b/test/testfiles/plist_files/acpl_64be diff --git a/test/testfiles/plist_files/acpl_64le b/test/testfiles/plist_files/acpl_64le Binary files differnew file mode 100644 index 0000000..ba342d9 --- /dev/null +++ b/test/testfiles/plist_files/acpl_64le diff --git a/test/testfiles/plist_files/dapl_le b/test/testfiles/plist_files/dapl_32be Binary files differindex 4df4e7f..4df4e7f 100644 --- a/test/testfiles/plist_files/dapl_le +++ b/test/testfiles/plist_files/dapl_32be diff --git a/test/testfiles/plist_files/dapl_be b/test/testfiles/plist_files/dapl_32le Binary files differindex 4df4e7f..4df4e7f 100644 --- a/test/testfiles/plist_files/dapl_be +++ b/test/testfiles/plist_files/dapl_32le diff --git a/test/testfiles/plist_files/dapl_64be b/test/testfiles/plist_files/dapl_64be Binary files differnew file mode 100644 index 0000000..4df4e7f --- /dev/null +++ b/test/testfiles/plist_files/dapl_64be diff --git a/test/testfiles/plist_files/dapl_64le b/test/testfiles/plist_files/dapl_64le Binary files differnew file mode 100644 index 0000000..4df4e7f --- /dev/null +++ b/test/testfiles/plist_files/dapl_64le diff --git a/test/testfiles/plist_files/dcpl_le b/test/testfiles/plist_files/dcpl_32be Binary files differindex 667c67f..667c67f 100644 --- a/test/testfiles/plist_files/dcpl_le +++ b/test/testfiles/plist_files/dcpl_32be diff --git a/test/testfiles/plist_files/dcpl_be b/test/testfiles/plist_files/dcpl_32le Binary files differindex 667c67f..667c67f 100644 --- a/test/testfiles/plist_files/dcpl_be +++ b/test/testfiles/plist_files/dcpl_32le diff --git a/test/testfiles/plist_files/dcpl_64be b/test/testfiles/plist_files/dcpl_64be Binary files differnew file mode 100644 index 0000000..667c67f --- /dev/null +++ b/test/testfiles/plist_files/dcpl_64be diff --git a/test/testfiles/plist_files/dcpl_64le b/test/testfiles/plist_files/dcpl_64le Binary files differnew file mode 100644 index 0000000..667c67f --- /dev/null +++ b/test/testfiles/plist_files/dcpl_64le diff --git a/test/testfiles/plist_files/def_acpl_32be b/test/testfiles/plist_files/def_acpl_32be Binary files differnew file mode 100644 index 0000000..efd8168 --- /dev/null +++ b/test/testfiles/plist_files/def_acpl_32be diff --git a/test/testfiles/plist_files/def_acpl_32le b/test/testfiles/plist_files/def_acpl_32le Binary files differnew file mode 100644 index 0000000..efd8168 --- /dev/null +++ b/test/testfiles/plist_files/def_acpl_32le diff --git a/test/testfiles/plist_files/def_acpl_64be b/test/testfiles/plist_files/def_acpl_64be Binary files differnew file mode 100644 index 0000000..efd8168 --- /dev/null +++ b/test/testfiles/plist_files/def_acpl_64be diff --git a/test/testfiles/plist_files/def_acpl_64le b/test/testfiles/plist_files/def_acpl_64le Binary files differnew file mode 100644 index 0000000..efd8168 --- /dev/null +++ b/test/testfiles/plist_files/def_acpl_64le diff --git a/test/testfiles/plist_files/def_dapl_32be b/test/testfiles/plist_files/def_dapl_32be Binary files differnew file mode 100644 index 0000000..c9b7ea9 --- /dev/null +++ b/test/testfiles/plist_files/def_dapl_32be diff --git a/test/testfiles/plist_files/def_dapl_32le b/test/testfiles/plist_files/def_dapl_32le Binary files differnew file mode 100644 index 0000000..c9b7ea9 --- /dev/null +++ b/test/testfiles/plist_files/def_dapl_32le diff --git a/test/testfiles/plist_files/def_dapl_64be b/test/testfiles/plist_files/def_dapl_64be Binary files differnew file mode 100644 index 0000000..c9b7ea9 --- /dev/null +++ b/test/testfiles/plist_files/def_dapl_64be diff --git a/test/testfiles/plist_files/def_dapl_64le b/test/testfiles/plist_files/def_dapl_64le Binary files differnew file mode 100644 index 0000000..c9b7ea9 --- /dev/null +++ b/test/testfiles/plist_files/def_dapl_64le diff --git a/test/testfiles/plist_files/def_dcpl_32be b/test/testfiles/plist_files/def_dcpl_32be Binary files differnew file mode 100644 index 0000000..01b233c --- /dev/null +++ b/test/testfiles/plist_files/def_dcpl_32be diff --git a/test/testfiles/plist_files/def_dcpl_32le b/test/testfiles/plist_files/def_dcpl_32le Binary files differnew file mode 100644 index 0000000..01b233c --- /dev/null +++ b/test/testfiles/plist_files/def_dcpl_32le diff --git a/test/testfiles/plist_files/def_dcpl_64be b/test/testfiles/plist_files/def_dcpl_64be Binary files differnew file mode 100644 index 0000000..01b233c --- /dev/null +++ b/test/testfiles/plist_files/def_dcpl_64be diff --git a/test/testfiles/plist_files/def_dcpl_64le b/test/testfiles/plist_files/def_dcpl_64le Binary files differnew file mode 100644 index 0000000..01b233c --- /dev/null +++ b/test/testfiles/plist_files/def_dcpl_64le diff --git a/test/testfiles/plist_files/def_dxpl_32be b/test/testfiles/plist_files/def_dxpl_32be Binary files differnew file mode 100644 index 0000000..b13f456 --- /dev/null +++ b/test/testfiles/plist_files/def_dxpl_32be diff --git a/test/testfiles/plist_files/def_dxpl_32le b/test/testfiles/plist_files/def_dxpl_32le Binary files differnew file mode 100644 index 0000000..b13f456 --- /dev/null +++ b/test/testfiles/plist_files/def_dxpl_32le diff --git a/test/testfiles/plist_files/def_dxpl_64be b/test/testfiles/plist_files/def_dxpl_64be Binary files differnew file mode 100644 index 0000000..b13f456 --- /dev/null +++ b/test/testfiles/plist_files/def_dxpl_64be diff --git a/test/testfiles/plist_files/def_dxpl_64le b/test/testfiles/plist_files/def_dxpl_64le Binary files differnew file mode 100644 index 0000000..b13f456 --- /dev/null +++ b/test/testfiles/plist_files/def_dxpl_64le diff --git a/test/testfiles/plist_files/def_fapl_32be b/test/testfiles/plist_files/def_fapl_32be Binary files differnew file mode 100644 index 0000000..6b6baee --- /dev/null +++ b/test/testfiles/plist_files/def_fapl_32be diff --git a/test/testfiles/plist_files/def_fapl_32le b/test/testfiles/plist_files/def_fapl_32le Binary files differnew file mode 100644 index 0000000..6b6baee --- /dev/null +++ b/test/testfiles/plist_files/def_fapl_32le diff --git a/test/testfiles/plist_files/def_fapl_64be b/test/testfiles/plist_files/def_fapl_64be Binary files differnew file mode 100644 index 0000000..6b6baee --- /dev/null +++ b/test/testfiles/plist_files/def_fapl_64be diff --git a/test/testfiles/plist_files/def_fapl_64le b/test/testfiles/plist_files/def_fapl_64le Binary files differnew file mode 100644 index 0000000..6b6baee --- /dev/null +++ b/test/testfiles/plist_files/def_fapl_64le diff --git a/test/testfiles/plist_files/def_fcpl_32be b/test/testfiles/plist_files/def_fcpl_32be Binary files differnew file mode 100644 index 0000000..38dec23 --- /dev/null +++ b/test/testfiles/plist_files/def_fcpl_32be diff --git a/test/testfiles/plist_files/def_fcpl_32le b/test/testfiles/plist_files/def_fcpl_32le Binary files differnew file mode 100644 index 0000000..38dec23 --- /dev/null +++ b/test/testfiles/plist_files/def_fcpl_32le diff --git a/test/testfiles/plist_files/def_fcpl_64be b/test/testfiles/plist_files/def_fcpl_64be Binary files differnew file mode 100644 index 0000000..38dec23 --- /dev/null +++ b/test/testfiles/plist_files/def_fcpl_64be diff --git a/test/testfiles/plist_files/def_fcpl_64le b/test/testfiles/plist_files/def_fcpl_64le Binary files differnew file mode 100644 index 0000000..38dec23 --- /dev/null +++ b/test/testfiles/plist_files/def_fcpl_64le diff --git a/test/testfiles/plist_files/def_gcpl_32be b/test/testfiles/plist_files/def_gcpl_32be Binary files differnew file mode 100644 index 0000000..2b5a0cc --- /dev/null +++ b/test/testfiles/plist_files/def_gcpl_32be diff --git a/test/testfiles/plist_files/def_gcpl_32le b/test/testfiles/plist_files/def_gcpl_32le Binary files differnew file mode 100644 index 0000000..2b5a0cc --- /dev/null +++ b/test/testfiles/plist_files/def_gcpl_32le diff --git a/test/testfiles/plist_files/def_gcpl_64be b/test/testfiles/plist_files/def_gcpl_64be Binary files differnew file mode 100644 index 0000000..2b5a0cc --- /dev/null +++ b/test/testfiles/plist_files/def_gcpl_64be diff --git a/test/testfiles/plist_files/def_gcpl_64le b/test/testfiles/plist_files/def_gcpl_64le Binary files differnew file mode 100644 index 0000000..2b5a0cc --- /dev/null +++ b/test/testfiles/plist_files/def_gcpl_64le diff --git a/test/testfiles/plist_files/def_lapl_32be b/test/testfiles/plist_files/def_lapl_32be Binary files differnew file mode 100644 index 0000000..9cc0e96 --- /dev/null +++ b/test/testfiles/plist_files/def_lapl_32be diff --git a/test/testfiles/plist_files/def_lapl_32le b/test/testfiles/plist_files/def_lapl_32le Binary files differnew file mode 100644 index 0000000..9cc0e96 --- /dev/null +++ b/test/testfiles/plist_files/def_lapl_32le diff --git a/test/testfiles/plist_files/def_lapl_64be b/test/testfiles/plist_files/def_lapl_64be Binary files differnew file mode 100644 index 0000000..9cc0e96 --- /dev/null +++ b/test/testfiles/plist_files/def_lapl_64be diff --git a/test/testfiles/plist_files/def_lapl_64le b/test/testfiles/plist_files/def_lapl_64le Binary files differnew file mode 100644 index 0000000..9cc0e96 --- /dev/null +++ b/test/testfiles/plist_files/def_lapl_64le diff --git a/test/testfiles/plist_files/def_lcpl_32be b/test/testfiles/plist_files/def_lcpl_32be Binary files differnew file mode 100644 index 0000000..a02d26b --- /dev/null +++ b/test/testfiles/plist_files/def_lcpl_32be diff --git a/test/testfiles/plist_files/def_lcpl_32le b/test/testfiles/plist_files/def_lcpl_32le Binary files differnew file mode 100644 index 0000000..a02d26b --- /dev/null +++ b/test/testfiles/plist_files/def_lcpl_32le diff --git a/test/testfiles/plist_files/def_lcpl_64be b/test/testfiles/plist_files/def_lcpl_64be Binary files differnew file mode 100644 index 0000000..a02d26b --- /dev/null +++ b/test/testfiles/plist_files/def_lcpl_64be diff --git a/test/testfiles/plist_files/def_lcpl_64le b/test/testfiles/plist_files/def_lcpl_64le Binary files differnew file mode 100644 index 0000000..a02d26b --- /dev/null +++ b/test/testfiles/plist_files/def_lcpl_64le diff --git a/test/testfiles/plist_files/def_ocpl_32be b/test/testfiles/plist_files/def_ocpl_32be Binary files differnew file mode 100644 index 0000000..73b5ae0 --- /dev/null +++ b/test/testfiles/plist_files/def_ocpl_32be diff --git a/test/testfiles/plist_files/def_ocpl_32le b/test/testfiles/plist_files/def_ocpl_32le Binary files differnew file mode 100644 index 0000000..73b5ae0 --- /dev/null +++ b/test/testfiles/plist_files/def_ocpl_32le diff --git a/test/testfiles/plist_files/def_ocpl_64be b/test/testfiles/plist_files/def_ocpl_64be Binary files differnew file mode 100644 index 0000000..73b5ae0 --- /dev/null +++ b/test/testfiles/plist_files/def_ocpl_64be diff --git a/test/testfiles/plist_files/def_ocpl_64le b/test/testfiles/plist_files/def_ocpl_64le Binary files differnew file mode 100644 index 0000000..73b5ae0 --- /dev/null +++ b/test/testfiles/plist_files/def_ocpl_64le diff --git a/test/testfiles/plist_files/def_ocpypl_32be b/test/testfiles/plist_files/def_ocpypl_32be Binary files differnew file mode 100644 index 0000000..1ce6360 --- /dev/null +++ b/test/testfiles/plist_files/def_ocpypl_32be diff --git a/test/testfiles/plist_files/def_ocpypl_32le b/test/testfiles/plist_files/def_ocpypl_32le Binary files differnew file mode 100644 index 0000000..1ce6360 --- /dev/null +++ b/test/testfiles/plist_files/def_ocpypl_32le diff --git a/test/testfiles/plist_files/def_ocpypl_64be b/test/testfiles/plist_files/def_ocpypl_64be Binary files differnew file mode 100644 index 0000000..1ce6360 --- /dev/null +++ b/test/testfiles/plist_files/def_ocpypl_64be diff --git a/test/testfiles/plist_files/def_ocpypl_64le b/test/testfiles/plist_files/def_ocpypl_64le Binary files differnew file mode 100644 index 0000000..1ce6360 --- /dev/null +++ b/test/testfiles/plist_files/def_ocpypl_64le diff --git a/test/testfiles/plist_files/def_strcpl_32be b/test/testfiles/plist_files/def_strcpl_32be Binary files differnew file mode 100644 index 0000000..986c591 --- /dev/null +++ b/test/testfiles/plist_files/def_strcpl_32be diff --git a/test/testfiles/plist_files/def_strcpl_32le b/test/testfiles/plist_files/def_strcpl_32le Binary files differnew file mode 100644 index 0000000..986c591 --- /dev/null +++ b/test/testfiles/plist_files/def_strcpl_32le diff --git a/test/testfiles/plist_files/def_strcpl_64be b/test/testfiles/plist_files/def_strcpl_64be Binary files differnew file mode 100644 index 0000000..986c591 --- /dev/null +++ b/test/testfiles/plist_files/def_strcpl_64be diff --git a/test/testfiles/plist_files/def_strcpl_64le b/test/testfiles/plist_files/def_strcpl_64le Binary files differnew file mode 100644 index 0000000..986c591 --- /dev/null +++ b/test/testfiles/plist_files/def_strcpl_64le diff --git a/test/testfiles/plist_files/dxpl_32be b/test/testfiles/plist_files/dxpl_32be Binary files differnew file mode 100644 index 0000000..5ff2ea0 --- /dev/null +++ b/test/testfiles/plist_files/dxpl_32be diff --git a/test/testfiles/plist_files/dxpl_32le b/test/testfiles/plist_files/dxpl_32le Binary files differnew file mode 100644 index 0000000..5ff2ea0 --- /dev/null +++ b/test/testfiles/plist_files/dxpl_32le diff --git a/test/testfiles/plist_files/dxpl_64be b/test/testfiles/plist_files/dxpl_64be Binary files differnew file mode 100644 index 0000000..5ff2ea0 --- /dev/null +++ b/test/testfiles/plist_files/dxpl_64be diff --git a/test/testfiles/plist_files/dxpl_64le b/test/testfiles/plist_files/dxpl_64le Binary files differnew file mode 100644 index 0000000..5ff2ea0 --- /dev/null +++ b/test/testfiles/plist_files/dxpl_64le diff --git a/test/testfiles/plist_files/dxpl_be b/test/testfiles/plist_files/dxpl_be Binary files differdeleted file mode 100644 index b5194c8..0000000 --- a/test/testfiles/plist_files/dxpl_be +++ /dev/null diff --git a/test/testfiles/plist_files/dxpl_le b/test/testfiles/plist_files/dxpl_le Binary files differdeleted file mode 100644 index b5194c8..0000000 --- a/test/testfiles/plist_files/dxpl_le +++ /dev/null diff --git a/test/testfiles/plist_files/fapl_le b/test/testfiles/plist_files/fapl_32be Binary files differindex 65e2070..65e2070 100644 --- a/test/testfiles/plist_files/fapl_le +++ b/test/testfiles/plist_files/fapl_32be diff --git a/test/testfiles/plist_files/fapl_be b/test/testfiles/plist_files/fapl_32le Binary files differindex 65e2070..65e2070 100644 --- a/test/testfiles/plist_files/fapl_be +++ b/test/testfiles/plist_files/fapl_32le diff --git a/test/testfiles/plist_files/fapl_64be b/test/testfiles/plist_files/fapl_64be Binary files differnew file mode 100644 index 0000000..65e2070 --- /dev/null +++ b/test/testfiles/plist_files/fapl_64be diff --git a/test/testfiles/plist_files/fapl_64le b/test/testfiles/plist_files/fapl_64le Binary files differnew file mode 100644 index 0000000..65e2070 --- /dev/null +++ b/test/testfiles/plist_files/fapl_64le diff --git a/test/testfiles/plist_files/fcpl_le b/test/testfiles/plist_files/fcpl_32be Binary files differindex ffa5242..ffa5242 100644 --- a/test/testfiles/plist_files/fcpl_le +++ b/test/testfiles/plist_files/fcpl_32be diff --git a/test/testfiles/plist_files/fcpl_be b/test/testfiles/plist_files/fcpl_32le Binary files differindex ffa5242..ffa5242 100644 --- a/test/testfiles/plist_files/fcpl_be +++ b/test/testfiles/plist_files/fcpl_32le diff --git a/test/testfiles/plist_files/fcpl_64be b/test/testfiles/plist_files/fcpl_64be Binary files differnew file mode 100644 index 0000000..ffa5242 --- /dev/null +++ b/test/testfiles/plist_files/fcpl_64be diff --git a/test/testfiles/plist_files/fcpl_64le b/test/testfiles/plist_files/fcpl_64le Binary files differnew file mode 100644 index 0000000..ffa5242 --- /dev/null +++ b/test/testfiles/plist_files/fcpl_64le diff --git a/test/testfiles/plist_files/gcpl_le b/test/testfiles/plist_files/gcpl_32be Binary files differindex 1eec32c..1eec32c 100644 --- a/test/testfiles/plist_files/gcpl_le +++ b/test/testfiles/plist_files/gcpl_32be diff --git a/test/testfiles/plist_files/gcpl_be b/test/testfiles/plist_files/gcpl_32le Binary files differindex 1eec32c..1eec32c 100644 --- a/test/testfiles/plist_files/gcpl_be +++ b/test/testfiles/plist_files/gcpl_32le diff --git a/test/testfiles/plist_files/gcpl_64be b/test/testfiles/plist_files/gcpl_64be Binary files differnew file mode 100644 index 0000000..1eec32c --- /dev/null +++ b/test/testfiles/plist_files/gcpl_64be diff --git a/test/testfiles/plist_files/gcpl_64le b/test/testfiles/plist_files/gcpl_64le Binary files differnew file mode 100644 index 0000000..1eec32c --- /dev/null +++ b/test/testfiles/plist_files/gcpl_64le diff --git a/test/testfiles/plist_files/lapl_be b/test/testfiles/plist_files/lapl_32be Binary files differindex 385cfc5..e9f43e2 100644 --- a/test/testfiles/plist_files/lapl_be +++ b/test/testfiles/plist_files/lapl_32be diff --git a/test/testfiles/plist_files/lapl_le b/test/testfiles/plist_files/lapl_32le Binary files differindex 385cfc5..e9f43e2 100644 --- a/test/testfiles/plist_files/lapl_le +++ b/test/testfiles/plist_files/lapl_32le diff --git a/test/testfiles/plist_files/lapl_64be b/test/testfiles/plist_files/lapl_64be Binary files differnew file mode 100644 index 0000000..e9f43e2 --- /dev/null +++ b/test/testfiles/plist_files/lapl_64be diff --git a/test/testfiles/plist_files/lapl_64le b/test/testfiles/plist_files/lapl_64le Binary files differnew file mode 100644 index 0000000..e9f43e2 --- /dev/null +++ b/test/testfiles/plist_files/lapl_64le diff --git a/test/testfiles/plist_files/lcpl_le b/test/testfiles/plist_files/lcpl_32be Binary files differindex 4584e5c..4584e5c 100644 --- a/test/testfiles/plist_files/lcpl_le +++ b/test/testfiles/plist_files/lcpl_32be diff --git a/test/testfiles/plist_files/lcpl_be b/test/testfiles/plist_files/lcpl_32le Binary files differindex 4584e5c..4584e5c 100644 --- a/test/testfiles/plist_files/lcpl_be +++ b/test/testfiles/plist_files/lcpl_32le diff --git a/test/testfiles/plist_files/lcpl_64be b/test/testfiles/plist_files/lcpl_64be Binary files differnew file mode 100644 index 0000000..4584e5c --- /dev/null +++ b/test/testfiles/plist_files/lcpl_64be diff --git a/test/testfiles/plist_files/lcpl_64le b/test/testfiles/plist_files/lcpl_64le Binary files differnew file mode 100644 index 0000000..4584e5c --- /dev/null +++ b/test/testfiles/plist_files/lcpl_64le diff --git a/test/testfiles/plist_files/ocpl_le b/test/testfiles/plist_files/ocpl_32be Binary files differindex bc46636..bc46636 100644 --- a/test/testfiles/plist_files/ocpl_le +++ b/test/testfiles/plist_files/ocpl_32be diff --git a/test/testfiles/plist_files/ocpl_be b/test/testfiles/plist_files/ocpl_32le Binary files differindex bc46636..bc46636 100644 --- a/test/testfiles/plist_files/ocpl_be +++ b/test/testfiles/plist_files/ocpl_32le diff --git a/test/testfiles/plist_files/ocpl_64be b/test/testfiles/plist_files/ocpl_64be Binary files differnew file mode 100644 index 0000000..bc46636 --- /dev/null +++ b/test/testfiles/plist_files/ocpl_64be diff --git a/test/testfiles/plist_files/ocpl_64le b/test/testfiles/plist_files/ocpl_64le Binary files differnew file mode 100644 index 0000000..bc46636 --- /dev/null +++ b/test/testfiles/plist_files/ocpl_64le diff --git a/test/testfiles/plist_files/ocpypl_le b/test/testfiles/plist_files/ocpypl_32be Binary files differindex a0d826d..a0d826d 100644 --- a/test/testfiles/plist_files/ocpypl_le +++ b/test/testfiles/plist_files/ocpypl_32be diff --git a/test/testfiles/plist_files/ocpypl_be b/test/testfiles/plist_files/ocpypl_32le Binary files differindex a0d826d..a0d826d 100644 --- a/test/testfiles/plist_files/ocpypl_be +++ b/test/testfiles/plist_files/ocpypl_32le diff --git a/test/testfiles/plist_files/ocpypl_64be b/test/testfiles/plist_files/ocpypl_64be Binary files differnew file mode 100644 index 0000000..a0d826d --- /dev/null +++ b/test/testfiles/plist_files/ocpypl_64be diff --git a/test/testfiles/plist_files/ocpypl_64le b/test/testfiles/plist_files/ocpypl_64le Binary files differnew file mode 100644 index 0000000..a0d826d --- /dev/null +++ b/test/testfiles/plist_files/ocpypl_64le diff --git a/test/testfiles/plist_files/strcpl_le b/test/testfiles/plist_files/strcpl_32be Binary files differindex 4190a63..4190a63 100644 --- a/test/testfiles/plist_files/strcpl_le +++ b/test/testfiles/plist_files/strcpl_32be diff --git a/test/testfiles/plist_files/strcpl_be b/test/testfiles/plist_files/strcpl_32le Binary files differindex 4190a63..4190a63 100644 --- a/test/testfiles/plist_files/strcpl_be +++ b/test/testfiles/plist_files/strcpl_32le diff --git a/test/testfiles/plist_files/strcpl_64be b/test/testfiles/plist_files/strcpl_64be Binary files differnew file mode 100644 index 0000000..4190a63 --- /dev/null +++ b/test/testfiles/plist_files/strcpl_64be diff --git a/test/testfiles/plist_files/strcpl_64le b/test/testfiles/plist_files/strcpl_64le Binary files differnew file mode 100644 index 0000000..4190a63 --- /dev/null +++ b/test/testfiles/plist_files/strcpl_64le |