diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/.distdep | 96 | ||||
-rw-r--r-- | src/H5ACprivate.h | 4 | ||||
-rw-r--r-- | src/H5Apublic.h | 6 | ||||
-rw-r--r-- | src/H5Dprivate.h | 2 | ||||
-rw-r--r-- | src/H5Dpublic.h | 6 | ||||
-rw-r--r-- | src/H5Epublic.h | 3 | ||||
-rw-r--r-- | src/H5Flow.c | 2 | ||||
-rw-r--r-- | src/H5Fprivate.h | 39 | ||||
-rw-r--r-- | src/H5Fpublic.h | 7 | ||||
-rw-r--r-- | src/H5HGprivate.h | 7 | ||||
-rw-r--r-- | src/H5HLprivate.h | 6 | ||||
-rw-r--r-- | src/H5Oprivate.h | 20 | ||||
-rw-r--r-- | src/H5Ppublic.h | 85 | ||||
-rw-r--r-- | src/H5RApublic.h | 7 | ||||
-rw-r--r-- | src/H5Rpublic.h | 2 | ||||
-rw-r--r-- | src/H5Spublic.h | 20 | ||||
-rw-r--r-- | src/H5Tpkg.h | 7 | ||||
-rw-r--r-- | src/H5Tpublic.h | 35 | ||||
-rw-r--r-- | src/H5Vprivate.h | 22 | ||||
-rw-r--r-- | src/H5Zpublic.h | 3 | ||||
-rw-r--r-- | src/H5api_adpt.h | 2 | ||||
-rw-r--r-- | src/H5private.h | 5 | ||||
-rw-r--r-- | src/H5public.h | 7 | ||||
-rw-r--r-- | src/Makefile.in | 2 |
24 files changed, 220 insertions, 175 deletions
diff --git a/src/.distdep b/src/.distdep index 4dfd2fb..b3261e3 100644 --- a/src/.distdep +++ b/src/.distdep @@ -234,17 +234,6 @@ H5Fistore.o: \ H5Zpublic.h \ H5Eprivate.h \ H5Epublic.h -H5Flow.o: \ - H5Flow.c \ - H5private.h \ - H5public.h \ - H5config.h \ - H5Eprivate.h \ - H5Epublic.h \ - H5Ipublic.h \ - H5Fprivate.h \ - H5Fpublic.h \ - H5Dpublic.h H5Fmpio.o: \ H5Fmpio.c \ H5private.h \ @@ -304,42 +293,6 @@ H5Fstdio.o: \ H5Fprivate.h \ H5Fpublic.h \ H5Dpublic.h -H5G.o: \ - H5G.c \ - H5private.h \ - H5public.h \ - H5config.h \ - H5Aprivate.h \ - H5Apublic.h \ - H5Ipublic.h \ - H5Gprivate.h \ - H5Gpublic.h \ - H5Bprivate.h \ - H5Bpublic.h \ - H5Fprivate.h \ - H5Fpublic.h \ - H5Dpublic.h \ - H5Dprivate.h \ - H5Oprivate.h \ - H5Opublic.h \ - H5HGprivate.h \ - H5HGpublic.h \ - H5Tprivate.h \ - H5Tpublic.h \ - H5Sprivate.h \ - H5Spublic.h \ - H5Zprivate.h \ - H5Zpublic.h \ - H5Eprivate.h \ - H5Epublic.h \ - H5Gpkg.h \ - H5ACprivate.h \ - H5ACpublic.h \ - H5HLprivate.h \ - H5HLpublic.h \ - H5Iprivate.h \ - H5MMprivate.h \ - H5MMpublic.h H5Gent.o: \ H5Gent.c \ H5private.h \ @@ -1251,3 +1204,52 @@ H5Z.o: \ H5Sprivate.h \ H5Spublic.h \ H5Zprivate.h +H5G.o: \ + H5G.c \ + H5private.h \ + H5public.h \ + H5config.h \ + H5api_adpt.h \ + H5Aprivate.h \ + H5Apublic.h \ + H5Ipublic.h \ + H5Gprivate.h \ + H5Gpublic.h \ + H5Bprivate.h \ + H5Bpublic.h \ + H5Fprivate.h \ + H5Fpublic.h \ + H5Dpublic.h \ + H5Dprivate.h \ + H5Oprivate.h \ + H5Opublic.h \ + H5HGprivate.h \ + H5HGpublic.h \ + H5Tprivate.h \ + H5Tpublic.h \ + H5Sprivate.h \ + H5Spublic.h \ + H5Zprivate.h \ + H5Zpublic.h \ + H5Eprivate.h \ + H5Epublic.h \ + H5Gpkg.h \ + H5ACprivate.h \ + H5ACpublic.h \ + H5HLprivate.h \ + H5HLpublic.h \ + H5Iprivate.h \ + H5MMprivate.h \ + H5MMpublic.h +H5Flow.o: \ + H5Flow.c \ + H5private.h \ + H5public.h \ + H5config.h \ + H5api_adpt.h \ + H5Eprivate.h \ + H5Epublic.h \ + H5Ipublic.h \ + H5Fprivate.h \ + H5Fpublic.h \ + H5Dpublic.h diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h index 91cc2ca..5b6bb2b 100644 --- a/src/H5ACprivate.h +++ b/src/H5ACprivate.h @@ -113,8 +113,8 @@ void *H5AC_protect (H5F_t *f, const H5AC_class_t *type, const haddr_t *addr, const void *udata1, void *udata2); herr_t H5AC_unprotect (H5F_t *f, const H5AC_class_t *type, const haddr_t *addr, void *thing); -HDF5API herr_t H5AC_flush (H5F_t *f, const H5AC_class_t *type, const haddr_t *addr, - hbool_t destroy); +HDF5API herr_t H5AC_flush (H5F_t *f, const H5AC_class_t *type, + const haddr_t *addr, hbool_t destroy); herr_t H5AC_create (H5F_t *f, intn size_hint); herr_t H5AC_rename (H5F_t *f, const H5AC_class_t *type, const haddr_t *old_addr, const haddr_t *new_addr); diff --git a/src/H5Apublic.h b/src/H5Apublic.h index aa40778..4b14943 100644 --- a/src/H5Apublic.h +++ b/src/H5Apublic.h @@ -27,8 +27,8 @@ typedef int (*H5A_operator_t)(hid_t location_id/*in*/, const char *attr_name/*in*/, void *operator_data/*in,out*/); /* Public function prototypes */ -HDF5API hid_t H5Acreate(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, - hid_t plist_id); +HDF5API hid_t H5Acreate(hid_t loc_id, const char *name, hid_t type_id, + hid_t space_id, hid_t plist_id); HDF5API hid_t H5Aopen_name(hid_t loc_id, const char *name); HDF5API hid_t H5Aopen_idx(hid_t loc_id, unsigned idx); HDF5API herr_t H5Awrite(hid_t attr_id, hid_t type_id, void *buf); @@ -39,7 +39,7 @@ HDF5API hid_t H5Aget_type(hid_t attr_id); HDF5API hssize_t H5Aget_name(hid_t attr_id, size_t buf_size, char *buf); HDF5API int H5Aget_num_attrs(hid_t loc_id); HDF5API int H5Aiterate(hid_t loc_id, unsigned *attr_num, H5A_operator_t op, - void *op_data); + void *op_data); HDF5API herr_t H5Adelete(hid_t loc_id, const char *name); #ifdef __cplusplus diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h index 534ddf4..470368a 100644 --- a/src/H5Dprivate.h +++ b/src/H5Dprivate.h @@ -17,7 +17,7 @@ #define _H5Dprivate_H #include <H5Dpublic.h> -#include <H5api_adpt.h> + /* Private headers needed by this file */ #include <H5private.h> #include <H5Fprivate.h> /*for the H5F_t type */ diff --git a/src/H5Dpublic.h b/src/H5Dpublic.h index 26937ae..e355de5 100644 --- a/src/H5Dpublic.h +++ b/src/H5Dpublic.h @@ -44,16 +44,16 @@ extern "C" { #endif HDF5API hid_t H5Dcreate (hid_t file_id, const char *name, hid_t type_id, - hid_t space_id, hid_t plist_id); + hid_t space_id, hid_t plist_id); HDF5API hid_t H5Dopen (hid_t file_id, const char *name); HDF5API herr_t H5Dclose (hid_t dset_id); HDF5API hid_t H5Dget_space (hid_t dset_id); HDF5API hid_t H5Dget_type (hid_t dset_id); HDF5API hid_t H5Dget_create_plist (hid_t dset_id); HDF5API herr_t H5Dread (hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, - hid_t file_space_id, hid_t plist_id, void *buf/*out*/); + hid_t file_space_id, hid_t plist_id, void *buf/*out*/); HDF5API herr_t H5Dwrite (hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, - hid_t file_space_id, hid_t plist_id, const void *buf); + hid_t file_space_id, hid_t plist_id, const void *buf); HDF5API herr_t H5Dextend (hid_t dset_id, const hsize_t *size); #ifdef __cplusplus diff --git a/src/H5Epublic.h b/src/H5Epublic.h index 77fcca5..abaf7d7 100644 --- a/src/H5Epublic.h +++ b/src/H5Epublic.h @@ -179,7 +179,8 @@ HDF5API herr_t H5Eset_auto (H5E_auto_t func, void *client_data); HDF5API herr_t H5Eget_auto (H5E_auto_t *func, void **client_data); HDF5API herr_t H5Eclear (void); HDF5API herr_t H5Eprint (FILE *stream); -HDF5API herr_t H5Ewalk (H5E_direction_t direction, H5E_walk_t func, void *client_data); +HDF5API herr_t H5Ewalk (H5E_direction_t direction, H5E_walk_t func, + void *client_data); HDF5API herr_t H5Ewalk_cb (int n, H5E_error_t *err_desc, void *client_data); HDF5API const char *H5Eget_major (H5E_major_t major_number); HDF5API const char *H5Eget_minor (H5E_minor_t minor_number); diff --git a/src/H5Flow.c b/src/H5Flow.c index 68492de..29891c2 100644 --- a/src/H5Flow.c +++ b/src/H5Flow.c @@ -481,7 +481,9 @@ H5F_low_access(const H5F_low_class_t *type, const char *name, { htri_t ret_value; struct stat sb; +#ifdef WIN32 int fid; +#endif FUNC_ENTER(H5F_low_size, FAIL); assert(type); diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index 637df69..740670c 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -550,28 +550,33 @@ H5F_t *H5F_open(const char *name, uintn flags, const H5F_create_t *create_parms, const H5F_access_t *access_parms); herr_t H5F_close(H5F_t *f); -HDF5API herr_t H5F_debug(H5F_t *f, const haddr_t *addr, FILE * stream, intn indent, - intn fwidth); +HDF5API herr_t H5F_debug(H5F_t *f, const haddr_t *addr, FILE * stream, + intn indent, intn fwidth); HDF5API herr_t H5F_istore_debug(H5F_t *f, const haddr_t *addr, FILE * stream, - intn indent, intn fwidth, int ndims); + intn indent, intn fwidth, int ndims); herr_t H5F_mountpoint(struct H5G_entry_t *find/*in,out*/); /* Functions that operate on array storage */ -HDF5API herr_t H5F_arr_create(H5F_t *f, struct H5O_layout_t *layout /*in,out*/); +HDF5API herr_t H5F_arr_create(H5F_t *f, + struct H5O_layout_t *layout /*in,out*/); HDF5API herr_t H5F_arr_read (H5F_t *f, const struct H5D_xfer_t *xfer, - const struct H5O_layout_t *layout, - const struct H5O_pline_t *pline, - const struct H5O_fill_t *fill, - const struct H5O_efl_t *efl, const hsize_t _hslab_size[], - const hsize_t mem_size[], const hssize_t mem_offset[], - const hssize_t file_offset[], void *_buf/*out*/); + const struct H5O_layout_t *layout, + const struct H5O_pline_t *pline, + const struct H5O_fill_t *fill, + const struct H5O_efl_t *efl, + const hsize_t _hslab_size[], + const hsize_t mem_size[], + const hssize_t mem_offset[], + const hssize_t file_offset[], void *_buf/*out*/); HDF5API herr_t H5F_arr_write (H5F_t *f, const struct H5D_xfer_t *xfer, - const struct H5O_layout_t *layout, - const struct H5O_pline_t *pline, - const struct H5O_fill_t *fill, - const struct H5O_efl_t *efl, const hsize_t _hslab_size[], - const hsize_t mem_size[], const hssize_t mem_offset[], - const hssize_t file_offset[], const void *_buf); + const struct H5O_layout_t *layout, + const struct H5O_pline_t *pline, + const struct H5O_fill_t *fill, + const struct H5O_efl_t *efl, + const hsize_t _hslab_size[], + const hsize_t mem_size[], + const hssize_t mem_offset[], + const hssize_t file_offset[], const void *_buf); /* Functions that operate on indexed storage */ herr_t H5F_istore_init (H5F_t *f); @@ -600,7 +605,7 @@ herr_t H5F_istore_allocate (H5F_t *f, /* Functions that operate on contiguous storage wrt boot block */ HDF5API herr_t H5F_block_read(H5F_t *f, const haddr_t *addr, hsize_t size, - const H5D_transfer_t xfer_mode, void *buf); + const H5D_transfer_t xfer_mode, void *buf); herr_t H5F_block_write(H5F_t *f, const haddr_t *addr, hsize_t size, const H5D_transfer_t xfer_mode, const void *buf); diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h index 1244f6b..f9e797b 100644 --- a/src/H5Fpublic.h +++ b/src/H5Fpublic.h @@ -84,9 +84,10 @@ extern "C" { /* Functions in H5F.c */ HDF5API htri_t H5Fis_hdf5 (const char *filename); -HDF5API hid_t H5Fcreate (const char *filename, unsigned flags, hid_t create_plist, - hid_t access_plist); -HDF5API hid_t H5Fopen (const char *filename, unsigned flags, hid_t access_plist); +HDF5API hid_t H5Fcreate (const char *filename, unsigned flags, + hid_t create_plist, hid_t access_plist); +HDF5API hid_t H5Fopen (const char *filename, unsigned flags, + hid_t access_plist); HDF5API hid_t H5Freopen(hid_t file_id); HDF5API herr_t H5Fflush(hid_t object_id, H5F_scope_t scope); HDF5API herr_t H5Fclose (hid_t file_id); diff --git a/src/H5HGprivate.h b/src/H5HGprivate.h index 8ac9e7b..a22f265 100644 --- a/src/H5HGprivate.h +++ b/src/H5HGprivate.h @@ -93,12 +93,13 @@ typedef struct H5HG_t { typedef struct H5HG_heap_t H5HG_heap_t; H5HG_heap_t *H5HG_create (H5F_t *f, size_t size); -HDF5API herr_t H5HG_insert (H5F_t *f, size_t size, void *obj, H5HG_t *hobj/*out*/); +HDF5API herr_t H5HG_insert (H5F_t *f, size_t size, void *obj, + H5HG_t *hobj/*out*/); void *H5HG_peek (H5F_t *f, H5HG_t *hobj); HDF5API void *H5HG_read (H5F_t *f, H5HG_t *hobj, void *object); intn H5HG_link (H5F_t *f, H5HG_t *hobj, intn adjust); HDF5API herr_t H5HG_remove (H5F_t *f, H5HG_t *hobj); -HDF5API herr_t H5HG_debug(H5F_t *f, const haddr_t *addr, FILE *stream, intn indent, - intn fwidth); +HDF5API herr_t H5HG_debug(H5F_t *f, const haddr_t *addr, FILE *stream, + intn indent, intn fwidth); #endif diff --git a/src/H5HLprivate.h b/src/H5HLprivate.h index dad47f3..3ac2e7a 100644 --- a/src/H5HLprivate.h +++ b/src/H5HLprivate.h @@ -55,10 +55,10 @@ void *H5HL_read (H5F_t *f, const haddr_t *addr, size_t offset, size_t size, void *buf); HDF5API const void *H5HL_peek (H5F_t *f, const haddr_t *addr, size_t offset); HDF5API size_t H5HL_insert (H5F_t *f, const haddr_t *addr, size_t size, - const void *buf); + const void *buf); herr_t H5HL_write (H5F_t *f, const haddr_t *addr, size_t offset, size_t size, const void *buf); herr_t H5HL_remove (H5F_t *f, const haddr_t *addr, size_t offset, size_t size); -HDF5API herr_t H5HL_debug (H5F_t *f, const haddr_t *addr, FILE * stream, intn indent, - intn fwidth); +HDF5API herr_t H5HL_debug (H5F_t *f, const haddr_t *addr, FILE * stream, + intn indent, intn fwidth); #endif diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h index 76a7fdb..6c13966 100644 --- a/src/H5Oprivate.h +++ b/src/H5Oprivate.h @@ -18,7 +18,7 @@ #define _H5Oprivate_H #include <H5Opublic.h> -#include <H5api_adpt.h> + /* Private headers needed by this file */ #include <H5private.h> #include <H5Fprivate.h> @@ -268,25 +268,27 @@ typedef struct H5O_stab_t { } H5O_stab_t; /* General message operators */ -HDF5API herr_t H5O_create (H5F_t *f, size_t size_hint, H5G_entry_t *ent/*out*/); +HDF5API herr_t H5O_create (H5F_t *f, size_t size_hint, + H5G_entry_t *ent/*out*/); herr_t H5O_open (H5G_entry_t *ent); HDF5API herr_t H5O_close (H5G_entry_t *ent); intn H5O_link (H5G_entry_t *ent, intn adjust); intn H5O_count (H5G_entry_t *ent, const H5O_class_t *type); htri_t H5O_exists(H5G_entry_t *ent, const H5O_class_t *type, intn sequence); -HDF5API void *H5O_read (H5G_entry_t *ent, const H5O_class_t *type, intn sequence, - void *mesg); -HDF5API intn H5O_modify (H5G_entry_t *ent, const H5O_class_t *type, intn overwrite, - uintn flags, const void *mesg); +HDF5API void *H5O_read (H5G_entry_t *ent, const H5O_class_t *type, + intn sequence, void *mesg); +HDF5API intn H5O_modify (H5G_entry_t *ent, const H5O_class_t *type, + intn overwrite, uintn flags, const void *mesg); herr_t H5O_touch(H5G_entry_t *ent, hbool_t force); -HDF5API herr_t H5O_remove (H5G_entry_t *ent, const H5O_class_t *type, intn sequence); +HDF5API herr_t H5O_remove (H5G_entry_t *ent, const H5O_class_t *type, + intn sequence); herr_t H5O_reset (const H5O_class_t *type, void *native); void *H5O_free (const H5O_class_t *type, void *mesg); void *H5O_copy (const H5O_class_t *type, const void *mesg, void *dst); herr_t H5O_share (H5F_t *f, const H5O_class_t *type, const void *mesg, H5HG_t *hobj/*out*/); -HDF5API herr_t H5O_debug (H5F_t *f, const haddr_t *addr, FILE * stream, intn indent, - intn fwidth); +HDF5API herr_t H5O_debug (H5F_t *f, const haddr_t *addr, FILE * stream, + intn indent, intn fwidth); /* EFL operators */ hsize_t H5O_efl_total_size (H5O_efl_t *efl); diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h index bbbd9ab..d22ba2e 100644 --- a/src/H5Ppublic.h +++ b/src/H5Ppublic.h @@ -48,16 +48,19 @@ HDF5API hid_t H5Pcreate (H5P_class_t type); HDF5API herr_t H5Pclose (hid_t plist_id); HDF5API hid_t H5Pcopy (hid_t plist_id); HDF5API H5P_class_t H5Pget_class (hid_t plist_id); -HDF5API herr_t H5Pget_version (hid_t plist_id, int *boot/*out*/, int *freelist/*out*/, - int *stab/*out*/, int *shhdr/*out*/); +HDF5API herr_t H5Pget_version (hid_t plist_id, int *boot/*out*/, + int *freelist/*out*/, int *stab/*out*/, + int *shhdr/*out*/); HDF5API herr_t H5Pset_userblock (hid_t plist_id, hsize_t size); HDF5API herr_t H5Pget_userblock (hid_t plist_id, hsize_t *size); -HDF5API herr_t H5Pset_alignment (hid_t fapl_id, hsize_t threshold, hsize_t alignment); +HDF5API herr_t H5Pset_alignment (hid_t fapl_id, hsize_t threshold, + hsize_t alignment); HDF5API herr_t H5Pget_alignment (hid_t fapl_id, hsize_t *threshold/*out*/, - hsize_t *alignment/*out*/); -HDF5API herr_t H5Pset_sizes (hid_t plist_id, size_t sizeof_addr, size_t sizeof_size); + hsize_t *alignment/*out*/); +HDF5API herr_t H5Pset_sizes (hid_t plist_id, size_t sizeof_addr, + size_t sizeof_size); HDF5API herr_t H5Pget_sizes (hid_t plist_id, size_t *sizeof_addr/*out*/, - size_t *sizeof_size/*out*/); + size_t *sizeof_size/*out*/); HDF5API herr_t H5Pset_sym_k (hid_t plist_id, int ik, int lk); HDF5API herr_t H5Pget_sym_k (hid_t plist_id, int *ik/*out*/, int *lk/*out*/); HDF5API herr_t H5Pset_istore_k (hid_t plist_id, int ik); @@ -67,11 +70,11 @@ HDF5API H5D_layout_t H5Pget_layout (hid_t plist_id); HDF5API herr_t H5Pset_chunk (hid_t plist_id, int ndims, const hsize_t dim[]); HDF5API int H5Pget_chunk (hid_t plist_id, int max_ndims, hsize_t dim[]/*out*/); HDF5API herr_t H5Pset_external (hid_t plist_id, const char *name, off_t offset, - hsize_t size); + hsize_t size); HDF5API int H5Pget_external_count (hid_t plist_id); HDF5API herr_t H5Pget_external (hid_t plist_id, int idx, size_t name_size, - char *name/*out*/, off_t *offset/*out*/, - hsize_t *size/*out*/); + char *name/*out*/, off_t *offset/*out*/, + hsize_t *size/*out*/); HDF5API H5F_driver_t H5Pget_driver (hid_t plist_id); HDF5API herr_t H5Pset_stdio (hid_t plist_id); HDF5API herr_t H5Pget_stdio (hid_t plist_id); @@ -79,49 +82,61 @@ HDF5API herr_t H5Pset_sec2 (hid_t plist_id); HDF5API herr_t H5Pget_sec2 (hid_t plist_id); HDF5API herr_t H5Pset_core (hid_t plist_id, size_t increment); HDF5API herr_t H5Pget_core (hid_t plist_id, size_t *increment/*out*/); -HDF5API herr_t H5Pset_split (hid_t plist_id, const char *meta_ext, hid_t meta_plist_id, - const char *raw_ext, hid_t raw_plist_id); +HDF5API herr_t H5Pset_split (hid_t plist_id, const char *meta_ext, + hid_t meta_plist_id, const char *raw_ext, + hid_t raw_plist_id); HDF5API herr_t H5Pget_split (hid_t plist_id, size_t meta_ext_size, - char *meta_ext/*out*/, hid_t *meta_properties/*out*/, - size_t raw_ext_size, char *raw_ext/*out*/, - hid_t *raw_properties/*out*/); + char *meta_ext/*out*/, + hid_t *meta_properties/*out*/, + size_t raw_ext_size, char *raw_ext/*out*/, + hid_t *raw_properties/*out*/); -HDF5API herr_t H5Pset_family (hid_t plist_id, hsize_t memb_size, hid_t memb_plist_id); +HDF5API herr_t H5Pset_family (hid_t plist_id, hsize_t memb_size, + hid_t memb_plist_id); HDF5API herr_t H5Pget_family (hid_t plist_id, hsize_t *memb_size/*out*/, - hid_t *memb_plist_id/*out*/); -HDF5API herr_t H5Pset_buffer (hid_t plist_id, size_t size, void *tconv, void *bkg); -HDF5API size_t H5Pget_buffer (hid_t plist_id, void **tconv/*out*/, void **bkg/*out*/); + hid_t *memb_plist_id/*out*/); +HDF5API herr_t H5Pset_buffer (hid_t plist_id, size_t size, void *tconv, + void *bkg); +HDF5API size_t H5Pget_buffer (hid_t plist_id, void **tconv/*out*/, + void **bkg/*out*/); HDF5API herr_t H5Pset_preserve (hid_t plist_id, hbool_t status); HDF5API int H5Pget_preserve (hid_t plist_id); -HDF5API herr_t H5Pset_filter (hid_t plist_id, H5Z_filter_t filter, unsigned int flags, - size_t cd_nelmts, const unsigned int c_values[]); +HDF5API herr_t H5Pset_filter (hid_t plist_id, H5Z_filter_t filter, + unsigned int flags, size_t cd_nelmts, + const unsigned int c_values[]); HDF5API int H5Pget_nfilters(hid_t plist_id); HDF5API H5Z_filter_t H5Pget_filter(hid_t plist_id, int filter, - unsigned int *flags/*out*/, - size_t *cd_nelmts/*out*/, - unsigned cd_values[]/*out*/, - size_t namelen, char name[]); + unsigned int *flags/*out*/, + size_t *cd_nelmts/*out*/, + unsigned cd_values[]/*out*/, + size_t namelen, char name[]); HDF5API herr_t H5Pset_deflate (hid_t plist_id, unsigned aggression); HDF5API herr_t H5Pset_cache (hid_t plist_id, int mdc_nelmts, int rdcc_nelmts, - size_t rdcc_nbytes, double rdcc_w0); + size_t rdcc_nbytes, double rdcc_w0); HDF5API herr_t H5Pget_cache (hid_t plist_id, int *mdc_nelmts/*out*/, - int *rdcc_nelmts/*out*/, size_t *rdcc_nbytes/*out*/, - double *rdcc_w0); -HDF5API herr_t H5Pset_hyper_cache(hid_t plist_id, unsigned cache, unsigned limit); -HDF5API herr_t H5Pget_hyper_cache(hid_t plist_id, unsigned *cache, unsigned *limit); + int *rdcc_nelmts/*out*/, + size_t *rdcc_nbytes/*out*/, double *rdcc_w0); +HDF5API herr_t H5Pset_hyper_cache(hid_t plist_id, unsigned cache, + unsigned limit); +HDF5API herr_t H5Pget_hyper_cache(hid_t plist_id, unsigned *cache, + unsigned *limit); HDF5API herr_t H5Pset_btree_ratios(hid_t plist_id, double left, double middle, - double right); + double right); HDF5API herr_t H5Pget_btree_ratios(hid_t plist_id, double *left/*out*/, - double *middle/*out*/, double *right/*out*/); -HDF5API herr_t H5Pset_fill_value(hid_t plist_id, hid_t type_id, const void *value); -HDF5API herr_t H5Pget_fill_value(hid_t plist_id, hid_t type_id, void *value/*out*/); + double *middle/*out*/, + double *right/*out*/); +HDF5API herr_t H5Pset_fill_value(hid_t plist_id, hid_t type_id, + const void *value); +HDF5API herr_t H5Pget_fill_value(hid_t plist_id, hid_t type_id, + void *value/*out*/); #ifdef HAVE_PARALLEL HDF5API herr_t H5Pset_mpi (hid_t plist_id, MPI_Comm comm, MPI_Info info); HDF5API herr_t H5Pget_mpi (hid_t plist_id, MPI_Comm *comm/*out*/, - MPI_Info *info/*out*/); + MPI_Info *info/*out*/); HDF5API herr_t H5Pset_xfer (hid_t plist_id, H5D_transfer_t data_xfer_mode); -HDF5API herr_t H5Pget_xfer (hid_t plist_id, H5D_transfer_t *data_xfer_mode/*out*/); +HDF5API herr_t H5Pget_xfer (hid_t plist_id, + H5D_transfer_t *data_xfer_mode/*out*/); #endif HDF5API herr_t H5Pset_gc_references(hid_t fapl_id, unsigned gc_ref); diff --git a/src/H5RApublic.h b/src/H5RApublic.h index c246743..67ee710 100644 --- a/src/H5RApublic.h +++ b/src/H5RApublic.h @@ -14,13 +14,14 @@ extern "C" { #endif -HDF5API hid_t H5RAcreate(hid_t loc_id, const char *name, hid_t type_id, hid_t plist_id); +HDF5API hid_t H5RAcreate(hid_t loc_id, const char *name, hid_t type_id, + hid_t plist_id); HDF5API hid_t H5RAopen(hid_t loc_id, const char *name); HDF5API herr_t H5RAclose(hid_t array_id); HDF5API herr_t H5RAwrite(hid_t array_id, hssize_t start_row, hsize_t nrows, - hid_t type_id, hsize_t size[], void *buf[]); + hid_t type_id, hsize_t size[], void *buf[]); HDF5API herr_t H5RAread(hid_t array_id, hssize_t start_row, hsize_t nrows, - hid_t type_id, hsize_t size[], void *buf[]); + hid_t type_id, hsize_t size[], void *buf[]); #ifdef __cplusplus } diff --git a/src/H5Rpublic.h b/src/H5Rpublic.h index 8a78e85..5e349a8 100644 --- a/src/H5Rpublic.h +++ b/src/H5Rpublic.h @@ -67,7 +67,7 @@ extern "C" { /* Functions in H5R.c */ HDF5API herr_t H5Rcreate(void *ref, hid_t loc_id, const char *name, - H5R_type_t ref_type, hid_t space_id); + H5R_type_t ref_type, hid_t space_id); HDF5API hid_t H5Rdereference(hid_t dataset, H5R_type_t ref_type, void *ref); HDF5API hid_t H5Rget_region(hid_t dataset, H5R_type_t ref_type, void *ref); diff --git a/src/H5Spublic.h b/src/H5Spublic.h index ed25015..8beef9b 100644 --- a/src/H5Spublic.h +++ b/src/H5Spublic.h @@ -54,23 +54,27 @@ extern "C" { /* Functions in H5S.c */ HDF5API hid_t H5Screate(H5S_class_t type); HDF5API hid_t H5Screate_simple (int rank, const hsize_t dims[], - const hsize_t maxdims[]); -HDF5API herr_t H5Sset_extent_simple (hid_t space_id, int rank, const hsize_t dims[], - const hsize_t max[]); + const hsize_t maxdims[]); +HDF5API herr_t H5Sset_extent_simple (hid_t space_id, int rank, + const hsize_t dims[], + const hsize_t max[]); HDF5API hid_t H5Scopy (hid_t space_id); HDF5API herr_t H5Sclose (hid_t space_id); HDF5API hsize_t H5Sget_simple_extent_npoints (hid_t space_id); HDF5API int H5Sget_simple_extent_ndims (hid_t space_id); HDF5API int H5Sget_simple_extent_dims (hid_t space_id, hsize_t dims[], - hsize_t maxdims[]); + hsize_t maxdims[]); HDF5API htri_t H5Sis_simple (hid_t space_id); HDF5API herr_t H5Sset_space (hid_t space_id, int rank, const hsize_t *dims); HDF5API hssize_t H5Sget_select_npoints (hid_t spaceid); HDF5API herr_t H5Sselect_hyperslab (hid_t space_id, H5S_seloper_t op, - const hssize_t start[], const hsize_t _stride[], - const hsize_t count[], const hsize_t _block[]); -HDF5API herr_t H5Sselect_elements (hid_t space_id, H5S_seloper_t op, size_t num_elemn, - const hssize_t **coord); + const hssize_t start[], + const hsize_t _stride[], + const hsize_t count[], + const hsize_t _block[]); +HDF5API herr_t H5Sselect_elements (hid_t space_id, H5S_seloper_t op, + size_t num_elemn, + const hssize_t **coord); HDF5API H5S_class_t H5Sget_simple_extent_type (hid_t space_id); HDF5API herr_t H5Sset_extent_none (hid_t space_id); HDF5API herr_t H5Sextent_copy (hid_t dst_id,hid_t src_id); diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h index 071a9e4..462da57 100644 --- a/src/H5Tpkg.h +++ b/src/H5Tpkg.h @@ -366,12 +366,13 @@ herr_t H5T_conv_i32le_f64le (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, /* Bit twiddling functions */ HDF5API void H5T_bit_copy (uint8_t *dst, size_t dst_offset, const uint8_t *src, - size_t src_offset, size_t size); -HDF5API void H5T_bit_set (uint8_t *buf, size_t offset, size_t size, hbool_t value); + size_t src_offset, size_t size); +HDF5API void H5T_bit_set (uint8_t *buf, size_t offset, size_t size, + hbool_t value); HDF5API hsize_t H5T_bit_get_d (uint8_t *buf, size_t offset, size_t size); void H5T_bit_set_d (uint8_t *buf, size_t offset, size_t size, hsize_t val); HDF5API ssize_t H5T_bit_find (uint8_t *buf, size_t offset, size_t size, - H5T_sdir_t direction, hbool_t value); + H5T_sdir_t direction, hbool_t value); htri_t H5T_bit_inc(uint8_t *buf, size_t start, size_t size); #endif diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h index c6ebf1e..e6a84c4 100644 --- a/src/H5Tpublic.h +++ b/src/H5Tpublic.h @@ -395,16 +395,18 @@ HDF5API htri_t H5Tcommitted (hid_t type_id); /* Operations defined on compound data types */ HDF5API herr_t H5Tinsert (hid_t parent_id, const char *name, size_t offset, hid_t member_id); -HDF5API herr_t H5Tinsert_array (hid_t parent_id, const char *name, size_t offset, - int ndims, const size_t dim[], const int *perm, - hid_t member_id); +HDF5API herr_t H5Tinsert_array (hid_t parent_id, const char *name, + size_t offset, int ndims, const size_t dim[], + const int *perm, hid_t member_id); HDF5API herr_t H5Tpack (hid_t type_id); /* Operations defined on enumeration data types */ HDF5API hid_t H5Tenum_create(hid_t base_id); HDF5API herr_t H5Tenum_insert(hid_t type, const char *name, void *value); -HDF5API hid_t H5Tenum_nameof(hid_t type, void *value, char *name/*out*/, size_t size); -HDF5API hid_t H5Tenum_valueof(hid_t type, const char *name, void *value/*out*/); +HDF5API hid_t H5Tenum_nameof(hid_t type, void *value, char *name/*out*/, + size_t size); +HDF5API hid_t H5Tenum_valueof(hid_t type, const char *name, + void *value/*out*/); /* Querying property values */ HDF5API hid_t H5Tget_super(hid_t type); @@ -414,11 +416,11 @@ HDF5API H5T_order_t H5Tget_order(hid_t type_id); HDF5API size_t H5Tget_precision(hid_t type_id); HDF5API size_t H5Tget_offset(hid_t type_id); HDF5API herr_t H5Tget_pad(hid_t type_id, H5T_pad_t *lsb/*out*/, - H5T_pad_t *msb/*out*/); + H5T_pad_t *msb/*out*/); HDF5API H5T_sign_t H5Tget_sign(hid_t type_id); HDF5API herr_t H5Tget_fields(hid_t type_id, size_t *spos/*out*/, - size_t *epos/*out*/, size_t *esize/*out*/, - size_t *mpos/*out*/, size_t *msize/*out*/); + size_t *epos/*out*/, size_t *esize/*out*/, + size_t *mpos/*out*/, size_t *msize/*out*/); HDF5API size_t H5Tget_ebias(hid_t type_id); HDF5API H5T_norm_t H5Tget_norm(hid_t type_id); HDF5API H5T_pad_t H5Tget_inpad(hid_t type_id); @@ -427,9 +429,10 @@ HDF5API int H5Tget_nmembers(hid_t type_id); HDF5API char *H5Tget_member_name(hid_t type_id, int membno); HDF5API size_t H5Tget_member_offset(hid_t type_id, int membno); HDF5API int H5Tget_member_dims(hid_t type_id, int membno, size_t dims[]/*out*/, - int perm[]/*out*/); + int perm[]/*out*/); HDF5API hid_t H5Tget_member_type(hid_t type_id, int membno); -HDF5API herr_t H5Tget_member_value(hid_t type_id, int membno, void *value/*out*/); +HDF5API herr_t H5Tget_member_value(hid_t type_id, int membno, + void *value/*out*/); HDF5API H5T_cset_t H5Tget_cset(hid_t type_id); /* Setting property values */ @@ -439,8 +442,8 @@ HDF5API herr_t H5Tset_precision (hid_t type_id, size_t prec); HDF5API herr_t H5Tset_offset (hid_t type_id, size_t offset); HDF5API herr_t H5Tset_pad (hid_t type_id, H5T_pad_t lsb, H5T_pad_t msb); HDF5API herr_t H5Tset_sign (hid_t type_id, H5T_sign_t sign); -HDF5API herr_t H5Tset_fields (hid_t type_id, size_t spos, size_t epos, size_t esize, - size_t mpos, size_t msize); +HDF5API herr_t H5Tset_fields (hid_t type_id, size_t spos, size_t epos, + size_t esize, size_t mpos, size_t msize); HDF5API herr_t H5Tset_ebias (hid_t type_id, size_t ebias); HDF5API herr_t H5Tset_norm (hid_t type_id, H5T_norm_t norm); HDF5API herr_t H5Tset_inpad (hid_t type_id, H5T_pad_t pad); @@ -449,12 +452,12 @@ HDF5API herr_t H5Tset_strpad (hid_t type_id, H5T_str_t strpad); /* Type conversion database */ HDF5API herr_t H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id, - hid_t dst_id, H5T_conv_t func); + hid_t dst_id, H5T_conv_t func); HDF5API herr_t H5Tunregister (H5T_pers_t pers, const char *name, hid_t src_id, - hid_t dst_id, H5T_conv_t func); + hid_t dst_id, H5T_conv_t func); HDF5API H5T_conv_t H5Tfind (hid_t src_id, hid_t dst_id, H5T_cdata_t **pcdata); -HDF5API herr_t H5Tconvert (hid_t src_id, hid_t dst_id, size_t nelmts, void *buf, - void *background); +HDF5API herr_t H5Tconvert (hid_t src_id, hid_t dst_id, size_t nelmts, + void *buf, void *background); HDF5API H5T_overflow_t H5Tget_overflow(void); HDF5API herr_t H5Tset_overflow(H5T_overflow_t func); diff --git a/src/H5Vprivate.h b/src/H5Vprivate.h index 4e0ae3d..31178dd 100644 --- a/src/H5Vprivate.h +++ b/src/H5Vprivate.h @@ -9,7 +9,7 @@ #define H5Vprivate_H #include <H5private.h> -#include <H5api_adpt.h> + /* Vector comparison functions like Fortran66 comparison operators */ #define H5V_vector_eq_s(N,V1,V2) (H5V_vector_cmp_s (N, V1, V2)==0) #define H5V_vector_lt_s(N,V1,V2) (H5V_vector_cmp_s (N, V1, V2)<0) @@ -41,19 +41,21 @@ htri_t H5V_hyper_disjointp(intn n, const hssize_t *offset1, const hsize_t *size1, const hssize_t *offset2, const hsize_t *size2); htri_t H5V_hyper_eq(intn n, const hssize_t *offset1, const hsize_t *size1, - const hssize_t *offset2, const hsize_t *size2); -HDF5API herr_t H5V_hyper_fill(intn n, const hsize_t *_size, const hsize_t *total_size, - const hssize_t *offset, void *_dst, uintn fill_value); + const hssize_t *offset2, const hsize_t *size2); +HDF5API herr_t H5V_hyper_fill(intn n, const hsize_t *_size, + const hsize_t *total_size, + const hssize_t *offset, void *_dst, + uintn fill_value); HDF5API herr_t H5V_hyper_copy(intn n, const hsize_t *size, - const hsize_t *dst_total_size, - const hssize_t *dst_offset, void *_dst, - const hsize_t *src_total_size, - const hssize_t *src_offset, const void *_src); + const hsize_t *dst_total_size, + const hssize_t *dst_offset, void *_dst, + const hsize_t *src_total_size, + const hssize_t *src_offset, const void *_src); herr_t H5V_stride_fill(intn n, hsize_t elmt_size, const hsize_t *size, const hssize_t *stride, void *_dst, uintn fill_value); HDF5API herr_t H5V_stride_copy(intn n, hsize_t elmt_size, const hsize_t *_size, - const hssize_t *dst_stride, void *_dst, - const hssize_t *src_stride, const void *_src); + const hssize_t *dst_stride, void *_dst, + const hssize_t *src_stride, const void *_src); herr_t H5V_stride_copy2(hsize_t nelmts, hsize_t elmt_size, intn dst_n, const hsize_t *dst_size, const hssize_t *dst_stride, void *_dst, intn src_n, const hsize_t *src_size, diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h index deba4dc..89536d4 100644 --- a/src/H5Zpublic.h +++ b/src/H5Zpublic.h @@ -52,7 +52,8 @@ typedef size_t (*H5Z_func_t)(unsigned int flags, size_t cd_nelmts, extern "C" { #endif -HDF5API herr_t H5Zregister(H5Z_filter_t id, const char *comment, H5Z_func_t filter); +HDF5API herr_t H5Zregister(H5Z_filter_t id, const char *comment, + H5Z_func_t filter); #ifdef __cplusplus } diff --git a/src/H5api_adpt.h b/src/H5api_adpt.h index 0dc077a..603b9b5 100644 --- a/src/H5api_adpt.h +++ b/src/H5api_adpt.h @@ -22,4 +22,4 @@ #define HDF5GLOBAL extern #endif -#endif /* H5API_ADPT_H */
\ No newline at end of file +#endif /* H5API_ADPT_H */ diff --git a/src/H5private.h b/src/H5private.h index e44d6f8..61d6bbb 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -13,7 +13,7 @@ #ifndef _H5private_H #define _H5private_H #include <H5public.h> /* Include Public Definitions */ -#include <H5api_adpt.h> + /* * Include ANSI-C header files. */ @@ -404,7 +404,8 @@ typedef struct { HDF5API void H5_timer_reset (H5_timer_t *timer); HDF5API void H5_timer_begin (H5_timer_t *timer); -HDF5API void H5_timer_end (H5_timer_t *sum/*in,out*/, H5_timer_t *timer/*in,out*/); +HDF5API void H5_timer_end (H5_timer_t *sum/*in,out*/, + H5_timer_t *timer/*in,out*/); HDF5API void H5_bandwidth(char *buf/*out*/, double nbytes, double nseconds); /* diff --git a/src/H5public.h b/src/H5public.h index 71d8651..8bf1b5c 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -35,6 +35,7 @@ static char RcsId[] = "@(#)$Revision$"; # include <mpio.h> #endif #include <H5api_adpt.h> + /* Version numbers */ #define H5_VERS_MAJOR 1 /* For major interface/format changes */ #define H5_VERS_MINOR 1 /* For minor interface/format changes */ @@ -101,8 +102,10 @@ extern "C" { HDF5API herr_t H5open (void); HDF5API herr_t H5close (void); HDF5API herr_t H5dont_atexit (void); -HDF5API herr_t H5get_libversion (unsigned *majnum, unsigned *minnum, unsigned *relnum); -HDF5API herr_t H5check_version (unsigned majnum, unsigned minnum, unsigned relnum); +HDF5API herr_t H5get_libversion (unsigned *majnum, unsigned *minnum, + unsigned *relnum); +HDF5API herr_t H5check_version (unsigned majnum, unsigned minnum, + unsigned relnum); #ifdef __cplusplus } diff --git a/src/Makefile.in b/src/Makefile.in index d5c152e..ca2a302 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -33,7 +33,7 @@ PUB_HDR=H5public.h H5Apublic.h H5ACpublic.h H5Bpublic.h H5Dpublic.h \ H5Epublic.h H5Fpublic.h H5Gpublic.h H5HGpublic.h H5HLpublic.h \ H5Ipublic.h H5MFpublic.h H5MMpublic.h H5Opublic.h H5Ppublic.h \ H5Rpublic.h H5RApublic.h H5Spublic.h H5Tpublic.h H5Zpublic.h H5config.h \ - hdf5.h + hdf5.h H5api_adpt.h # Other header files (not to be installed)... PRIVATE_HDR=H5private.h H5Aprivate.h H5Apkg.h H5ACprivate.h H5Bprivate.h \ |