diff options
| -rw-r--r-- | src/H5FDcore.c | 13 | ||||
| -rw-r--r-- | src/H5FDgass.h | 4 | ||||
| -rw-r--r-- | src/H5FDpublic.h | 2 | ||||
| -rw-r--r-- | src/H5P.c | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 22 | ||||
| -rw-r--r-- | tools/h5ls.c | 2 | ||||
| -rw-r--r-- | tools/h5tools.c | 2 |
7 files changed, 23 insertions, 26 deletions
diff --git a/src/H5FDcore.c b/src/H5FDcore.c index 6953ca7..64f93c0 100644 --- a/src/H5FDcore.c +++ b/src/H5FDcore.c @@ -9,9 +9,10 @@ * only the HDF5 public API. This driver is useful for fast * access to small, temporary hdf5 files. */ -#include <assert.h> -#include <hdf5.h> -#include <stdlib.h> +#include <H5private.h> +#include <H5Fprivate.h> +#include <H5FDcore.h> +#include <H5Pprivate.h> #undef MAX #define MAX(X,Y) ((X)>(Y)?(X):(Y)) @@ -155,8 +156,8 @@ herr_t H5Pset_fapl_core(hid_t fapl_id, size_t increment) { H5FD_core_fapl_t fa; - - /*NO TRACE*/ + + /* NO TRACE */ if (H5P_FILE_ACCESS!=H5Pget_class(fapl_id)) return -1; fa.increment = increment; return H5Pset_driver(fapl_id, H5FD_CORE, &fa); @@ -184,7 +185,7 @@ H5Pget_fapl_core(hid_t fapl_id, size_t *increment/*out*/) { H5FD_core_fapl_t *fa; - /*NO TRACE*/ + /* NO TRACE */ if (H5P_FILE_ACCESS!=H5Pget_class(fapl_id)) return -1; if (H5FD_CORE!=H5Pget_driver(fapl_id)) return -1; if (NULL==(fa=H5Pget_driver_info(fapl_id))) return -1; diff --git a/src/H5FDgass.h b/src/H5FDgass.h index 94cabbd..f303c3a 100644 --- a/src/H5FDgass.h +++ b/src/H5FDgass.h @@ -12,7 +12,6 @@ #include <H5FDpublic.h> #include <H5Ipublic.h> -#include <H5Eprivate.h> #include <string.h> @@ -45,4 +44,5 @@ herr_t H5Pget_fapl_gass(hid_t fapl_id, GASS_Info *info/*out*/); #endif -#endif // H5FDgass_H +#endif /* H5FDgass_H */ + diff --git a/src/H5FDpublic.h b/src/H5FDpublic.h index dc6d9f7..fdd07f5 100644 --- a/src/H5FDpublic.h +++ b/src/H5FDpublic.h @@ -8,6 +8,8 @@ #ifndef _H5FDpublic_H #define _H5FDpublic_H +#include <H5public.h> + /* * Types of allocation requests. The values larger than H5FD_MEM_DEFAULT * should not change other than adding new types to the end. These numbers @@ -2607,9 +2607,7 @@ H5P_copy (H5P_class_t type, const void *src) void *dst = NULL; const H5D_create_t *dc_src = NULL; H5D_create_t *dc_dst = NULL; - const H5F_access_t *fa_src = NULL; H5F_access_t *fa_dst = NULL; - const H5F_xfer_t *dx_src = NULL; H5F_xfer_t *dx_dst = NULL; FUNC_ENTER (H5P_copy, NULL); @@ -2654,7 +2652,6 @@ H5P_copy (H5P_class_t type, const void *src) break; case H5P_FILE_ACCESS: - fa_src = (const H5F_access_t*)src; fa_dst = (H5F_access_t*)dst; if (fa_dst->driver_id>=0) { @@ -2691,7 +2688,6 @@ H5P_copy (H5P_class_t type, const void *src) break; case H5P_DATA_XFER: - dx_src = (const H5F_xfer_t*)src; dx_dst = (H5F_xfer_t*)dst; if (dx_dst->driver_id>=0) { diff --git a/src/Makefile.in b/src/Makefile.in index 5368802..78d56ce 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -22,13 +22,13 @@ CLEAN=libhdf5.settings ## Source and object files for the library (lexicographically)... LIB_SRC=H5.c H5A.c H5AC.c H5B.c H5D.c H5E.c H5F.c H5Farray.c H5Fistore.c \ - H5FD.c H5FDsec2.c H5FDfamily.c H5FDmpio.c H5FDcore.c H5FDmulti.c H5FDgass.c H5G.c \ - H5Gent.c H5Gnode.c H5Gstab.c H5HG.c H5HL.c H5I.c H5MF.c H5MM.c H5O.c \ - H5Oattr.c H5Ocomp.c H5Ocont.c H5Odtype.c H5Oefl.c H5Ofill.c H5Olayout.c \ - H5Omtime.c H5Oname.c H5Onull.c H5Osdspace.c H5Oshared.c H5Ostab.c H5P.c \ - H5R.c H5RA.c H5S.c H5Sall.c H5Shyper.c H5Smpio.c H5Snone.c H5Spoint.c \ - H5Sselect.c H5T.c H5Tbit.c H5Tconv.c H5Tinit.c H5Tvlen.c H5TB.c H5V.c \ - H5Z.c H5Zdeflate.c + H5FD.c H5FDsec2.c H5FDfamily.c H5FDmpio.c H5FDcore.c H5FDmulti.c \ + H5FDgass.c H5G.c H5Gent.c H5Gnode.c H5Gstab.c H5HG.c H5HL.c H5I.c H5MF.c \ + H5MM.c H5O.c H5Oattr.c H5Ocomp.c H5Ocont.c H5Odtype.c H5Oefl.c H5Ofill.c \ + H5Olayout.c H5Omtime.c H5Oname.c H5Onull.c H5Osdspace.c H5Oshared.c \ + H5Ostab.c H5P.c H5R.c H5RA.c H5S.c H5Sall.c H5Shyper.c H5Smpio.c \ + H5Snone.c H5Spoint.c H5Sselect.c H5T.c H5Tbit.c H5Tconv.c H5Tinit.c \ + H5Tvlen.c H5TB.c H5V.c H5Z.c H5Zdeflate.c LIB_OBJ=$(LIB_SRC:.c=.lo) @@ -37,10 +37,10 @@ MOSTLYCLEAN=H5detect.o H5detect H5Tinit.o H5Tinit.c ## Public header files (to be installed)... PUB_HDR=H5public.h H5Apublic.h H5ACpublic.h H5Bpublic.h H5Dpublic.h \ - H5Epublic.h H5Fpublic.h H5FDpublic.h H5FDfamily.h H5FDmpio.h H5FDsec2.h \ - H5FDcore.h H5FDmulti.h H5Gpublic.h H5HGpublic.h H5HLpublic.h H5Ipublic.h \ - H5MMpublic.h H5Opublic.h H5Ppublic.h H5Rpublic.h H5RApublic.h H5Spublic.h \ - H5Tpublic.h H5Zpublic.h H5config.h hdf5.h H5api_adpt.h + H5Epublic.h H5Fpublic.h H5FDpublic.h H5FDfamily.h H5FDgass.h H5FDmpio.h \ + H5FDsec2.h H5FDcore.h H5FDmulti.h H5Gpublic.h H5HGpublic.h H5HLpublic.h \ + H5Ipublic.h H5MMpublic.h H5Opublic.h H5Ppublic.h H5Rpublic.h H5RApublic.h \ + H5Spublic.h H5Tpublic.h H5Zpublic.h H5config.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 \ diff --git a/tools/h5ls.c b/tools/h5ls.c index 4d4d978..3e5b1a4 100644 --- a/tools/h5ls.c +++ b/tools/h5ls.c @@ -2133,7 +2133,7 @@ main (int argc, char *argv[]) *oname = '\0'; } if (file<0) { - fprintf(stderr, "%s: unable to open file\n", fname); + fprintf(stderr, "%s: unable to open file\n", argv[argno-1]); } if (oname) oname++; if (!oname || !*oname) oname = root_name; diff --git a/tools/h5tools.c b/tools/h5tools.c index 5dbb7ff..2eca598 100644 --- a/tools/h5tools.c +++ b/tools/h5tools.c @@ -1426,7 +1426,6 @@ h5dump_simple_mem(FILE *stream, const h5dump_t *info, hid_t type, hid_t space, void *mem) { hsize_t i; /*counters */ - size_t size; /*size of each element */ hsize_t nelmts; /*total selected elmts */ h5dump_context_t ctx; /*printing context */ @@ -1447,7 +1446,6 @@ h5dump_simple_mem(FILE *stream, const h5dump_t *info, hid_t type, nelmts *= ctx.p_max_idx[i] - ctx.p_min_idx[i]; } if (0==nelmts) return 0; /*nothing to print*/ - size = H5Tget_size(type); /* Print it */ h5dump_simple_data(stream, info, -1/*no dataset*/, &ctx, |