mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-31 17:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r8987] Purpose:

Browse Source 
Code cleanup

Description:
    Fix another batch of minor differences between the development and release
branches.

Platforms tested:
    FreeBSD 4.10 (sleipnir) w/parallel
    Too minor to require h5committest
This commit is contained in:
Quincey Koziol 2004-08-02 12:51:50 -05:00
parent 084ed88137
commit daa96590d3
11 changed files with 44 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
MANIFEST
View File

@ -719,8 +719,8 @@
./pablo/PabloHDF_RT.c
./pablo/PabloHDF_SDDF.c
./pablo/PabloHDFff.f
./pablo/PabloSedscr
./pablo/ProcIDs.h
./pablo/PabloSedscr
./pablo/ProcTrace.h
./pablo/READ_ME
@ -1133,37 +1133,35 @@
./tools/h5diff/Dependencies
./tools/h5diff/Makefile.in
./tools/h5diff/h5diff_main.c
./tools/h5diff/testh5diff_util.c
./tools/h5diff/testh5diff_main.c
./tools/h5diff/testh5diff_dset.c
./tools/h5diff/testh5diff_basic.c
./tools/h5diff/testh5diff_attr.c
./tools/h5diff/testh5diff_basic.c
./tools/h5diff/testh5diff_dset.c
./tools/h5diff/testh5diff_main.c
./tools/h5diff/testh5diff_util.c
./tools/h5diff/testh5diff.h
./tools/h5diff/testh5diff.sh
# h5repack sources
./tools/h5repack/Dependencies
./tools/h5repack/Makefile.in
./tools/h5repack/h5repack.sh.in
./tools/h5repack/h5repack.h
./tools/h5repack/h5repack.c
./tools/h5repack/h5repack.h
./tools/h5repack/h5repack_copy.c
./tools/h5repack/h5repack_filters.c
./tools/h5repack/h5repack_layout.c
./tools/h5repack/h5repack_list.c
./tools/h5repack/h5repack_filters.c
./tools/h5repack/h5repack_verify.c
./tools/h5repack/h5repack_copy.c
./tools/h5repack/h5repack_refs.c
./tools/h5repack/h5repack_main.c
./tools/h5repack/h5repack_opttable.c
./tools/h5repack/h5repack_parse.c
./tools/h5repack/h5repack_refs.c
./tools/h5repack/h5repack_verify.c
./tools/h5repack/testh5repack_attr.c
./tools/h5repack/testh5repack_dset.c
./tools/h5repack/testh5repack_make.c
./tools/h5repack/testh5repack_main.c
./tools/h5repack/testh5repack_make.c
./tools/h5repack/testh5repack_util.c
./tools/h5ls/Dependencies
./tools/h5ls/Makefile.in
./tools/h5ls/h5ls.c
@ -1171,8 +1169,18 @@
./tools/lib/Dependencies
./tools/lib/Makefile.in
./tools/lib/h5diff.c
./tools/lib/h5diff.h
./tools/lib/h5diff_array.c
./tools/lib/h5diff_attr.c
./tools/lib/h5diff_dset.c
./tools/lib/h5diff_util.c
./tools/lib/h5trav.c
./tools/lib/h5trav.h
./tools/lib/h5trav_table.c
./tools/lib/h5tools.c
./tools/lib/h5tools.h
./tools/lib/h5tools_filters.c
./tools/lib/h5tools_str.c
./tools/lib/h5tools_str.h
./tools/lib/h5tools_utils.c
@ -1180,16 +1188,6 @@
./tools/lib/h5tools_ref.c
./tools/lib/h5tools_ref.h
./tools/lib/talign.c
./tools/lib/h5diff.c
./tools/lib/h5diff_array.c
./tools/lib/h5diff_attr.c
./tools/lib/h5diff_dset.c
./tools/lib/h5diff_util.c
./tools/lib/h5trav.c
./tools/lib/h5trav_table.c
./tools/lib/h5trav.h
./tools/lib/h5diff.h
./tools/lib/h5tools_filters.c
./tools/misc/Dependencies
./tools/misc/Makefile.in
@ -1431,18 +1429,6 @@
./tools/testfiles/tvldtypes4.h5.xml
./tools/testfiles/tvldtypes5.h5.xml
./tools/testfiles/tvlstr.h5.xml
./tools/testfiles/tname-amp.h5
./tools/testfiles/tname-apos.h5
./tools/testfiles/tname-gt.h5
./tools/testfiles/tname-lt.h5
./tools/testfiles/tname-quot.h5
./tools/testfiles/tname-sp.h5
./tools/testfiles/tnodata.h5
./tools/testfiles/tref-escapes-at.h5
./tools/testfiles/tref-escapes.h5
./tools/testfiles/tref.h5
./tools/testfiles/tstring-at.h5
./tools/testfiles/tstring.h5
./tools/testfiles/tempty-dtd.h5.xml
./tools/testfiles/tempty-dtd-uri.h5.xml
./tools/testfiles/tempty-nons.h5.xml

