mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

More includes cleanup

Browse Source
This commit is contained in:
Allen Byrne 2018-02-14 11:14:26 -06:00
parent 205d33f332
commit 41d541f1c2
13 changed files with 1803 additions and 1820 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
test/dsets.c
View File

@ -24,7 +24,6 @@
#define H5Z_FRIEND /*suppress error about including H5Zpkg */
#include "hdf5.h"
#include "testhdf5.h"
#include "H5srcdir.h"
@ -316,7 +315,7 @@ const H5Z_class2_t H5Z_COUNT[1] = {{
filter_count, /* The actual filter function */
}};
/*-------------------------------------------------------------------------
* Function: filter_count
*
@ -341,7 +340,7 @@ filter_count(unsigned int flags, size_t H5_ATTR_UNUSED cd_nelmts,
return nbytes;
}
/*-------------------------------------------------------------------------
* Function: test_create
*
@ -488,7 +487,7 @@ test_create(hid_t file)
return -1;
}
/*-------------------------------------------------------------------------
* Function: test_simple_io
*
@ -624,7 +623,7 @@ error:
return -1;
}
/*-------------------------------------------------------------------------
* Function: test_userblock_offset
*
@ -730,7 +729,7 @@ error:
return -1;
}
/*-------------------------------------------------------------------------
* Function: test_compact_io
*
@ -923,7 +922,7 @@ test_compact_io(hid_t fapl)
return -1;
}
/*-------------------------------------------------------------------------
* Function: test_max_compact
*
@ -1076,7 +1075,7 @@ error:
return -1;
} /* end test_max_compact() */
/*-------------------------------------------------------------------------
* Function: test_layout_extend
*
@ -1199,7 +1198,7 @@ error:
return -1;
} /* end test_layout_extend() */
/*-------------------------------------------------------------------------
* Function: test_conv_buffer
*
@ -1338,7 +1337,7 @@ error:
return -1;
}
/*-------------------------------------------------------------------------
* Function: test_tconv
*
@ -1433,7 +1432,7 @@ const H5Z_class2_t H5Z_BOGUS[1] = {{
filter_bogus, /* The actual filter function */
}};
/*-------------------------------------------------------------------------
* Function: can_apply_bogus
*
@ -1455,7 +1454,7 @@ can_apply_bogus(hid_t H5_ATTR_UNUSED dcpl_id, hid_t type_id, hid_t H5_ATTR_UNUSE
return -1;
}
/*-------------------------------------------------------------------------
* Function: filter_bogus
*
@ -1473,7 +1472,7 @@ filter_bogus(unsigned int H5_ATTR_UNUSED flags, size_t H5_ATTR_UNUSED cd_nelmts,
return nbytes;
}
/*-------------------------------------------------------------------------
* Function: set_local_bogus2
*
@ -1519,7 +1518,7 @@ set_local_bogus2(hid_t dcpl_id, hid_t type_id, hid_t H5_ATTR_UNUSED space_id)
return(SUCCEED);
} /* end set_local_bogus2() */
/*-------------------------------------------------------------------------
* Function: filter_bogus2
*
@ -1573,7 +1572,7 @@ filter_bogus2(unsigned int flags, size_t cd_nelmts,
return(nbytes);
}
/*-------------------------------------------------------------------------
* Function: filter_bogus3
*
@ -1602,7 +1601,7 @@ const H5Z_class2_t H5Z_CORRUPT[1] = {{
filter_corrupt, /* The actual filter function */
}};
/*-------------------------------------------------------------------------
* Function: filter_corrupt
*
@ -1661,7 +1660,7 @@ error:
return ret_value;
} /* end filter_corrupt() */
/*-------------------------------------------------------------------------
* Function: filter_cb_cont
*
@ -1680,7 +1679,7 @@ filter_cb_cont(H5Z_filter_t filter, void H5_ATTR_UNUSED *buf, size_t H5_ATTR_UNU
return H5Z_CB_FAIL;
}
/*-------------------------------------------------------------------------
* Function: filter_cb_fail
*
@ -1699,7 +1698,7 @@ filter_cb_fail(H5Z_filter_t filter, void H5_ATTR_UNUSED *buf, size_t H5_ATTR_UNU
return H5Z_CB_CONT;
}
/*-------------------------------------------------------------------------
* Function: test_filter_internal
*
@ -2510,7 +2509,7 @@ error:
return -1;
}
/*-------------------------------------------------------------------------
* Function: test_missing_filter
*
@ -2838,7 +2837,7 @@ error:
return -1;
}
/*-------------------------------------------------------------------------
* Function: test_nbit_int
*
@ -2956,7 +2955,7 @@ error:
return -1;
}
/*-------------------------------------------------------------------------
* Function: test_nbit_float
*
@ -3074,7 +3073,7 @@ error:
return -1;
}
/*-------------------------------------------------------------------------
* Function: test_nbit_double
*
@ -3206,7 +3205,7 @@ error:
return -1;
}
/*-------------------------------------------------------------------------
* Function: test_nbit_array
*
@ -3333,7 +3332,7 @@ error:
return -1;
}
/*-------------------------------------------------------------------------
* Function: test_nbit_compound
*
@ -3550,7 +3549,7 @@ error:
return -1;
}
/*-------------------------------------------------------------------------
* Function: test_nbit_compound_2
*
@ -3895,7 +3894,7 @@ error:
return -1;
}
/*-------------------------------------------------------------------------
* Function: test_nbit_compound_3
*
@ -4075,7 +4074,7 @@ error:
return -1;
}
/*-------------------------------------------------------------------------
* Function: test_nbit_int_size
*
@ -4242,7 +4241,7 @@ error:
return -1;
}
/*-------------------------------------------------------------------------
* Function: test_nbit_flt_size
*
@ -4438,7 +4437,7 @@ test_nbit_flt_size(hid_t file)
error:
return -1;
}
/*-------------------------------------------------------------------------
* Function: test_scaleoffset_int
*
@ -4550,7 +4549,7 @@ error:
return -1;
}
/*-------------------------------------------------------------------------
* Function: test_scaleoffset_int_2
*
@ -4678,7 +4677,7 @@ error:
return -1;
}
/*-------------------------------------------------------------------------
* Function: test_scaleoffset_float
*
@ -4791,7 +4790,7 @@ error:
return -1;
}
/*-------------------------------------------------------------------------
* Function: test_scaleoffset_float_2
*
@ -4920,7 +4919,7 @@ error:
return -1;
}
/*-------------------------------------------------------------------------
* Function: test_scaleoffset_double
*
@ -5033,7 +5032,7 @@ error:
return -1;
}
/*-------------------------------------------------------------------------
* Function: test_scaleoffset_double_2
*
@ -5163,7 +5162,7 @@ error:
return -1;
}
/*-------------------------------------------------------------------------
* Function: test_multiopen
*
@ -5230,7 +5229,7 @@ test_multiopen (hid_t file)
return -1;
}
/*-------------------------------------------------------------------------
* Function: test_types
*
@ -5337,7 +5336,7 @@ const H5Z_class2_t H5Z_CAN_APPLY_TEST[1] = {{
filter_bogus, /* The actual filter function */
}};
/*-------------------------------------------------------------------------
* Function: test_can_apply
*
@ -5518,7 +5517,7 @@ const H5Z_class2_t H5Z_CAN_APPLY_TEST2[1] = {{
filter_bogus3, /* The actual filter function */
}};
/*-------------------------------------------------------------------------
* Function: test_can_apply2
*
@ -5667,7 +5666,7 @@ error:
} /* end test_can_apply2() */
/*-------------------------------------------------------------------------
* Function: test_can_apply_szip
*
@ -5872,7 +5871,7 @@ const H5Z_class2_t H5Z_SET_LOCAL_TEST[1] = {{
filter_bogus2, /* The actual filter function */
}};
/*-------------------------------------------------------------------------
* Function: test_set_local
*
@ -6137,7 +6136,7 @@ error:
return -1;
} /* end test_set_local() */
/*-------------------------------------------------------------------------
* Function: test_compare_dcpl
*
@ -6222,7 +6221,7 @@ error:
return -1;
} /* end test_compare_dcpl() */
/*-------------------------------------------------------------------------
* Function: test_copy_dcpl
*
@ -6354,7 +6353,7 @@ error:
return -1;
} /* end test_copy_dcpl() */
/*-------------------------------------------------------------------------
* Function: test_filter_delete
*
@ -6481,7 +6480,7 @@ error:
} /* end test_filter_delete() */
/*-------------------------------------------------------------------------
* Function: auxread_fdata
*
@ -6565,7 +6564,7 @@ error:
return -1;
}
/*-------------------------------------------------------------------------
* Function: test_filters_endianess
*
@ -6635,7 +6634,7 @@ error:
return -1;
} /* end test_filters_endianess() */
/*-------------------------------------------------------------------------
* Function: test_zero_dims
*
@ -6799,7 +6798,7 @@ error:
return -1;
} /* end test_zero_dims() */
/*-------------------------------------------------------------------------
* Function: test_missing_chunk
*
@ -6991,7 +6990,7 @@ error:
return -1;
} /* end test_missing_chunk() */
/*-------------------------------------------------------------------------
* Function: test_random_chunks_real
*
@ -7359,7 +7358,7 @@ error:
return -1;
} /* end test_random_chunks_real() */
/*-------------------------------------------------------------------------
* Function: test_random_chunks
*
@ -7419,7 +7418,7 @@ const H5Z_class1_t H5Z_DEPREC[1] = {{
filter_bogus, /* The actual filter function */
}};
/*-------------------------------------------------------------------------
* Function: test_deprec
*
@ -7610,7 +7609,7 @@ test_deprec(hid_t file)
} /* end test_deprec() */
#endif /* H5_NO_DEPRECATED_SYMBOLS */
/*-------------------------------------------------------------------------
* Function: test_huge_chunks
*
@ -7722,7 +7721,7 @@ error:
return -1;
} /* end test_huge_chunks() */
/*-------------------------------------------------------------------------
* Function: test_chunk_cache
*
@ -7930,7 +7929,7 @@ error:
return -1;
} /* end test_chunk_cache() */
/*-------------------------------------------------------------------------
* Function: test_big_chunks_bypass_cache
*
@ -8223,7 +8222,7 @@ error:
return -1;
} /* end test_big_chunks_bypass_cache() */
/*-------------------------------------------------------------------------
* Function: test_chunk_fast
*
@ -8570,7 +8569,7 @@ error:
return -1;
} /* end test_chunk_fast() */
/*-------------------------------------------------------------------------
* Function: test_reopen_chunk_fast
*
@ -8693,7 +8692,7 @@ error:
return -1;
} /* end test_reopen_chunk_fast() */
/*-------------------------------------------------------------------------
* Function: test_chunk_fast_bug1
*
@ -8815,7 +8814,7 @@ const H5Z_class2_t H5Z_EXPAND[1] = {{
/* Global "expansion factor" for filter_expand() routine */
static size_t filter_expand_factor_g = 0;
/*-------------------------------------------------------------------------
* Function: filter_expand
*
@ -8864,7 +8863,7 @@ filter_expand(unsigned int flags, size_t H5_ATTR_UNUSED cd_nelmts,
return ret_value;
} /* end filter_expand() */
/*-------------------------------------------------------------------------
* Function: test_chunk_expand
*
@ -9260,7 +9259,7 @@ error:
return -1;
} /* end test_chunk_expand() */
/*-------------------------------------------------------------------------
* Function: test_fixed_array
*
@ -9679,7 +9678,7 @@ error:
return -1;
} /* end test_fixed_array() */
/*-------------------------------------------------------------------------
* Function: test_single_chunk
*
@ -9943,7 +9942,7 @@ error:
return -1;
} /* end test_single_chunk() */
/*-------------------------------------------------------------------------
*
* test_idx_compatible():
@ -10156,7 +10155,7 @@ error:
return -1;
} /* test_unfiltered_edge_chunks */
/*-------------------------------------------------------------------------
* Function: test_large_chunk_shrink
*
@ -10271,7 +10270,7 @@ error:
return -1;
} /* end test_large_chunk_shrink() */
/*-------------------------------------------------------------------------
* Function: test_zero_dim_dset
*
@ -10364,7 +10363,7 @@ error:
return -1;
} /* end test_zero_dim_dset() */
/*-------------------------------------------------------------------------
* Function: test_swmr_non_latest
*
@ -10613,7 +10612,7 @@ error:
return -1;
} /* test_swmr_non_latest() */
/*-------------------------------------------------------------------------
* Function: test_earray_hdr_fd
*
@ -10733,7 +10732,7 @@ error:
return -1;
} /* test_earray_hdr_fd() */
/*-------------------------------------------------------------------------
* Function: test_farray_hdr_fd
*
@ -10853,7 +10852,7 @@ error:
return -1;
} /* test_farray_hdr_fd() */
/*-------------------------------------------------------------------------
* Function: test_bt2_hdr_fd
*
@ -10973,7 +10972,7 @@ error:
return -1;
} /* test_bt2_hdr_fd() */
/*-------------------------------------------------------------------------
* Function: test_storage_size
*
@ -11367,7 +11366,7 @@ error:
return -1;
} /* end test_storage_size() */
/*-------------------------------------------------------------------------
* Function: test_power2up
*
@ -11458,7 +11457,7 @@ error:
return -1;
} /* end test_power2up() */
/*-------------------------------------------------------------------------
* Function: test_scatter
*
@ -11776,7 +11775,7 @@ error:
return -1;
} /* end test_scatter() */
/*-------------------------------------------------------------------------
* Function: test_gather
*
@ -12138,7 +12137,7 @@ error:
return -1;
} /* end test_gather() */
/*-------------------------------------------------------------------------
* Function: test_scatter_error
*
@ -12341,7 +12340,7 @@ error:
return -1;
} /* end test_scatter_error() */
/*-------------------------------------------------------------------------
* Function: test_gather_error
*
@ -12868,7 +12867,7 @@ error:
return -1;
} /* test_compact_open_close_dirty() */
/*-------------------------------------------------------------------------
* Function: test_versionbounds
*
@ -13021,7 +13020,7 @@ test_versionbounds()
return -1;
} /* test_versionbounds() */
/*-------------------------------------------------------------------------
* Function: main
*

165
test/objcopy.c
View File

@ -18,7 +18,6 @@
* Purpose: Test H5Ocopy().
*/
#include "hdf5.h"
#include "testhdf5.h"
#include "H5srcdir.h"
@ -190,7 +189,7 @@ attach_attribute_compound_vlstr(hid_t loc_id);
static int
compare_attribute_compound_vlstr(hid_t loc, hid_t loc2);
/*-------------------------------------------------------------------------
* Function: addr_insert
*
@ -224,7 +223,7 @@ addr_insert(H5O_info_t *oi)
idtab_g.obj[n] = oi->addr;
} /* end addr_insert() */
/*-------------------------------------------------------------------------
* Function: addr_lookup
*
@ -253,7 +252,7 @@ addr_lookup(H5O_info_t *oi)
return FALSE;
} /* end addr_lookup() */
/*-------------------------------------------------------------------------
* Function: addr_reset
*
@ -275,7 +274,7 @@ addr_reset(void)
idtab_g.nalloc = idtab_g.nobjs = 0;
} /* end addr_reset() */
/*-------------------------------------------------------------------------
* Function: attach_ref_attr
*
@ -336,7 +335,7 @@ error:
return(-1);
}
/*-------------------------------------------------------------------------
* Function: attach_reg_ref_attr
*
@ -413,7 +412,7 @@ error:
return(-1);
}
/*-------------------------------------------------------------------------
* Function: create_reg_ref_dataset
*
@ -508,7 +507,7 @@ error:
return(-1);
}
/*-------------------------------------------------------------------------
* Function: attach_attribute_vl
*
@ -570,7 +569,7 @@ done:
} /* end of attach_attribute_vl */
/*-------------------------------------------------------------------------
* Function: test_copy_attach_attributes
*
@ -644,7 +643,7 @@ done:
return ret_value;
}
/*-------------------------------------------------------------------------
* Function: test_copy_attach_paired_attributes
*
@ -713,7 +712,7 @@ done:
return -1;
} /* end test_copy_attach_paired_attributes() */
/*-------------------------------------------------------------------------
* Function: compare_attribute
*
@ -844,7 +843,7 @@ error:
return FALSE;
} /* end compare_attribute() */
/*-------------------------------------------------------------------------
* Function: compare_std_attributes
*
@ -922,7 +921,7 @@ error:
return FALSE;
} /* end compare_std_attributes() */
/*-------------------------------------------------------------------------
* Function: compare_data
*
@ -1189,7 +1188,7 @@ error:
return FALSE;
} /* end compare_data() */
/*-------------------------------------------------------------------------
* Function: compare_datasets
*
@ -1362,7 +1361,7 @@ error:
return FALSE;
} /* end compare_datasets() */
/*-------------------------------------------------------------------------
* Function: compare_groups
*
@ -1518,7 +1517,7 @@ error:
return FALSE;
} /* end compare_groups() */
/*-------------------------------------------------------------------------
* Function: compare_idx_type
*
@ -1559,7 +1558,7 @@ error:
return FALSE;
} /* compare_idx_type() */
/*-------------------------------------------------------------------------
* Function: test_copy_named_datatype
*
@ -1654,7 +1653,7 @@ error:
return 1;
} /* end test_copy_named_datatype */
/*-------------------------------------------------------------------------
* Function: test_copy_named_datatype_vl
*
@ -1747,7 +1746,7 @@ error:
return 1;
} /* end test_copy_named_datatype_vl */
/*-------------------------------------------------------------------------
* Function: test_copy_named_datatype_vl_vl
*
@ -1846,7 +1845,7 @@ error:
return 1;
} /* end test_copy_named_datatype_vl_vl */
/*-------------------------------------------------------------------------
* Function: test_copy_named_datatype_attr_self
*
@ -1989,7 +1988,7 @@ error:
return 1;
} /* end test_copy_named_datatype_attr_self */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_simple
*
@ -2107,7 +2106,7 @@ error:
return 1;
} /* end test_copy_dataset_simple */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_versionbounds
*
@ -2285,7 +2284,7 @@ error:
return 1;
} /* end test_copy_dataset_versionbounds */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_simple_samefile
*
@ -2391,7 +2390,7 @@ error:
return 1;
} /* end test_copy_dataset_simple_samefile */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_simple_empty
*
@ -2510,7 +2509,7 @@ error:
return 1;
} /* end test_copy_dataset_simple_empty */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_compound
*
@ -2642,7 +2641,7 @@ error:
return 1;
} /* end test_copy_dataset_compound */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_chunked
*
@ -3056,7 +3055,7 @@ error:
return 1;
} /* end test_copy_dataset_chunked */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_chunked_empty
*
@ -3453,7 +3452,7 @@ error:
return 1;
} /* end test_copy_dataset_chunked_empty */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_chunked_sparse
*
@ -3770,7 +3769,7 @@ error:
return 1;
} /* end test_copy_dataset_chunked_sparse */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_compressed
*
@ -4094,7 +4093,7 @@ error:
#endif /* H5_HAVE_FILTER_DEFLATE */
} /* end test_copy_dataset_compressed */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_no_edge_filt
*
@ -4251,7 +4250,7 @@ error:
#endif /* H5_HAVE_FILTER_DEFLATE */
} /* end test_copy_dataset_no_edge_filt */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_compact
*
@ -4387,7 +4386,7 @@ error:
return 1;
} /* end test_copy_dataset_compact */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_external
*
@ -4514,7 +4513,7 @@ error:
return 1;
} /* end test_copy_dataset_external */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_named_dtype
*
@ -4635,7 +4634,7 @@ error:
return 1;
} /* end test_copy_dataset_named_dtype */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_named_dtype_hier
*
@ -4773,7 +4772,7 @@ error:
return 1;
} /* end test_copy_dataset_named_dtype_hier */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_named_dtype_hier_outside
*
@ -4912,7 +4911,7 @@ error:
return 1;
} /* end test_copy_dataset_named_dtype_hier_outside */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_multi_ohdr_chunks
*
@ -5061,7 +5060,7 @@ error:
return 1;
} /* end test_copy_dataset_multi_ohdr_chunks */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_attr_named_dtype
*
@ -5203,7 +5202,7 @@ error:
return 1;
} /* end test_copy_dataset_attr_named_dtype */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_contig_vl
*
@ -5339,7 +5338,7 @@ error:
return 1;
} /* end test_copy_dataset_contig_vl */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_chunked_vl
*
@ -5523,7 +5522,7 @@ error:
return 1;
} /* end test_copy_dataset_chunked_vl */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_compact_vl
*
@ -5667,7 +5666,7 @@ error:
return 1;
} /* end test_copy_dataset_compact_vl */
/*-------------------------------------------------------------------------
* Function: test_copy_attribute_vl
*
@ -6088,7 +6087,7 @@ error:
return 1;
} /* end test_copy_attribute_compound_vlstr() */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_compressed_vl
*
@ -6246,7 +6245,7 @@ error:
#endif /* H5_HAVE_FILTER_DEFLATE */
} /* end test_copy_dataset_compressed_vl */
/*-------------------------------------------------------------------------
* Function: test_copy_group_empty
*
@ -6341,7 +6340,7 @@ error:
return 1;
} /* end test_copy_group_empty */
/*-------------------------------------------------------------------------
* Function: test_copy_root_group
*
@ -6474,7 +6473,7 @@ error:
return 1;
} /* end test_copy_root_group */
/*-------------------------------------------------------------------------
* Function: test_copy_group
*
@ -6608,7 +6607,7 @@ error:
return 1;
} /* end test_copy_group */
/*-------------------------------------------------------------------------
* Function: test_copy_group_deep
*
@ -6750,7 +6749,7 @@ error:
return 1;
} /* end test_copy_group_deep */
/*-------------------------------------------------------------------------
* Function: test_copy_group_loop
*
@ -6860,7 +6859,7 @@ error:
return 1;
} /* end test_copy_group_loop */
/*-------------------------------------------------------------------------
* Function: test_copy_group_wide_loop
*
@ -6989,7 +6988,7 @@ error:
return 1;
} /* end test_copy_group_wide_loop */
/*-------------------------------------------------------------------------
* Function: test_copy_group_links
*
@ -7250,7 +7249,7 @@ error:
return 1;
} /* end test_copy_group_links */
/*-------------------------------------------------------------------------
* Function: test_copy_soft_link
*
@ -7386,7 +7385,7 @@ error:
return 1;
} /* end test_copy_soft_link */
/*-------------------------------------------------------------------------
* Function: test_copy_ext_link
*
@ -7520,7 +7519,7 @@ error:
return 1;
} /* end test_copy_ext_link */
/*-------------------------------------------------------------------------
* Function: test_copy_exist
*
@ -7628,7 +7627,7 @@ error:
return 1;
} /* end test_copy_exist */
/*-------------------------------------------------------------------------
* Function: test_copy_path
*
@ -7764,7 +7763,7 @@ error:
return 1;
} /* end test_copy_path */
/*-------------------------------------------------------------------------
* Function: test_copy_same_file_named_datatype
*
@ -7833,7 +7832,7 @@ error:
return 1;
} /* end test_copy_same_file_named_datatype */
/*-------------------------------------------------------------------------
* Function: test_copy_old_layout
*
@ -7924,7 +7923,7 @@ error:
return 1;
} /* end test_copy_old_layout */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_compact_named_vl
*
@ -8079,7 +8078,7 @@ error:
return 1;
} /* end test_copy_dataset_compact_named_vl */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_contig_named_vl
*
@ -8225,7 +8224,7 @@ error:
return 1;
} /* end test_copy_dataset_contig_named_vl */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_chunked_named_vl
*
@ -8393,7 +8392,7 @@ error:
return 1;
} /* end test_copy_dataset_chunked_named_vl */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_compressed_named_vl
*
@ -8550,7 +8549,7 @@ error:
return 1;
} /* end test_copy_dataset_compressed_named_vl */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_compact_vl_vl
*
@ -8713,7 +8712,7 @@ error:
return 1;
} /* end test_copy_dataset_compact_vl_vl */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_contig_vl_vl
*
@ -8886,7 +8885,7 @@ error:
return 1;
} /* end test_copy_dataset_contig_vl_vl */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_chunked_vl_vl
*
@ -9087,7 +9086,7 @@ error:
return 1;
} /* end test_copy_dataset_chunked_vl_vl */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_compressed_vl_vl
*
@ -9272,7 +9271,7 @@ typedef struct cmpd_vl_t {
double c;
} cmpd_vl_t;
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_contig_cmpd_vl
*
@ -9418,7 +9417,7 @@ error:
return 1;
} /* end test_copy_dataset_contig_cmpd_vl */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_chunked_cmpd_vl
*
@ -9572,7 +9571,7 @@ error:
return 1;
} /* end test_copy_dataset_chunked_cmpd_vl */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_compact_cmpd_vl
*
@ -9725,7 +9724,7 @@ error:
return 1;
} /* end test_copy_dataset_compact_cmpd_vl */
/*-------------------------------------------------------------------------
* Function: test_copy_null_ref
*
@ -9887,7 +9886,7 @@ error:
return 1;
} /* end test_copy_null_ref */
/*-------------------------------------------------------------------------
* Function: test_copy_null_ref_open
*
@ -10070,7 +10069,7 @@ error:
return 1;
} /* end test_copy_null_ref_open */
/*-------------------------------------------------------------------------
* Function: test_copy_attr_crt_order
*
@ -10192,7 +10191,7 @@ error:
return 1;
} /* end test_copy_attr_crt_order */
/*-------------------------------------------------------------------------
* Function: test_copy_committed_datatype_merge
*
@ -10429,7 +10428,7 @@ error:
return 1;
} /* end test_copy_committed_datatype_merge */
/*-------------------------------------------------------------------------
* Function: test_copy_committed_datatype_merge_same_file
*
@ -10701,7 +10700,7 @@ error:
} /* end test_copy_committed_datatype_merge_same_file */
/*-------------------------------------------------------------------------
* Function: test_copy_committed_dt_merge_sugg
*
@ -10930,7 +10929,7 @@ error:
return 1;
} /* end test_copy_committed_dt_merge_sugg */
/*-------------------------------------------------------------------------
* Function: test_copy_committed_dt_merge_attr
*
@ -11152,7 +11151,7 @@ error:
#define DST_ATTR "dst_attr"
#define DST_ATTR2 "dst_attr2"
/*-------------------------------------------------------------------------
* Function: test_copy_cdt_hier_merge
*
@ -11720,7 +11719,7 @@ error:
} /* end test_copy_cdt_merge_cdt */
/*-------------------------------------------------------------------------
* Function: test_copy_cdt_merge_suggs
*
@ -11955,7 +11954,7 @@ error:
return 1;
} /* end test_copy_cdt_merge_suggs */
/*-------------------------------------------------------------------------
* Function: test_copy_cdt_merge_dset_suggs
*
@ -12232,7 +12231,7 @@ error:
return 1;
} /* end test_copy_cdt_merge_dset_suggs */
/*-------------------------------------------------------------------------
* Function: test_copy_cdt_merge_all_suggs
*
@ -12707,7 +12706,7 @@ error:
return 1;
} /* end test_copy_cdt_merge_all_suggs */
/*-------------------------------------------------------------------------
* Function: test_copy_set_mcdt_search_cb
*
@ -13063,7 +13062,7 @@ error:
return 1;
} /* end test_copy_set_mcdt_search_cb */
/*-------------------------------------------------------------------------
* Function: test_copy_set_get_mcdt_cb
*
@ -13358,7 +13357,7 @@ error:
return 1;
} /* end test_copy_set_get_mcdt_search_cb */
/*-------------------------------------------------------------------------
* Function: test_copy_iterate
*
@ -13456,7 +13455,7 @@ error:
return 1;
} /* end test_copy_iterate */
/*-------------------------------------------------------------------------
* Function: test_copy_option
*
@ -13747,7 +13746,7 @@ error:
return 1;
} /* end test_copy_option */
/*-------------------------------------------------------------------------
* Function: test_copy_dataset_open
*
@ -14092,7 +14091,7 @@ error:
return 1;
} /* end test_copy_dataset_open */
/*-------------------------------------------------------------------------
* Function: main
*

30
test/tarray.c
View File

@ -22,8 +22,6 @@
#include "testhdf5.h"
#include "H5srcdir.h"
#include "hdf5.h"
#define FILENAME "tarray1.h5"
#define TESTFILE "tarrold.h5"
@ -67,7 +65,7 @@ typedef struct
void *test_array_alloc_custom(size_t size, void *info);
void test_array_free_custom(void *mem, void *info);
/*-------------------------------------------------------------------------
* Function: test_array_atomic_1d
*
@ -191,7 +189,7 @@ test_array_atomic_1d(void)
CHECK(ret, FAIL, "H5Fclose");
} /* end test_array_atomic_1d() */
/*-------------------------------------------------------------------------
* Function: test_array_funcs
*
@ -254,7 +252,7 @@ test_array_funcs(void)
CHECK(ret, FAIL, "H5Tclose");
} /* end test_array_funcs() */
/*-------------------------------------------------------------------------
* Function: test_array_atomic_3d
*
@ -383,7 +381,7 @@ test_array_atomic_3d(void)
} /* end test_array_atomic_3d() */
/*-------------------------------------------------------------------------
* Function: test_array_array_atomic
*
@ -542,7 +540,7 @@ test_array_array_atomic(void)
CHECK(ret, FAIL, "H5Fclose");
} /* end test_array_array_atomic() */
/*-------------------------------------------------------------------------
* Function: test_array_compound_atomic
*
@ -749,7 +747,7 @@ test_array_compound_atomic(void)
CHECK(ret, FAIL, "H5Fclose");
} /* end test_array_compound_atomic() */
/*-------------------------------------------------------------------------
* Function: test_array_compound_array
*
@ -1008,7 +1006,7 @@ test_array_compound_array(void)
** allocated.
**
****************************************************************/
/*-------------------------------------------------------------------------
* Function: test_array_alloc_custom
*
@ -1047,7 +1045,7 @@ test_array_alloc_custom(size_t size, void *info)
return ret_value;
} /* end test_array_alloc_custom() */
/*-------------------------------------------------------------------------
* Function: test_array_free_custom
*
@ -1083,7 +1081,7 @@ test_array_free_custom(void *_mem, void *info)
return;
} /* end test_array_free_custom() */
/*-------------------------------------------------------------------------
* Function: test_array_vlen_atomic
*
@ -1298,7 +1296,7 @@ test_array_vlen_atomic(void)
} /* end test_array_vlen_atomic() */
/*-------------------------------------------------------------------------
* Function: test_array_vlen_array
*
@ -1553,7 +1551,7 @@ test_array_vlen_array(void)
} /* end test_array_vlen_array() */
/*-------------------------------------------------------------------------
* Function: test_array_bkg
*
@ -1857,7 +1855,7 @@ test_array_bkg(void)
HDfree(dtsinfo);
} /* end test_array_bkg() */
/*-------------------------------------------------------------------------
* Function: test_compat
*
@ -2152,7 +2150,7 @@ test_compat(void)
} /* end test_compat() */
/*-------------------------------------------------------------------------
* Function: test_array
*
@ -2185,7 +2183,7 @@ test_array(void)
} /* end test_array() */
/*-------------------------------------------------------------------------
* Function: cleanup_array
*

9
test/tconfig.c
View File

@ -19,7 +19,6 @@
*
*************************************************************/
#include "hdf5.h"
#include "testhdf5.h"
/* macros definitions */
@ -47,7 +46,7 @@
void test_config_ctypes(void);
void test_exit_definitions(void);
/*-------------------------------------------------------------------------
* Function: test_configure
*
@ -69,7 +68,7 @@ test_configure(void)
test_exit_definitions();
}
/*-------------------------------------------------------------------------
* Function: cleanup_configure
*
@ -90,7 +89,7 @@ cleanup_configure(void)
/* no file to clean */
}
/*-------------------------------------------------------------------------
* Function: test_config_ctypes
*
@ -201,7 +200,7 @@ test_config_ctypes(void)
}
/*-------------------------------------------------------------------------
* Function: test_exit_definitions
*

7
test/tfile.c
View File

@ -19,7 +19,6 @@
*
*************************************************************/
#include "hdf5.h"
#include "testhdf5.h"
#include "H5srcdir.h"
@ -4953,7 +4952,7 @@ test_libver_bounds_real(H5F_libver_t libver_create, unsigned oh_vers_create,
CHECK(ret, FAIL, "H5Pclose");
} /* end test_libver_bounds_real() */
/*-------------------------------------------------------------------------
* Function: test_libver_bounds_open
*
@ -5080,7 +5079,7 @@ test_libver_bounds_open(void)
CHECK(ret, FAIL, "H5Pclose");
} /* end test_libver_bounds_open() */
/****************************************************************
**
** test_libver_bounds():
@ -7211,7 +7210,7 @@ test_file(void)
#endif /* H5_NO_DEPRECATED_SYMBOLS */
} /* test_file() */
/*-------------------------------------------------------------------------
* Function: cleanup_file
*

4
test/tgenprop.c
View File

@ -25,7 +25,7 @@
#define H5P_TESTING
#include "testhdf5.h"
#include "hdf5.h"
#include "H5Dprivate.h" /* For Dataset creation property list names */
#include "H5Ppkg.h" /* Generic Properties */
@ -2130,7 +2130,7 @@ test_genprop(void)
} /* test_genprop() */
/*-------------------------------------------------------------------------
* Function: cleanup_genprop
*

1
test/tid.c
View File

@ -14,7 +14,6 @@
/* Test user-created identifiers (hid_t's) and identifier types. */
#include "testhdf5.h"
#include "hdf5.h"
/* Include H5Ipkg.h to calculate max number of groups */
#define H5I_FRIEND /*suppress error about including H5Ipkg */