2
configure.in
View File

@ -1133,7 +1133,7 @@ if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
dnl Add "szip" to external filter list
if test "X$EXTERNAL_FILTERS" != "X"; then
EXTERNAL_FILTERS="${EXTERNAL_FILTERS},"
EXTERNAL_FILTERS="${EXTERNAL_FILTERS},"
fi
EXTERNAL_FILTERS="${EXTERNAL_FILTERS}szip"
fi

1
src/H5D.c
View File

@ -31,7 +31,6 @@
#include "H5MMprivate.h" /* Memory management */
#include "H5Sprivate.h" /* Dataspaces */
#include "H5Vprivate.h" /* Vectors and arrays */
#include "H5Zprivate.h"
/*#define H5D_DEBUG*/

5
src/H5Dio.c
View File

@ -757,7 +757,7 @@ H5D_read(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
} /* end switch */
/* Get dataspace functions */
if (NULL==(sconv=H5S_find(dataset->ent.file,mem_space, file_space, sconv_flags, &use_par_opt_io,&dataset->layout)))
if (NULL==(sconv=H5S_find(dataset->ent.file, mem_space, file_space, sconv_flags, &use_par_opt_io, &dataset->layout)))
HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unable to convert from file to memory data space")
#ifdef H5_HAVE_PARALLEL
@ -1004,7 +1004,7 @@ H5D_write(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
} /* end switch */
/* Get dataspace functions */
if (NULL==(sconv=H5S_find(dataset->ent.file,mem_space, file_space, sconv_flags, &use_par_opt_io,&dataset->layout)))
if (NULL==(sconv=H5S_find(dataset->ent.file, mem_space, file_space, sconv_flags, &use_par_opt_io, &dataset->layout)))
HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unable to convert from memory to file data space")
#ifdef H5_HAVE_PARALLEL
@ -1031,7 +1031,6 @@ H5D_write(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
}
#endif /* H5_HAVE_INSTRUMENTED_LIBRARY */
/* end Test for collective chunk IO */
/* Don't reset the transfer mode if we can't or won't use it */
if(!use_par_opt_io || !H5T_path_noop(tpath))
H5D_io_assist_mpio(dxpl_id, dxpl_cache, &xfer_mode_changed);

7
src/H5Dmpio.c
View File

@ -138,7 +138,7 @@ H5D_mpio_spaces_xfer(H5F_t *f, const H5D_t *dset, size_t elmt_size,
&mft_is_derived )<0)
HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL,"couldn't create MPI file type");
/* Get the base address of the contiguous dataset or the chunk */
if(dset->layout.type == H5D_CONTIGUOUS)
addr = H5D_contig_get_addr(dset) + mpi_file_offset;
else {
@ -222,7 +222,7 @@ H5D_mpio_spaces_read(H5F_t *f, const H5D_dxpl_cache_t UNUSED *dxpl_cache, hid_t
FUNC_ENTER_NOAPI_NOFUNC(H5D_mpio_spaces_read);
ret_value = H5D_mpio_spaces_xfer(f, dset, elmt_size, file_space,
mem_space, dxpl_id, buf,store, 0/*read*/);
mem_space, dxpl_id, buf, store, 0/*read*/);
FUNC_LEAVE_NOAPI(ret_value);
} /* end H5D_mpio_spaces_read() */
@ -261,9 +261,8 @@ H5D_mpio_spaces_write(H5F_t *f, const H5D_dxpl_cache_t UNUSED *dxpl_cache, hid_t
/*OKAY: CAST DISCARDS CONST QUALIFIER*/
ret_value = H5D_mpio_spaces_xfer(f, dset, elmt_size, file_space,
mem_space, dxpl_id, (void*)buf, store,1/*write*/);
mem_space, dxpl_id, (void*)buf, store, 1/*write*/);
FUNC_LEAVE_NOAPI(ret_value);
} /* end H5D_mpio_spaces_write() */
#endif /* H5_HAVE_PARALLEL */

24
src/H5S.c
View File

@ -23,14 +23,14 @@
#define PABLO_MASK H5S_mask
#define _H5S_IN_H5S_C
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fpkg.h" /* Dataspace functions */
#include "H5FLprivate.h" /* Free Lists */
#include "H5Iprivate.h" /* ID Functions */
#include "H5MMprivate.h" /* Memory Management functions */
#include "H5Oprivate.h" /* object headers */
#include "H5Spkg.h" /* Dataspace functions */
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fpkg.h" /* File access */
#include "H5FLprivate.h" /* Free lists */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5Oprivate.h" /* Object headers */
#include "H5Spkg.h" /* Dataspaces */
/* Local macro definitions */
#define H5S_ENCODE_VERSION 0
@ -1375,7 +1375,7 @@ H5S_set_extent_simple (H5S_t *space, unsigned rank, const hsize_t *dims,
HDmemcpy(space->extent.max, max, sizeof(hsize_t) * rank);
} /* end if */
else {
space->extent.max = NULL;
space->extent.max = NULL;
}
}
@ -1807,7 +1807,7 @@ done:
*
*-------------------------------------------------------------------------
*/
herr_t
static herr_t
H5S_encode(H5S_t *obj, unsigned char *buf, size_t *nalloc)
{
size_t extent_size;
@ -1928,7 +1928,7 @@ done:
*
*-------------------------------------------------------------------------
*/
H5S_t*
static H5S_t*
H5S_decode(const unsigned char *buf)
{
H5S_t *ds;
@ -2198,7 +2198,7 @@ done:
* by H5Sset_extent_simple() ). Helps avoid write errors.
*
* Return: TRUE if dataspace has extent set
* FALSE if dataspace's extent is uninitialized
* FALSE if dataspace's extent is uninitialized
*
* Programmer: James Laird
*

2
src/H5Shyper.c
View File

@ -729,7 +729,7 @@ H5S_hyper_iter_next(H5S_sel_iter_t *iter, size_t nelem)
/* Increment absolute position */
if(curr_dim==fast_dim) {
size_t actual_elem; /* Actual # of elements advanced on each iteration through loop */
hsize_t span_elem; /* Number of elements left in a span */
hsize_t span_elem; /* Number of elements left in a span */
/* Compute the number of elements left in block */
span_elem=(curr_span->high-abs_arr[curr_dim])+1;

1
src/H5Smpio.c
View File

@ -743,5 +743,4 @@ H5S_mpio_opt_possible( const H5F_t *file, const H5S_t *mem_space, const H5S_t *f
done:
FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_mpio_opt_possible() */
#endif /* H5_HAVE_PARALLEL */

2
src/H5Sprivate.h
View File

@ -211,10 +211,10 @@ H5_DLL H5S_conv_t *H5S_find(const H5F_t *file,const H5S_t *mem_space, const H5S_
H5_DLL H5S_class_t H5S_get_simple_extent_type(const H5S_t *ds);
H5_DLL hssize_t H5S_get_simple_extent_npoints(const H5S_t *ds);
H5_DLL hsize_t H5S_get_npoints_max(const H5S_t *ds);
H5_DLL hbool_t H5S_has_extent(const H5S_t *ds);
H5_DLL int H5S_get_simple_extent_ndims(const H5S_t *ds);
H5_DLL int H5S_get_simple_extent_dims(const H5S_t *ds, hsize_t dims[]/*out*/,
hsize_t max_dims[]/*out*/);
H5_DLL hbool_t H5S_has_extent(const H5S_t *ds);
H5_DLL herr_t H5S_modify(struct H5G_entry_t *ent, const H5S_t *space,
hbool_t update_time, hid_t dxpl_id);
H5_DLL herr_t H5S_append(H5F_t *f, hid_t dxpl_id, struct H5O_t *oh, const H5S_t *ds);

2
testpar/testphdf5.c
View File

@ -469,7 +469,6 @@ int main(int argc, char **argv)
AddTest("fillvalue", dataset_fillvalue, NULL,
"dataset fill value", filenames[8]);
AddTest("coll. chunked 1", coll_chunk1,NULL,
"simple collective chunk io",filenames[10]);
AddTest("coll. chunked 2", coll_chunk2,NULL,
@ -478,6 +477,7 @@ int main(int argc, char **argv)
"multi-chunk collective chunk io",filenames[12]);
AddTest("coll. chunked 4", coll_chunk4,NULL,
"collective to independent chunk io",filenames[13]);
/* Display testing information */
TestInfo(argv[0]);

1
testpar/testphdf5.h
View File

@ -127,6 +127,7 @@
#define BYROW_CONT 1
#define BYROW_DISCONT 2
#define DSET_COLLECTIVE_CHUNK_NAME "coll_chunk_name"
/* type definitions */
typedef struct H5Ptest_param_t /* holds extra test parameters */
{