4
test/titerate.c
View File

@ -21,8 +21,6 @@
#include "testhdf5.h"
#include "hdf5.h"
#define DATAFILE "titerate.h5"
/* Number of datasets for group iteration test */
@ -960,7 +958,7 @@ test_iterate(void)
CHECK(ret, FAIL, "H5Pclose");
} /* test_iterate() */
/*-------------------------------------------------------------------------
* Function: cleanup_iterate
*

21
test/tmisc.c
View File

@ -26,7 +26,6 @@
/* Define this macro to indicate that the testing APIs should be available */
#define H5D_TESTING
#include "hdf5.h"
#include "testhdf5.h"
#include "H5srcdir.h"
#include "H5Dpkg.h" /* Datasets */
@ -4757,7 +4756,7 @@ test_misc25b(void)
CHECK(ret, FAIL, "H5Fclose");
} /* end test_misc25b() */
/****************************************************************
**
** test_misc25c(): Exercise another null object header message merge bug.
@ -4891,7 +4890,7 @@ test_misc25c(void)
CHECK(ret, FAIL, "H5Fclose");
} /* end test_misc25c() */
/****************************************************************
**
** test_misc26(): Regression test: ensure that copying filter
@ -4977,7 +4976,7 @@ test_misc26(void)
CHECK_I(ret, "H5Pclose");
}
/****************************************************************
**
** test_misc27(): Ensure that objects with incorrect # of object
@ -5022,7 +5021,7 @@ test_misc27(void)
CHECK(ret, FAIL, "H5Fclose");
} /* end test_misc27() */
/****************************************************************
**
** test_misc28(): Ensure that the dataset chunk cache will hold
@ -5199,7 +5198,7 @@ test_misc28(void)
CHECK_I(ret, "H5Pclose");
} /* end test_misc28() */
/****************************************************************
**
** test_misc29(): Ensure that speculative metadata reads don't
@ -5248,7 +5247,7 @@ test_misc30_get_info(hid_t loc_id)
return H5Literate(loc_id, H5_INDEX_NAME, H5_ITER_INC, NULL, test_misc30_get_info_cb, NULL);
}
/****************************************************************
**
** test_misc30(): Exercise local heap code that loads prefix
@ -5313,7 +5312,7 @@ test_misc30(void)
VERIFY(file_size[0], file_size[1], "test_misc30");
} /* end test_misc30() */
/****************************************************************
**
** test_misc31(): Test reentering library through deprecated
@ -5411,7 +5410,7 @@ test_misc31(void)
#endif /* H5_NO_DEPRECATED_SYMBOLS */
} /* end test_misc31() */
/****************************************************************
*
* test_misc32(): Simple test of filter memory allocation
@ -5585,7 +5584,7 @@ test_misc34(void)
} /* end test_misc34() */
/****************************************************************
**
** test_misc(): Main misc. test routine.
@ -5638,7 +5637,7 @@ test_misc(void)
} /* test_misc() */
/*-------------------------------------------------------------------------
* Function: cleanup_misc
*

4
test/trefer.c
View File

@ -21,8 +21,6 @@
#include "testhdf5.h"
#include "hdf5.h"
#define FILE1 "trefer1.h5"
#define FILE2 "trefer2.h5"
#define FILE3 "trefer3.h5"
@ -1750,7 +1748,7 @@ test_reference(void)
} /* test_reference() */
/*-------------------------------------------------------------------------
* Function: cleanup_reference
*

4
test/ttime.c
View File

@ -21,8 +21,6 @@
#include "testhdf5.h"
#include "hdf5.h"
#define DATAFILE "ttime.h5"
#ifdef NOT_YET
#define DATASETNAME "Dataset"
@ -215,7 +213,7 @@ test_time(void)
} /* test_time() */
/*-------------------------------------------------------------------------
* Function: cleanup_time
*

4
test/tvlstr.c
View File

@ -21,8 +21,6 @@
#include "testhdf5.h"
#include "hdf5.h"
#define DATAFILE "tvlstr.h5"
#define DATAFILE2 "tvlstr2.h5"
@ -873,7 +871,7 @@ test_vlstrings(void)
test_vl_rewrite();
} /* test_vlstrings() */
/*-------------------------------------------------------------------------
* Function: cleanup_vlstrings
*

3
test/tvltypes.c
View File

@ -21,7 +21,6 @@
#include "testhdf5.h"
#include "hdf5.h"
#include "H5Dprivate.h"
#define FILENAME "tvltypes.h5"
@ -3187,7 +3186,7 @@ test_vltypes(void)
test_vltypes_fill_value(); /* Test fill value for VL data */
} /* test_vltypes() */
/*-------------------------------------------------------------------------
* Function: cleanup_vltypes
*