summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/.distdep952
-rw-r--r--src/H5A.c6
-rw-r--r--src/H5D.c22
-rw-r--r--src/H5Epublic.h2
-rw-r--r--src/H5Fpublic.h2
-rw-r--r--src/H5G.c14
-rw-r--r--src/H5Gprivate.h24
-rw-r--r--src/H5Gpublic.h2
-rw-r--r--src/H5Oattr.c3
-rw-r--r--src/H5Omtime.c4
-rw-r--r--src/H5R.c12
-rw-r--r--src/H5S.c26
-rw-r--r--src/H5Sall.c17
-rw-r--r--src/H5Shyper.c11
-rw-r--r--src/H5Spoint.c5
-rw-r--r--src/H5Sprivate.h12
-rw-r--r--src/H5Sselect.c95
-rw-r--r--test/.distdep341
-rw-r--r--test/links.c18
-rw-r--r--test/mtime.c10
-rw-r--r--test/tselect.c17
-rw-r--r--tools/h5dump.c2
-rw-r--r--tools/h5ls.c2
23 files changed, 794 insertions, 805 deletions
diff --git a/src/.distdep b/src/.distdep
index 1dfad4c..5309fd5 100644
--- a/src/.distdep
+++ b/src/.distdep
@@ -1,3 +1,172 @@
+H5.o: \
+ H5.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5ACprivate.h \
+ H5ACpublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Ipublic.h \
+ H5Dpublic.h \
+ H5Bprivate.h \
+ H5Bpublic.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5Iprivate.h \
+ H5MMprivate.h \
+ H5MMpublic.h \
+ H5Pprivate.h \
+ H5Ppublic.h \
+ H5Zpublic.h \
+ H5Sprivate.h \
+ H5Spublic.h \
+ H5Gprivate.h \
+ H5Gpublic.h \
+ H5Oprivate.h \
+ H5Opublic.h \
+ H5HGprivate.h \
+ H5HGpublic.h \
+ H5Tprivate.h \
+ H5Tpublic.h
+H5A.o: \
+ H5A.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5Iprivate.h \
+ H5Ipublic.h \
+ H5Bprivate.h \
+ H5Bpublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Dpublic.h \
+ H5Dprivate.h \
+ H5Gprivate.h \
+ H5Gpublic.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 \
+ H5MMprivate.h \
+ H5MMpublic.h \
+ H5Pprivate.h \
+ H5Ppublic.h \
+ H5Apkg.h \
+ H5Aprivate.h
+H5AC.o: \
+ H5AC.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5ACprivate.h \
+ H5ACpublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Ipublic.h \
+ H5Dpublic.h \
+ H5Eprivate.h \
+ H5Epublic.h
+H5B.o: \
+ H5B.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5ACprivate.h \
+ H5ACpublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Ipublic.h \
+ H5Dpublic.h \
+ H5Bprivate.h \
+ H5Bpublic.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5MFprivate.h \
+ H5MFpublic.h \
+ H5MMprivate.h
+H5D.o: \
+ H5D.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5Iprivate.h \
+ H5Ipublic.h \
+ H5ACprivate.h \
+ H5ACpublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Dpublic.h \
+ H5Dprivate.h \
+ H5Gprivate.h \
+ H5Gpublic.h \
+ H5Bprivate.h \
+ H5Bpublic.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 \
+ H5HLprivate.h \
+ H5HLpublic.h \
+ H5MFprivate.h \
+ H5MFpublic.h
+H5E.o: \
+ H5E.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5Iprivate.h \
+ H5Ipublic.h \
+ H5Eprivate.h
+H5F.o: \
+ H5F.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 \
+ H5Iprivate.h \
+ H5ACprivate.h \
+ H5ACpublic.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5MMprivate.h \
+ H5MMpublic.h
H5Farray.o: \
H5Farray.c \
H5private.h \
@@ -34,6 +203,83 @@ H5Fcore.o: \
H5Eprivate.h \
H5Epublic.h \
H5Ipublic.h
+H5Ffamily.o: \
+ H5Ffamily.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5Ipublic.h
+H5Fistore.o: \
+ H5Fistore.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5Dprivate.h \
+ H5Dpublic.h \
+ H5Ipublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Gprivate.h \
+ H5Gpublic.h \
+ H5Bprivate.h \
+ H5Bpublic.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 \
+ H5MFprivate.h \
+ H5MFpublic.h
+H5Flow.o: \
+ H5Flow.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5Ipublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Dpublic.h \
+ H5MMprivate.h \
+ H5MMpublic.h
+H5Fmpio.o: \
+ H5Fmpio.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5Ipublic.h \
+ H5Dprivate.h \
+ H5Dpublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Gprivate.h \
+ H5Gpublic.h \
+ H5Bprivate.h \
+ H5Bpublic.h \
+ H5Oprivate.h \
+ H5Opublic.h \
+ H5HGprivate.h \
+ H5HGpublic.h \
+ H5Tprivate.h \
+ H5Tpublic.h \
+ H5Sprivate.h \
+ H5Spublic.h \
+ H5Zprivate.h \
+ H5Zpublic.h \
+ H5MMprivate.h \
+ H5MMpublic.h
H5Fsec2.o: \
H5Fsec2.c \
H5private.h \
@@ -73,6 +319,39 @@ H5Fstdio.o: \
H5Dpublic.h \
H5MMprivate.h \
H5MMpublic.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
H5Gent.o: \
H5Gent.c \
H5private.h \
@@ -91,6 +370,39 @@ H5Gent.o: \
H5Gpublic.h \
H5Bprivate.h \
H5Bpublic.h
+H5Gnode.o: \
+ H5Gnode.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5ACprivate.h \
+ H5ACpublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Ipublic.h \
+ H5Dpublic.h \
+ H5Bprivate.h \
+ H5Bpublic.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5Gpkg.h \
+ H5Gprivate.h \
+ H5Gpublic.h \
+ H5HLprivate.h \
+ H5HLpublic.h \
+ H5MFprivate.h \
+ H5MFpublic.h \
+ H5MMprivate.h \
+ H5MMpublic.h \
+ H5Oprivate.h \
+ H5Opublic.h \
+ H5HGprivate.h \
+ H5HGpublic.h \
+ H5Tprivate.h \
+ H5Tpublic.h \
+ H5Sprivate.h \
+ H5Spublic.h \
+ H5Zprivate.h
H5Gstab.o: \
H5Gstab.c \
H5private.h \
@@ -138,6 +450,24 @@ H5HG.o: \
H5MFprivate.h \
H5MFpublic.h \
H5MMprivate.h
+H5HL.o: \
+ H5HL.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5ACprivate.h \
+ H5ACpublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Ipublic.h \
+ H5Dpublic.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5HLprivate.h \
+ H5HLpublic.h \
+ H5MFprivate.h \
+ H5MFpublic.h \
+ H5MMprivate.h
H5I.o: \
H5I.c \
H5private.h \
@@ -146,6 +476,14 @@ H5I.o: \
H5Iprivate.h \
H5Ipublic.h \
H5Eprivate.h
+H5MF.o: \
+ H5MF.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5Ipublic.h
H5MM.o: \
H5MM.c \
H5private.h \
@@ -154,6 +492,34 @@ H5MM.o: \
H5Eprivate.h \
H5Epublic.h \
H5Ipublic.h
+H5O.o: \
+ H5O.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5ACprivate.h \
+ H5ACpublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Ipublic.h \
+ H5Dpublic.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5MFprivate.h \
+ H5MFpublic.h \
+ H5MMprivate.h \
+ H5MMpublic.h \
+ H5Oprivate.h \
+ H5Opublic.h \
+ H5Gprivate.h \
+ H5Gpublic.h \
+ H5Bprivate.h \
+ H5Bpublic.h \
+ H5HGprivate.h \
+ H5HGpublic.h \
+ H5Tprivate.h \
+ H5Tpublic.h \
+ H5Sprivate.h
H5Oattr.o: \
H5Oattr.c \
H5private.h \
@@ -302,6 +668,29 @@ H5Olayout.o: \
H5Sprivate.h \
H5Spublic.h \
H5Zprivate.h
+H5Omtime.o: \
+ H5Omtime.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5Ipublic.h \
+ H5MMprivate.h \
+ H5MMpublic.h \
+ H5Oprivate.h \
+ H5Opublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Dpublic.h \
+ H5Gprivate.h \
+ H5Gpublic.h \
+ H5Bprivate.h \
+ H5Bpublic.h \
+ H5HGprivate.h \
+ H5HGpublic.h \
+ H5Tprivate.h \
+ H5Tpublic.h
H5Oname.o: \
H5Oname.c \
H5private.h \
@@ -412,135 +801,85 @@ H5Ostab.o: \
H5HGpublic.h \
H5Tprivate.h \
H5Tpublic.h
-H5Sall.o: \
- H5Sall.c \
+H5P.o: \
+ H5P.c \
H5private.h \
H5public.h \
H5config.h \
- H5Eprivate.h \
- H5Epublic.h \
+ H5Iprivate.h \
H5Ipublic.h \
- H5Sprivate.h \
- H5Spublic.h \
- H5Gprivate.h \
- H5Gpublic.h \
H5Bprivate.h \
H5Bpublic.h \
H5Fprivate.h \
H5Fpublic.h \
H5Dpublic.h \
+ H5Dprivate.h \
+ H5Gprivate.h \
+ H5Gpublic.h \
H5Oprivate.h \
H5Opublic.h \
H5HGprivate.h \
H5HGpublic.h \
H5Tprivate.h \
- H5Tpublic.h
-H5Tbit.o: \
- H5Tbit.c \
- H5private.h \
- H5public.h \
- H5config.h \
+ H5Tpublic.h \
+ H5Sprivate.h \
+ H5Spublic.h \
+ H5Zprivate.h \
+ H5Zpublic.h \
H5Eprivate.h \
H5Epublic.h \
+ H5MMprivate.h
+H5R.o: \
+ H5R.c \
+ H5Rprivate.h \
+ H5Rpublic.h \
H5Ipublic.h \
- H5Iprivate.h \
- H5Tpkg.h \
- H5HGprivate.h \
- H5HGpublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.h \
- H5Tprivate.h \
- H5Tpublic.h \
- H5Gprivate.h
-H5V.o: \
- H5V.c \
- H5private.h \
H5public.h \
H5config.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5Ipublic.h \
- H5Oprivate.h \
- H5Opublic.h \
+ H5Dprivate.h \
+ H5Dpublic.h \
+ H5private.h \
H5Fprivate.h \
H5Fpublic.h \
- H5Dpublic.h \
H5Gprivate.h \
H5Gpublic.h \
H5Bprivate.h \
H5Bpublic.h \
+ H5Oprivate.h \
+ H5Opublic.h \
H5HGprivate.h \
H5HGpublic.h \
H5Tprivate.h \
H5Tpublic.h \
H5Sprivate.h \
- H5Spublic.h
-H5AC.o: \
- H5AC.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5ACprivate.h \
- H5ACpublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Ipublic.h \
- H5Dpublic.h \
+ H5Spublic.h \
+ H5Zprivate.h \
+ H5Zpublic.h \
H5Eprivate.h \
H5Epublic.h
-H5Ffamily.o: \
- H5Ffamily.c \
+H5Sall.o: \
+ H5Sall.c \
H5private.h \
H5public.h \
H5config.h \
H5Eprivate.h \
H5Epublic.h \
- H5Ipublic.h
-H5Fistore.o: \
- H5Fistore.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5Dprivate.h \
- H5Dpublic.h \
H5Ipublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
+ H5Sprivate.h \
+ H5Spublic.h \
H5Gprivate.h \
H5Gpublic.h \
H5Bprivate.h \
H5Bpublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Dpublic.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 \
- H5MFprivate.h \
- H5MFpublic.h
-H5E.o: \
- H5E.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5Iprivate.h \
- H5Ipublic.h \
- H5Eprivate.h
-H5MF.o: \
- H5MF.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5Ipublic.h
+ H5Tpublic.h
H5Shyper.o: \
H5Shyper.c \
H5private.h \
@@ -564,92 +903,29 @@ H5Shyper.o: \
H5HGpublic.h \
H5Tprivate.h \
H5Tpublic.h
-H5Tconv.o: \
- H5Tconv.c \
- H5Iprivate.h \
- H5Ipublic.h \
- H5public.h \
- H5config.h \
- H5private.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5MMprivate.h \
- H5MMpublic.h \
- H5Tpkg.h \
- H5HGprivate.h \
- H5HGpublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.h \
- H5Tprivate.h \
- H5Tpublic.h \
- H5Gprivate.h \
- H5Gpublic.h \
- H5Bprivate.h \
- H5Bpublic.h
-H5Z.o: \
- H5Z.c \
+H5Smpio.o: \
+ H5Smpio.c \
H5private.h \
H5public.h \
H5config.h \
H5Eprivate.h \
H5Epublic.h \
H5Ipublic.h \
- H5MMprivate.h \
- H5MMpublic.h \
- H5Oprivate.h \
- H5Opublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.h \
- H5Gprivate.h \
- H5Gpublic.h \
- H5Bprivate.h \
- H5Bpublic.h \
- H5HGprivate.h \
- H5HGpublic.h \
- H5Tprivate.h \
- H5Tpublic.h \
H5Sprivate.h \
H5Spublic.h \
- H5Zprivate.h \
- H5Zpublic.h
-H5P.o: \
- H5P.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5Iprivate.h \
- H5Ipublic.h \
+ H5Gprivate.h \
+ H5Gpublic.h \
H5Bprivate.h \
H5Bpublic.h \
H5Fprivate.h \
H5Fpublic.h \
H5Dpublic.h \
- H5Dprivate.h \
- H5Gprivate.h \
- H5Gpublic.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 \
- H5MMprivate.h
-H5TB.o: \
- H5TB.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5Iprivate.h \
- H5Ipublic.h \
- H5Eprivate.h
+ H5Tpublic.h
H5Spoint.o: \
H5Spoint.c \
H5private.h \
@@ -673,75 +949,19 @@ H5Spoint.o: \
H5Opublic.h \
H5HGprivate.h \
H5HGpublic.h
-H5R.o: \
- H5R.c \
- H5Rprivate.h \
- H5Rpublic.h \
- H5Ipublic.h \
- H5public.h \
- H5config.h \
- H5Dprivate.h \
- H5Dpublic.h \
- H5private.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Gprivate.h \
- H5Gpublic.h \
- H5Bprivate.h \
- H5Bpublic.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
-H5D.o: \
- H5D.c \
+H5Sselect.o: \
+ H5Sselect.c \
H5private.h \
H5public.h \
H5config.h \
- H5Iprivate.h \
- H5Ipublic.h \
- H5ACprivate.h \
- H5ACpublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.h \
- H5Dprivate.h \
- H5Gprivate.h \
- H5Gpublic.h \
- H5Bprivate.h \
- H5Bpublic.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 \
- H5HLprivate.h \
- H5HLpublic.h \
- H5MFprivate.h \
- H5MFpublic.h
-H5F.o: \
- H5F.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5Aprivate.h \
- H5Apublic.h \
H5Ipublic.h \
+ H5Iprivate.h \
+ H5MMprivate.h \
+ H5MMpublic.h \
+ H5Sprivate.h \
+ H5Spublic.h \
H5Gprivate.h \
H5Gpublic.h \
H5Bprivate.h \
@@ -749,24 +969,14 @@ H5F.o: \
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 \
- H5Iprivate.h \
- H5ACprivate.h \
- H5ACpublic.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5MMprivate.h \
- H5MMpublic.h
+ H5Zpublic.h
H5T.o: \
H5T.c \
H5private.h \
@@ -795,249 +1005,81 @@ H5T.o: \
H5Eprivate.h \
H5Epublic.h \
H5MMprivate.h
-H5.o: \
- H5.c \
+H5Tbit.o: \
+ H5Tbit.c \
H5private.h \
H5public.h \
H5config.h \
- H5ACprivate.h \
- H5ACpublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Ipublic.h \
- H5Dpublic.h \
- H5Bprivate.h \
- H5Bpublic.h \
H5Eprivate.h \
H5Epublic.h \
+ H5Ipublic.h \
H5Iprivate.h \
- H5MMprivate.h \
- H5MMpublic.h \
- H5Pprivate.h \
- H5Ppublic.h \
- H5Zpublic.h \
- H5Sprivate.h \
- H5Spublic.h \
- H5Gprivate.h \
- H5Gpublic.h \
- H5Oprivate.h \
- H5Opublic.h \
+ H5Tpkg.h \
H5HGprivate.h \
H5HGpublic.h \
- H5Tprivate.h \
- H5Tpublic.h
-H5A.o: \
- H5A.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5Iprivate.h \
- H5Ipublic.h \
- H5Bprivate.h \
- H5Bpublic.h \
H5Fprivate.h \
H5Fpublic.h \
H5Dpublic.h \
- H5Dprivate.h \
- H5Gprivate.h \
- H5Gpublic.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 \
- H5MMprivate.h \
- H5MMpublic.h \
- H5Pprivate.h \
- H5Ppublic.h \
- H5Apkg.h \
- H5Aprivate.h
-H5B.o: \
- H5B.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5ACprivate.h \
- H5ACpublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
+ H5Gprivate.h
+H5Tconv.o: \
+ H5Tconv.c \
+ H5Iprivate.h \
H5Ipublic.h \
- H5Dpublic.h \
- H5Bprivate.h \
- H5Bpublic.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5Fmpioprivate.h \
- H5MFprivate.h \
- H5MFpublic.h
-H5Flow.o: \
- H5Flow.c \
- H5private.h \
H5public.h \
H5config.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5Ipublic.h \
- H5Fmpioprivate.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.h \
- H5MMprivate.h
-H5Fmpio.o: \
- H5Fmpio.c \
H5private.h \
- H5public.h \
- H5config.h \
H5Eprivate.h \
H5Epublic.h \
- H5Ipublic.h \
- H5Dprivate.h \
- H5Dpublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Gprivate.h \
- H5Gpublic.h \
- H5Bprivate.h \
- H5Bpublic.h \
- H5Oprivate.h \
- H5Opublic.h \
+ H5MMprivate.h \
+ H5MMpublic.h \
+ H5Tpkg.h \
H5HGprivate.h \
H5HGpublic.h \
- H5Tprivate.h \
- H5Tpublic.h \
- H5Sprivate.h \
- H5Spublic.h \
- H5Zprivate.h \
- H5Zpublic.h \
- H5MMprivate.h \
- H5MMpublic.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
-H5Gnode.o: \
- H5Gnode.c \
+ H5Gprivate.h \
+ H5Gpublic.h \
+ H5Bprivate.h \
+ H5Bpublic.h
+H5Tinit.o: \
+ H5Tinit.c \
H5private.h \
H5public.h \
H5config.h \
- H5ACprivate.h \
- H5ACpublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
+ H5Iprivate.h \
H5Ipublic.h \
- H5Dpublic.h \
- H5Bprivate.h \
- H5Bpublic.h \
H5Eprivate.h \
H5Epublic.h \
- H5Fmpioprivate.h \
- H5Gpkg.h \
- H5Gprivate.h \
- H5Gpublic.h \
- H5HLprivate.h \
- H5HLpublic.h \
- H5MFprivate.h \
- H5MFpublic.h \
H5MMprivate.h \
H5MMpublic.h \
- H5Oprivate.h \
- H5Opublic.h \
+ H5Tpkg.h \
H5HGprivate.h \
H5HGpublic.h \
- H5Tprivate.h \
- H5Tpublic.h \
- H5Sprivate.h \
- H5Spublic.h
-H5HL.o: \
- H5HL.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5ACprivate.h \
- H5ACpublic.h \
H5Fprivate.h \
H5Fpublic.h \
- H5Ipublic.h \
H5Dpublic.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5Fmpioprivate.h \
- H5HLprivate.h \
- H5HLpublic.h \
- H5MFprivate.h
-H5O.o: \
- H5O.c \
+ H5Tprivate.h
+H5TB.o: \
+ H5TB.c \
H5private.h \
H5public.h \
H5config.h \
- H5ACprivate.h \
- H5ACpublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
+ H5Iprivate.h \
H5Ipublic.h \
- H5Dpublic.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5Fmpioprivate.h \
- H5MFprivate.h \
- H5MFpublic.h \
- H5MMprivate.h \
- H5MMpublic.h \
- H5Oprivate.h \
- H5Opublic.h \
- H5Gprivate.h \
- H5Gpublic.h \
- H5Bprivate.h \
- H5Bpublic.h \
- H5HGprivate.h \
- H5HGpublic.h \
- H5Tprivate.h
-H5Omtime.o: \
- H5Omtime.c \
+ H5Eprivate.h
+H5V.o: \
+ H5V.c \
H5private.h \
H5public.h \
H5config.h \
H5Eprivate.h \
H5Epublic.h \
H5Ipublic.h \
- H5MMprivate.h \
- H5MMpublic.h \
H5Oprivate.h \
H5Opublic.h \
H5Fprivate.h \
@@ -1050,16 +1092,17 @@ H5Omtime.o: \
H5HGprivate.h \
H5HGpublic.h \
H5Tprivate.h \
- H5Tpublic.h
-H5S.o: \
- H5S.c \
+ H5Tpublic.h \
+ H5Sprivate.h \
+ H5Spublic.h
+H5Z.o: \
+ H5Z.c \
H5private.h \
H5public.h \
H5config.h \
- H5Iprivate.h \
- H5Ipublic.h \
H5Eprivate.h \
H5Epublic.h \
+ H5Ipublic.h \
H5MMprivate.h \
H5MMpublic.h \
H5Oprivate.h \
@@ -1073,60 +1116,14 @@ H5S.o: \
H5Bpublic.h \
H5HGprivate.h \
H5HGpublic.h \
- H5Tprivate.h
-H5Smpio.o: \
- H5Smpio.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5Ipublic.h \
- H5Sprivate.h \
- H5Spublic.h \
- H5Gprivate.h \
- H5Gpublic.h \
- H5Bprivate.h \
- H5Bpublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.h \
- H5Oprivate.h \
- H5Opublic.h \
- H5HGprivate.h \
- H5HGpublic.h \
H5Tprivate.h \
- H5Tpublic.h
-H5Sselect.o: \
- H5Sselect.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5Ipublic.h \
- H5Iprivate.h \
- H5MMprivate.h \
- H5MMpublic.h \
+ H5Tpublic.h \
H5Sprivate.h \
H5Spublic.h \
- H5Gprivate.h \
- H5Gpublic.h \
- H5Bprivate.h \
- H5Bpublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.h \
- H5Oprivate.h \
- H5Opublic.h \
- H5HGprivate.h \
- H5HGpublic.h \
- H5Tprivate.h \
- H5Tpublic.h \
H5Zprivate.h \
H5Zpublic.h
-H5Tinit.o: \
- H5Tinit.c \
+H5S.o: \
+ H5S.c \
H5private.h \
H5public.h \
H5config.h \
@@ -1136,10 +1133,15 @@ H5Tinit.o: \
H5Epublic.h \
H5MMprivate.h \
H5MMpublic.h \
- H5Tpkg.h \
- H5HGprivate.h \
- H5HGpublic.h \
+ H5Oprivate.h \
+ H5Opublic.h \
H5Fprivate.h \
H5Fpublic.h \
H5Dpublic.h \
+ H5Gprivate.h \
+ H5Gpublic.h \
+ H5Bprivate.h \
+ H5Bpublic.h \
+ H5HGprivate.h \
+ H5HGpublic.h \
H5Tprivate.h
diff --git a/src/H5A.c b/src/H5A.c
index 01cec37..a30e114 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -251,7 +251,7 @@ H5A_create(const H5G_entry_t *ent, const char *name, const H5T_t *type,
attr->dt_size=(H5O_DTYPE[0].raw_size)(attr->ent.file,type);
attr->ds_size=(H5O_SDSPACE[0].raw_size)(attr->ent.file,
&(space->extent.u.simple));
- attr->data_size=H5S_extent_npoints(space)*H5T_get_size(type);
+ attr->data_size=H5S_get_simple_extent_npoints(space)*H5T_get_size(type);
/* Hold the symbol table entry (and file) open */
if (H5O_open(&(attr->ent)) < 0) {
@@ -630,7 +630,7 @@ H5A_write(H5A_t *attr, const H5T_t *mem_type, void *buf)
assert(buf);
/* Create buffer for data to store on disk */
- nelmts=H5S_extent_npoints (attr->ds);
+ nelmts=H5S_get_simple_extent_npoints (attr->ds);
/* Get the memory and file datatype sizes */
src_type_size = H5T_get_size(mem_type);
@@ -800,7 +800,7 @@ H5A_read(H5A_t *attr, const H5T_t *mem_type, void *buf)
assert(buf);
/* Create buffer for data to store on disk */
- nelmts=H5S_extent_npoints (attr->ds);
+ nelmts=H5S_get_simple_extent_npoints (attr->ds);
/* Get the memory and file datatype sizes */
src_type_size = H5T_get_size(attr->dt);
diff --git a/src/H5D.c b/src/H5D.c
index 4baf7df..aac4804 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -858,7 +858,7 @@ H5D_create(H5G_entry_t *loc, const char *name, const H5T_t *type,
/* Total raw data size */
new_dset->layout.type = new_dset->create_parms->layout;
- new_dset->layout.ndims = H5S_extent_ndims(space) + 1;
+ new_dset->layout.ndims = H5S_get_simple_extent_ndims(space) + 1;
assert((unsigned)(new_dset->layout.ndims) <= NELMTS(new_dset->layout.dim));
new_dset->layout.dim[new_dset->layout.ndims-1] = H5T_get_size(type);
@@ -869,7 +869,7 @@ H5D_create(H5G_entry_t *loc, const char *name, const H5T_t *type,
* Also, only the slowest varying dimension of a simple data space
* can be extendible.
*/
- if ((ndims=H5S_extent_dims(space, new_dset->layout.dim, max_dim))<0) {
+ if ((ndims=H5S_get_simple_extent_dims(space, new_dset->layout.dim, max_dim))<0) {
HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL,
"unable to initialize contiguous storage");
}
@@ -906,7 +906,7 @@ H5D_create(H5G_entry_t *loc, const char *name, const H5T_t *type,
* Chunked storage allows any type of data space extension, so we
* don't even bother checking.
*/
- if (new_dset->create_parms->chunk_ndims != H5S_extent_ndims(space)) {
+ if (new_dset->create_parms->chunk_ndims != H5S_get_simple_extent_ndims(space)) {
HGOTO_ERROR(H5E_DATASET, H5E_BADVALUE, NULL,
"dimensionality of chunks doesn't match the data space");
}
@@ -1319,7 +1319,7 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
file_space = free_this_space;
}
if (!mem_space) mem_space = file_space;
- nelmts = H5S_select_npoints(mem_space);
+ nelmts = H5S_get_select_npoints(mem_space);
#ifdef HAVE_PARALLEL
/*
@@ -1346,7 +1346,7 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
* enough value in xfer_parms since turning off data type conversion also
* turns off background preservation.
*/
- if (nelmts!=H5S_select_npoints (file_space)) {
+ if (nelmts!=H5S_get_select_npoints (file_space)) {
HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL,
"src and dest data spaces have different sizes");
}
@@ -1426,7 +1426,7 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
HGOTO_ERROR (H5E_DATASET, H5E_CANTINIT, FAIL,
"unable to initialize memory selection information");
}
- if ((sconv->m->binit)(&(dataset->layout), mem_space, &bkg_iter)<0) {
+ if ((sconv->m->init)(&(dataset->layout), mem_space, &bkg_iter)<0) {
HGOTO_ERROR (H5E_DATASET, H5E_CANTINIT, FAIL,
"unable to initialize background selection information");
}
@@ -1669,7 +1669,7 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
file_space = free_this_space;
}
if (!mem_space) mem_space = file_space;
- nelmts = H5S_select_npoints(mem_space);
+ nelmts = H5S_get_select_npoints(mem_space);
#ifdef HAVE_PARALLEL
/*
@@ -1699,7 +1699,7 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
#ifdef QAK
printf("%s: check 0.5, nelmts=%d, mem_space->rank=%d\n",FUNC,(int)nelmts,mem_space->extent.u.simple.rank);
#endif /* QAK */
- if (nelmts!=H5S_select_npoints (file_space)) {
+ if (nelmts!=H5S_get_select_npoints (file_space)) {
HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL,
"src and dest data spaces have different sizes");
}
@@ -1778,7 +1778,7 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
HGOTO_ERROR (H5E_DATASET, H5E_CANTINIT, FAIL,
"unable to initialize memory selection information");
}
- if ((sconv->m->binit)(&(dataset->layout), mem_space, &bkg_iter)<0) {
+ if ((sconv->f->init)(&(dataset->layout), file_space, &bkg_iter)<0) {
HGOTO_ERROR (H5E_DATASET, H5E_CANTINIT, FAIL,
"unable to initialize memory selection information");
}
@@ -1940,7 +1940,7 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
/* Release selection iterators */
H5S_sel_iter_release(file_space,&file_iter);
H5S_sel_iter_release(mem_space,&mem_iter);
- H5S_sel_iter_release(mem_space,&bkg_iter);
+ H5S_sel_iter_release(file_space,&bkg_iter);
if (src_id >= 0) H5I_dec_ref(src_id);
if (dst_id >= 0) H5I_dec_ref(dst_id);
@@ -2130,7 +2130,7 @@ H5D_allocate (H5D_t *dataset)
"unable to read data space info from dataset header");
}
/* get current dims of dataset */
- if ((space_ndims=H5S_extent_dims(space, space_dim, NULL)) <= 0 ||
+ if ((space_ndims=H5S_get_simple_extent_dims(space, space_dim, NULL)) <= 0 ||
space_ndims+1 != layout->ndims){
HRETURN_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL,
"unable to allocate chunk storage");
diff --git a/src/H5Epublic.h b/src/H5Epublic.h
index f930f98..6415b60 100644
--- a/src/H5Epublic.h
+++ b/src/H5Epublic.h
@@ -25,7 +25,7 @@
/*
* One often needs to temporarily disable automatic error reporting when
* trying something that's likely or expected to fail. For instance, to
- * determine if an object exists one can call H5Gget_stat() which will fail if
+ * determine if an object exists one can call H5Gget_objinfo() which will fail if
* the object doesn't exist. The code to try can be nested between calls to
* H5Eget_auto() and H5Eset_auto(), but it's easier just to use this macro
* like:
diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h
index 90efdfa..55f7f3d 100644
--- a/src/H5Fpublic.h
+++ b/src/H5Fpublic.h
@@ -23,7 +23,7 @@
/*
* These are the bits that can be passed to the `flags' argument of
* H5Fcreate() and H5Fopen(). Use the bit-wise OR operator (|) to combine
- * them as needed. As a side effect, they call H5vers_check() to make sure
+ * them as needed. As a side effect, they call H5check_version() to make sure
* that the application is compiled with a version of the hdf5 header files
* which are compatible with the library to which the application is linked.
* We're assuming that these constants are used rather early in the hdf5
diff --git a/src/H5G.c b/src/H5G.c
index 64a99db..581bd7e 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -631,7 +631,7 @@ H5Gunlink(hid_t __unused__ loc_id, const char __unused__ *name)
/*-------------------------------------------------------------------------
- * Function: H5Gget_stat
+ * Function: H5Gget_objinfo
*
* Purpose: Returns information about an object. If FOLLOW_LINK is
* non-zero then all symbolic links are followed; otherwise all
@@ -650,12 +650,12 @@ H5Gunlink(hid_t __unused__ loc_id, const char __unused__ *name)
*-------------------------------------------------------------------------
*/
herr_t
-H5Gget_stat(hid_t loc_id, const char *name, hbool_t follow_link,
+H5Gget_objinfo(hid_t loc_id, const char *name, hbool_t follow_link,
H5G_stat_t *statbuf/*out*/)
{
H5G_entry_t *loc = NULL;
- FUNC_ENTER (H5Gget_stat, FAIL);
+ FUNC_ENTER (H5Gget_objinfo, FAIL);
H5TRACE4("e","isbx",loc_id,name,follow_link,statbuf);
/* Check arguments */
@@ -667,7 +667,7 @@ H5Gget_stat(hid_t loc_id, const char *name, hbool_t follow_link,
}
/* Get info */
- if (H5G_stat (loc, name, follow_link, statbuf)<0) {
+ if (H5G_get_objinfo (loc, name, follow_link, statbuf)<0) {
HRETURN_ERROR (H5E_ARGS, H5E_CANTINIT, FAIL, "cannot stat object");
}
@@ -2022,7 +2022,7 @@ H5G_link (H5G_entry_t *loc, H5G_link_t type, const char *cur_name,
/*-------------------------------------------------------------------------
- * Function: H5G_stat
+ * Function: H5G_get_objinfo
*
* Purpose: Returns information about an object.
*
@@ -2039,7 +2039,7 @@ H5G_link (H5G_entry_t *loc, H5G_link_t type, const char *cur_name,
*-------------------------------------------------------------------------
*/
herr_t
-H5G_stat (H5G_entry_t *loc, const char *name, hbool_t follow_link,
+H5G_get_objinfo (H5G_entry_t *loc, const char *name, hbool_t follow_link,
H5G_stat_t *statbuf/*out*/)
{
H5O_stab_t stab_mesg;
@@ -2049,7 +2049,7 @@ H5G_stat (H5G_entry_t *loc, const char *name, hbool_t follow_link,
H5G_t *temp_grp = NULL;
H5T_t *temp_type = NULL;
- FUNC_ENTER (H5G_stat, FAIL);
+ FUNC_ENTER (H5G_get_objinfo, FAIL);
assert (loc);
assert (name && *name);
diff --git a/src/H5Gprivate.h b/src/H5Gprivate.h
index 991b343..be7113e 100644
--- a/src/H5Gprivate.h
+++ b/src/H5Gprivate.h
@@ -99,29 +99,30 @@ typedef struct H5G_t H5G_t;
* Library prototypes... These are the ones that other packages routinely
* call.
*/
-H5G_t *H5G_loc (hid_t loc_id);
+H5G_entry_t *H5G_loc (hid_t loc_id);
herr_t H5G_mkroot (H5F_t *f, H5G_entry_t *root_entry);
H5G_entry_t *H5G_entof (H5G_t *grp);
H5F_t *H5G_fileof (H5G_t *grp);
-H5G_t *H5G_create (H5G_t *loc, const char *name, size_t size_hint);
-H5G_t *H5G_open (H5G_t *loc, const char *name);
+H5G_t *H5G_create (H5G_entry_t *loc, const char *name, size_t size_hint);
+H5G_t *H5G_open (H5G_entry_t *loc, const char *name);
H5G_t *H5G_reopen (H5G_t *grp);
herr_t H5G_close (H5G_t *grp);
herr_t H5G_set (H5G_t *grp);
herr_t H5G_push (H5G_t *grp);
herr_t H5G_pop (H5F_t *f);
H5G_t *H5G_getcwg(H5F_t *f);
-herr_t H5G_link (H5G_t *loc, H5G_link_t type, const char *cur_name,
+herr_t H5G_link (H5G_entry_t *loc, H5G_link_t type, const char *cur_name,
const char *new_name);
-herr_t H5G_stat (H5G_t *loc, const char *name, hbool_t follow_link,
+herr_t H5G_get_objinfo (H5G_entry_t *loc, const char *name, hbool_t follow_link,
H5G_stat_t *statbuf/*out*/);
-herr_t H5G_linkval (H5G_t *loc, const char *name, size_t size,
+herr_t H5G_linkval (H5G_entry_t *loc, const char *name, size_t size,
char *buf/*out*/);
-herr_t H5G_set_comment(H5G_t *loc, const char *name, const char *buf);
-intn H5G_get_comment(H5G_t *loc, const char *name, size_t bufsize, char *buf);
-herr_t H5G_insert (H5G_t *cwg, const char *name, H5G_entry_t *ent);
-herr_t H5G_find (H5G_t *cwg, const char *name, H5G_entry_t *grp_ent/*out*/,
- H5G_entry_t *ent/*out*/);
+herr_t H5G_set_comment(H5G_entry_t *loc, const char *name, const char *buf);
+intn H5G_get_comment(H5G_entry_t *loc, const char *name, size_t bufsize,
+ char *buf);
+herr_t H5G_insert (H5G_entry_t *loc, const char *name, H5G_entry_t *ent);
+herr_t H5G_find (H5G_entry_t *loc, const char *name,
+ H5G_entry_t *grp_ent/*out*/, H5G_entry_t *ent/*out*/);
herr_t H5G_traverse_slink (H5G_entry_t *grp_ent/*in,out*/,
H5G_entry_t *obj_ent/*in,out*/,
intn *nlinks/*in,out*/);
@@ -144,4 +145,3 @@ herr_t H5G_ent_modified (H5G_entry_t *ent, H5G_type_t cache_type);
herr_t H5G_ent_debug (H5F_t *f, const H5G_entry_t *ent, FILE * stream,
intn indent, intn fwidth, const haddr_t *heap);
#endif
-
diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h
index a116253..d5e9a3e 100644
--- a/src/H5Gpublic.h
+++ b/src/H5Gpublic.h
@@ -68,7 +68,7 @@ herr_t H5Gmove (hid_t loc_id, const char *src, const char *dst);
herr_t H5Glink (hid_t loc_id, H5G_link_t type, const char *cur_name,
const char *new_name);
herr_t H5Gunlink (hid_t loc_id, const char *name);
-herr_t H5Gget_stat (hid_t loc_id, const char *name, hbool_t follow_link,
+herr_t H5Gget_objinfo (hid_t loc_id, const char *name, hbool_t follow_link,
H5G_stat_t *statbuf/*out*/);
herr_t H5Gget_linkval (hid_t loc_id, const char *name, size_t size,
char *buf/*out*/);
diff --git a/src/H5Oattr.c b/src/H5Oattr.c
index eaa80ba..8665e11 100644
--- a/src/H5Oattr.c
+++ b/src/H5Oattr.c
@@ -149,7 +149,7 @@ H5O_attr_decode(H5F_t *f, const uint8 *p, H5O_shared_t __unused__ *sh)
p += H5O_ALIGN(attr->ds_size);
/* Compute the size of the data */
- attr->data_size=H5S_extent_npoints(attr->ds)*H5T_get_size(attr->dt);
+ attr->data_size=H5S_get_simple_extent_npoints(attr->ds)*H5T_get_size(attr->dt);
/* Go get the data */
if (NULL==(attr->data = H5MM_malloc(attr->data_size))) {
@@ -433,4 +433,3 @@ H5O_attr_debug(H5F_t *f, const void *_mesg, FILE * stream, intn indent,
FUNC_LEAVE(SUCCEED);
}
-
diff --git a/src/H5Omtime.c b/src/H5Omtime.c
index 6115f51..d55f179 100644
--- a/src/H5Omtime.c
+++ b/src/H5Omtime.c
@@ -136,8 +136,8 @@ H5O_mtime_decode(H5F_t __unused__ *f, const uint8 *p,
* The catch-all. If we can't convert a character string universal
* coordinated time to a time_t value reliably then we can't decode the
* modification time message. This really isn't as bad as it sounds --
- * the only way a user can get the modification time is from H5Gget_stat()
- * and H5G_stat() can gracefully recover.
+ * the only way a user can get the modification time is from H5Gget_objinfo()
+ * and H5G_get_objinfo() can gracefully recover.
*/
/* Irix64 */
diff --git a/src/H5R.c b/src/H5R.c
index 8960259..c017527 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -655,7 +655,7 @@ H5R_write(H5R_t *ra, hssize_t start_row, hsize_t nrows, H5T_t *type,
/* Get the meta data */
if (NULL==(mf_space=H5D_get_space(ra->meta)) ||
- H5S_extent_dims(mf_space, &meta_cur_size, NULL)<0) {
+ H5S_get_simple_extent_dims(mf_space, &meta_cur_size, NULL)<0) {
HGOTO_ERROR(H5E_RAGGED, H5E_CANTINIT, FAIL,
"unable to get current meta data extents");
}
@@ -685,7 +685,7 @@ H5R_write(H5R_t *ra, hssize_t start_row, hsize_t nrows, H5T_t *type,
/* Write the part of the data that will fit in the raw dataset */
if (NULL==(rf_space=H5D_get_space(ra->raw)) ||
- H5S_extent_dims(rf_space, raw_cur_size, NULL)<0) {
+ H5S_get_simple_extent_dims(rf_space, raw_cur_size, NULL)<0) {
HGOTO_ERROR(H5E_RAGGED, H5E_CANTINIT, FAIL,
"unable to determine current raw data extents");
}
@@ -823,7 +823,7 @@ H5R_fix_overflow(H5R_t *ra, H5T_t *type, H5R_meta_t *meta, hsize_t nelmts,
* region to the end of the file and be careful to reclaim space.
*/
if (NULL==(of_space=H5D_get_space(ra->over)) ||
- H5S_extent_dims(of_space, &cur_size, NULL)<0) {
+ H5S_get_simple_extent_dims(of_space, &cur_size, NULL)<0) {
HGOTO_ERROR(H5E_RAGGED, H5E_CANTINIT, FAIL,
"unable to get overflow dataset extents");
}
@@ -840,7 +840,7 @@ H5R_fix_overflow(H5R_t *ra, H5T_t *type, H5R_meta_t *meta, hsize_t nelmts,
/* No space is allocated */
assert(nelmts>0);
if (NULL==(of_space=H5D_get_space(ra->over)) ||
- H5S_extent_dims(of_space, &cur_size, NULL)<0) {
+ H5S_get_simple_extent_dims(of_space, &cur_size, NULL)<0) {
HGOTO_ERROR(H5E_RAGGED, H5E_CANTINIT, FAIL,
"unable to get overflow dataset extents");
}
@@ -1021,7 +1021,7 @@ H5R_read(H5R_t *ra, hssize_t start_row, hsize_t nrows, H5T_t *type,
/* Read from the raw dataset */
if (NULL==(rf_space=H5D_get_space(ra->raw)) ||
- H5S_extent_dims(rf_space, raw_cur_size, NULL)<0) {
+ H5S_get_simple_extent_dims(rf_space, raw_cur_size, NULL)<0) {
HGOTO_ERROR(H5E_RAGGED, H5E_CANTINIT, FAIL,
"unable to determine current raw data extents");
}
@@ -1059,7 +1059,7 @@ H5R_read(H5R_t *ra, hssize_t start_row, hsize_t nrows, H5T_t *type,
"memory allocation failed for meta data");
}
if (NULL==(mf_space=H5D_get_space(ra->meta)) ||
- H5S_extent_dims(mf_space, &meta_cur_size, NULL)<0) {
+ H5S_get_simple_extent_dims(mf_space, &meta_cur_size, NULL)<0) {
HGOTO_ERROR(H5E_RAGGED, H5E_CANTINIT, FAIL,
"unable to get current meta data extents");
}
diff --git a/src/H5S.c b/src/H5S.c
index dc8f334..bcbd64e 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -676,7 +676,7 @@ H5S_copy(const H5S_t *src)
/*-------------------------------------------------------------------------
- * Function: H5S_extent_npoints
+ * Function: H5S_get_simple_extent_npoints
*
* Purpose: Determines how many data points a dataset extent has.
*
@@ -693,12 +693,12 @@ H5S_copy(const H5S_t *src)
*-------------------------------------------------------------------------
*/
hsize_t
-H5S_extent_npoints(const H5S_t *ds)
+H5S_get_simple_extent_npoints(const H5S_t *ds)
{
hsize_t ret_value = 0;
intn i;
- FUNC_ENTER(H5S_extent_npoints, 0);
+ FUNC_ENTER(H5S_get_simple_extent_npoints, 0);
/* check args */
assert(ds);
@@ -758,7 +758,7 @@ H5Sget_simple_extent_npoints(hid_t space_id)
if (H5_DATASPACE != H5I_group(space_id) || NULL == (ds = H5I_object(space_id))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "not a data space");
}
- ret_value = H5S_extent_npoints(ds);
+ ret_value = H5S_get_simple_extent_npoints(ds);
FUNC_LEAVE(ret_value);
}
@@ -861,13 +861,13 @@ H5Sget_simple_extent_ndims(hid_t space_id)
NULL == (ds = H5I_object(space_id))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space");
}
- ret_value = H5S_extent_ndims(ds);
+ ret_value = H5S_get_simple_extent_ndims(ds);
FUNC_LEAVE(ret_value);
}
/*-------------------------------------------------------------------------
- * Function: H5S_extent_ndims
+ * Function: H5S_get_simple_extent_ndims
*
* Purpose: Returns the number of dimensions in a data space.
*
@@ -884,11 +884,11 @@ H5Sget_simple_extent_ndims(hid_t space_id)
*-------------------------------------------------------------------------
*/
intn
-H5S_extent_ndims(const H5S_t *ds)
+H5S_get_simple_extent_ndims(const H5S_t *ds)
{
intn ret_value = FAIL;
- FUNC_ENTER(H5S_extent_ndims, FAIL);
+ FUNC_ENTER(H5S_get_simple_extent_ndims, FAIL);
/* check args */
assert(ds);
@@ -952,13 +952,13 @@ H5Sget_simple_extent_dims(hid_t space_id, hsize_t dims[]/*out*/,
NULL == (ds = H5I_object(space_id))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace");
}
- ret_value = H5S_extent_dims(ds, dims, maxdims);
+ ret_value = H5S_get_simple_extent_dims(ds, dims, maxdims);
FUNC_LEAVE(ret_value);
}
/*-------------------------------------------------------------------------
- * Function: H5S_extent_dims
+ * Function: H5S_get_simple_extent_dims
*
* Purpose: Returns the size in each dimension of a data space. This
* function may not be meaningful for all types of data spaces.
@@ -975,12 +975,12 @@ H5Sget_simple_extent_dims(hid_t space_id, hsize_t dims[]/*out*/,
*-------------------------------------------------------------------------
*/
intn
-H5S_extent_dims(const H5S_t *ds, hsize_t dims[], hsize_t max_dims[])
+H5S_get_simple_extent_dims(const H5S_t *ds, hsize_t dims[], hsize_t max_dims[])
{
intn ret_value = FAIL;
intn i;
- FUNC_ENTER(H5S_extent_dims, FAIL);
+ FUNC_ENTER(H5S_get_simple_extent_dims, FAIL);
/* check args */
assert(ds);
@@ -1460,7 +1460,7 @@ H5S_find (const H5S_t *mem_space, const H5S_t *file_space)
* We can't do conversion if the source and destination select a
* different number of data points.
*/
- if (H5S_select_npoints (mem_space) != H5S_select_npoints (file_space)) {
+ if (H5S_get_select_npoints (mem_space) != H5S_get_select_npoints (file_space)) {
HRETURN_ERROR (H5E_DATASPACE, H5E_BADRANGE, NULL,
"memory and file data spaces are different sizes");
}
diff --git a/src/H5Sall.c b/src/H5Sall.c
index df7b349..022170c 100644
--- a/src/H5Sall.c
+++ b/src/H5Sall.c
@@ -55,7 +55,6 @@ const H5S_mconv_t H5S_ALL_MCONV[1] = {{
"all", /*name */
H5S_SEL_ALL, /*selection type */
H5S_all_init, /*initialize */
- H5S_all_init, /*initialize background */
H5S_all_mgath, /*gather */
H5S_all_mscat, /*scatter */
}};
@@ -86,7 +85,7 @@ H5S_all_init (const struct H5O_layout_t __unused__ *layout,
assert (sel_iter);
/* Initialize the number of elements to iterate over */
- sel_iter->all.elmt_left=H5S_extent_npoints(space);
+ sel_iter->all.elmt_left=H5S_get_simple_extent_npoints(space);
/* Start at the upper left location */
sel_iter->all.offset=0;
@@ -130,7 +129,7 @@ H5S_all_favail (const H5S_t *space, const H5S_sel_iter_t *sel_iter, size_t max)
* be split up. We choose the largest possible strip mine size which is
* not larger than the desired size.
*/
- m_ndims = H5S_extent_dims (space, size, NULL);
+ m_ndims = H5S_get_simple_extent_dims (space, size, NULL);
for (i=m_ndims-1, acc=1; i>0; --i)
acc *= size[i];
nelmts = (max/acc) * acc;
@@ -199,7 +198,7 @@ H5S_all_fgath (H5F_t *f, const struct H5O_layout_t *layout,
* currently pass sample information into H5F_arr_read() much less
* H5F_istore_read().
*/
- if ((space_ndims=H5S_extent_dims (file_space, hsize, NULL))<0) {
+ if ((space_ndims=H5S_get_simple_extent_dims (file_space, hsize, NULL))<0) {
HRETURN_ERROR (H5E_DATASPACE, H5E_CANTINIT, 0,
"unable to retrieve hyperslab parameters");
}
@@ -285,7 +284,7 @@ H5S_all_fscat (H5F_t *f, const struct H5O_layout_t *layout,
/*
* Get information to determine what elements are being selected.
*/
- if ((space_ndims=H5S_extent_dims (file_space, hsize, NULL))<0) {
+ if ((space_ndims=H5S_get_simple_extent_dims (file_space, hsize, NULL))<0) {
HRETURN_ERROR (H5E_DATASPACE, H5E_CANTINIT, FAIL,
"unable to retrieve hyperslab parameters");
}
@@ -370,14 +369,14 @@ H5S_all_mgath (const void *_buf, size_t elmt_size,
/*
* Retrieve information to determine what elements are being selected.
*/
- if ((space_ndims=H5S_extent_dims (mem_space, hsize, NULL))<0) {
+ if ((space_ndims=H5S_get_simple_extent_dims (mem_space, hsize, NULL))<0) {
HRETURN_ERROR (H5E_DATASPACE, H5E_CANTINIT, 0,
"unable to retrieve hyperslab parameters");
}
if(space_ndims>0) {
HDmemset(mem_offset,0,sizeof(hssize_t)*space_ndims);
- if (H5S_extent_dims (mem_space, mem_size, NULL)<0) {
+ if (H5S_get_simple_extent_dims (mem_space, mem_size, NULL)<0) {
HRETURN_ERROR (H5E_DATASPACE, H5E_CANTINIT, 0,
"unable to retrieve data space dimensions");
}
@@ -460,7 +459,7 @@ H5S_all_mscat (const void *_tconv_buf, size_t elmt_size,
/*
* Retrieve information to determine what elements are being selected.
*/
- if ((space_ndims=H5S_extent_dims (mem_space, hsize, NULL))<0) {
+ if ((space_ndims=H5S_get_simple_extent_dims (mem_space, hsize, NULL))<0) {
HRETURN_ERROR (H5E_DATASPACE, H5E_CANTINIT, FAIL,
"unable to retrieve hyperslab parameters");
}
@@ -468,7 +467,7 @@ H5S_all_mscat (const void *_tconv_buf, size_t elmt_size,
if(space_ndims>0) {
HDmemset(mem_offset,0,sizeof(hssize_t)*space_ndims);
- if (H5S_extent_dims (mem_space, mem_size, NULL)<0) {
+ if (H5S_get_simple_extent_dims (mem_space, mem_size, NULL)<0) {
HRETURN_ERROR (H5E_DATASPACE, H5E_CANTINIT, FAIL,
"unable to retrieve data space dimensions");
}
diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index cd0138c..0b2be16 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -87,7 +87,6 @@ const H5S_mconv_t H5S_HYPER_MCONV[1] = {{
"hslab", /*name */
H5S_SEL_HYPERSLABS, /*selection type */
H5S_hyper_init, /*initialize */
- H5S_hyper_init, /*initialize background */
H5S_hyper_mgath, /*gather */
H5S_hyper_mscat, /*scatter */
}};
@@ -122,8 +121,7 @@ H5S_hyper_init (const struct H5O_layout_t __unused__ *layout,
sel_iter->hyp.elmt_left=space->select.num_elem;
/* Allocate the position & initialize to invalid location */
- sel_iter->hyp.pos = H5MM_malloc(space->extent.u.simple.rank *
- sizeof(hssize_t));
+ sel_iter->hyp.pos = H5MM_malloc(space->extent.u.simple.rank * sizeof(hssize_t));
sel_iter->hyp.pos[0]=(-1);
H5V_array_fill(sel_iter->hyp.pos, sel_iter->hyp.pos, sizeof(hssize_t),
space->extent.u.simple.rank);
@@ -1722,15 +1720,16 @@ H5S_hyper_release (H5S_t *space)
space->select.num_elem=0;
/* Release the per-dimension selection info */
- H5MM_xfree(space->select.sel_info.hyper.diminfo);
+ if(space->select.sel_info.hyper.diminfo!=NULL)
+ H5MM_xfree(space->select.sel_info.hyper.diminfo);
space->select.sel_info.hyper.diminfo = NULL;
/* Release hi and lo boundary information */
for(i=0; i<space->extent.u.simple.rank; i++) {
H5MM_xfree(space->select.sel_info.hyper.hyper_lst->lo_bounds[i]);
- space->select.sel_info.hyper.hyper_lst->lo_bounds[i] = NULL;
+ space->select.sel_info.hyper.hyper_lst->lo_bounds[i] = NULL;
H5MM_xfree(space->select.sel_info.hyper.hyper_lst->hi_bounds[i]);
- space->select.sel_info.hyper.hyper_lst->hi_bounds[i] = NULL;
+ space->select.sel_info.hyper.hyper_lst->hi_bounds[i] = NULL;
} /* end for */
H5MM_xfree(space->select.sel_info.hyper.hyper_lst->lo_bounds);
space->select.sel_info.hyper.hyper_lst->lo_bounds = NULL;
diff --git a/src/H5Spoint.c b/src/H5Spoint.c
index 166721b..cf6fdee 100644
--- a/src/H5Spoint.c
+++ b/src/H5Spoint.c
@@ -58,7 +58,6 @@ const H5S_mconv_t H5S_POINT_MCONV[1] = {{
"point", /*name */
H5S_SEL_POINTS, /*selection type */
H5S_point_init, /*initialize */
- H5S_point_init, /*initialize background */
H5S_point_mgath, /*gather */
H5S_point_mscat, /*scatter */
}};
@@ -514,7 +513,7 @@ H5S_point_mgath (const void *_buf, size_t elmt_size,
#ifdef QAK
printf("%s: check 1.0\n",FUNC);
#endif /* QAK */
- if ((space_ndims=H5S_extent_dims (mem_space, mem_size, NULL))<0) {
+ if ((space_ndims=H5S_get_simple_extent_dims (mem_space, mem_size, NULL))<0) {
HRETURN_ERROR (H5E_DATASPACE, H5E_CANTINIT, 0,
"unable to retrieve data space dimensions");
}
@@ -598,7 +597,7 @@ H5S_point_mscat (const void *_tconv_buf, size_t elmt_size,
* only handle hyperslabs with unit sample because there's currently no
* way to pass sample information to H5V_hyper_copy().
*/
- if ((space_ndims=H5S_extent_dims (mem_space, mem_size, NULL))<0) {
+ if ((space_ndims=H5S_get_simple_extent_dims (mem_space, mem_size, NULL))<0) {
HRETURN_ERROR (H5E_DATASPACE, H5E_CANTINIT, FAIL,
"unable to retrieve data space dimensions");
}
diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h
index fba178a..c66f27d 100644
--- a/src/H5Sprivate.h
+++ b/src/H5Sprivate.h
@@ -204,10 +204,6 @@ typedef struct H5S_mconv_t {
herr_t (*init)(const struct H5O_layout_t *layout, const H5S_t *space,
H5S_sel_iter_t *iter);
- /* Initialize background element numbering information */
- herr_t (*binit)(const struct H5O_layout_t *layout, const H5S_t *space,
- H5S_sel_iter_t *iter);
-
/* Gather elements from app buffer to type conversion buffer */
size_t (*gath)(const void *buf, size_t elmt_size,
const H5S_t *mem_space, H5S_sel_iter_t *mem_iter,
@@ -274,10 +270,10 @@ H5S_t *H5S_create (H5S_class_t type);
H5S_t *H5S_copy (const H5S_t *src);
herr_t H5S_close_simple (H5S_simple_t *simple);
herr_t H5S_close (H5S_t *ds);
-hsize_t H5S_extent_npoints (const H5S_t *ds);
+hsize_t H5S_get_simple_extent_npoints (const H5S_t *ds);
hsize_t H5S_get_npoints_max(const H5S_t *ds);
-intn H5S_extent_ndims (const H5S_t *ds);
-intn H5S_extent_dims (const H5S_t *ds, hsize_t dims[]/*out*/,
+intn H5S_get_simple_extent_ndims (const H5S_t *ds);
+intn H5S_get_simple_extent_dims (const H5S_t *ds, hsize_t dims[]/*out*/,
hsize_t max_dims[]/*out*/);
herr_t H5S_modify (H5G_entry_t *ent, const H5S_t *space);
H5S_t *H5S_read (H5G_entry_t *ent);
@@ -298,7 +294,7 @@ herr_t H5S_select_copy (H5S_t *dst, const H5S_t *src);
herr_t H5S_extent_release (H5S_t *space);
herr_t H5S_select_release (H5S_t *space);
herr_t H5S_sel_iter_release (const H5S_t *space,H5S_sel_iter_t *sel_iter);
-hsize_t H5S_select_npoints (const H5S_t *space);
+hsize_t H5S_get_select_npoints (const H5S_t *space);
intn H5S_extend (H5S_t *space, const hsize_t *size);
herr_t H5S_set_extent_simple (H5S_t *space, int rank, const hsize_t *dims,
const hsize_t *max);
diff --git a/src/H5Sselect.c b/src/H5Sselect.c
index d7478d3..4d9a84d 100644
--- a/src/H5Sselect.c
+++ b/src/H5Sselect.c
@@ -182,24 +182,24 @@ H5S_select_release (H5S_t *space)
assert (space);
switch(space->select.type) {
- case H5S_SEL_POINTS: /* Sequence of points selected */
- ret_value=H5S_point_release(space);
- break;
+ case H5S_SEL_POINTS: /* Sequence of points selected */
+ ret_value=H5S_point_release(space);
+ break;
- case H5S_SEL_HYPERSLABS: /* Hyperslab selection defined */
- ret_value=H5S_hyper_release(space);
- break;
+ case H5S_SEL_HYPERSLABS: /* Hyperslab selection defined */
+ ret_value=H5S_hyper_release(space);
+ break;
- case H5S_SEL_ALL: /* Entire extent selected */
- ret_value=H5S_all_release(space);
- break;
+ case H5S_SEL_ALL: /* Entire extent selected */
+ ret_value=H5S_all_release(space);
+ break;
- case H5S_SEL_NONE: /* Nothing selected */
- break;
+ case H5S_SEL_NONE: /* Nothing selected */
+ break;
- case H5S_SEL_ERROR:
- case H5S_SEL_N:
- break;
+ case H5S_SEL_ERROR:
+ case H5S_SEL_N:
+ break;
}
/* Reset type of selection to "all" */
@@ -375,10 +375,10 @@ H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op,
"can't allocate per-dimension vector");
} /* end if */
for(i=0; i<space->extent.u.simple.rank; i++) {
- diminfo[i].start = start[i];
- diminfo[i].stride = stride[i];
- diminfo[i].count = count[i];
- diminfo[i].block = block[i];
+ diminfo[i].start = start[i];
+ diminfo[i].stride = stride[i];
+ diminfo[i].count = count[i];
+ diminfo[i].block = block[i];
} /* end for */
space->select.sel_info.hyper.diminfo = diminfo;
@@ -386,22 +386,13 @@ H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op,
printf("%s: check 2.0\n",FUNC);
#endif /* QAK */
/* Allocate space for the hyperslab selection information if necessary */
- if(space->select.type!=H5S_SEL_HYPERSLABS ||
- space->select.sel_info.hyper.hyper_lst==NULL) {
- if((space->select.sel_info.hyper.hyper_lst =
- H5MM_calloc(sizeof(H5S_hyper_list_t)))==NULL)
- HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
- "can't allocate hyperslab information");
- if((space->select.sel_info.hyper.hyper_lst->lo_bounds =
- H5MM_calloc(space->extent.u.simple.rank*
- sizeof(H5S_hyper_bound_t *)))==NULL)
- HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
- "can't allocate hyperslab lo bound information");
- if((space->select.sel_info.hyper.hyper_lst->hi_bounds =
- H5MM_calloc(space->extent.u.simple.rank*
- sizeof(H5S_hyper_bound_t *)))==NULL)
- HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
- "can't allocate hyperslab lo bound information");
+ if(space->select.type!=H5S_SEL_HYPERSLABS || space->select.sel_info.hyper.hyper_lst==NULL) {
+ if((space->select.sel_info.hyper.hyper_lst = H5MM_calloc(sizeof(H5S_hyper_list_t)))==NULL)
+ HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab information");
+ if((space->select.sel_info.hyper.hyper_lst->lo_bounds = H5MM_calloc(space->extent.u.simple.rank* sizeof(H5S_hyper_bound_t *)))==NULL)
+ HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab lo bound information");
+ if((space->select.sel_info.hyper.hyper_lst->hi_bounds = H5MM_calloc(space->extent.u.simple.rank* sizeof(H5S_hyper_bound_t *)))==NULL)
+ HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate hyperslab lo bound information");
} /* end if */
/* Generate list of blocks to add/remove based on selection operation */
@@ -671,14 +662,14 @@ H5Sget_select_npoints(hid_t spaceid)
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "not a data space");
}
- ret_value = H5S_select_npoints(space);
+ ret_value = H5S_get_select_npoints(space);
FUNC_LEAVE (ret_value);
} /* H5Sget_select_npoints() */
/*--------------------------------------------------------------------------
NAME
- H5S_select_npoints
+ H5S_get_select_npoints
PURPOSE
Get the number of elements in current selection
USAGE
@@ -694,11 +685,11 @@ H5Sget_select_npoints(hid_t spaceid)
REVISION LOG
--------------------------------------------------------------------------*/
hsize_t
-H5S_select_npoints (const H5S_t *space)
+H5S_get_select_npoints (const H5S_t *space)
{
herr_t ret_value=FAIL; /* return value */
- FUNC_ENTER (H5S_select_npoints, FAIL);
+ FUNC_ENTER (H5S_get_select_npoints, FAIL);
assert(space);
@@ -725,7 +716,7 @@ H5S_select_npoints (const H5S_t *space)
}
FUNC_LEAVE (ret_value);
-} /* H5S_select_npoints() */
+} /* H5S_get_select_npoints() */
/*--------------------------------------------------------------------------
NAME
@@ -756,22 +747,22 @@ H5S_sel_iter_release (const H5S_t *space, H5S_sel_iter_t *sel_iter)
assert (sel_iter);
switch(space->select.type) {
- case H5S_SEL_POINTS: /* Sequence of points selected */
- case H5S_SEL_ALL: /* Entire extent selected */
- /* no action needed */
- ret_value=SUCCEED;
- break;
+ case H5S_SEL_POINTS: /* Sequence of points selected */
+ case H5S_SEL_ALL: /* Entire extent selected */
+ /* no action needed */
+ ret_value=SUCCEED;
+ break;
- case H5S_SEL_HYPERSLABS: /* Hyperslab selection defined */
- ret_value=H5S_hyper_sel_iter_release(sel_iter);
- break;
+ case H5S_SEL_HYPERSLABS: /* Hyperslab selection defined */
+ ret_value=H5S_hyper_sel_iter_release(sel_iter);
+ break;
- case H5S_SEL_NONE: /* Nothing selected */
- break;
+ case H5S_SEL_NONE: /* Nothing selected */
+ break;
- case H5S_SEL_ERROR:
- case H5S_SEL_N:
- break;
+ case H5S_SEL_ERROR:
+ case H5S_SEL_N:
+ break;
}
FUNC_LEAVE (ret_value);
diff --git a/test/.distdep b/test/.distdep
index 87bac02..c2dccae 100644
--- a/test/.distdep
+++ b/test/.distdep
@@ -1,3 +1,34 @@
+testhdf5.o: \
+ testhdf5.c \
+ testhdf5.h \
+ ../src/H5private.h \
+ ../src/H5public.h \
+ ../src/H5config.h \
+ ../src/H5Eprivate.h \
+ ../src/H5Epublic.h
+tattr.o: \
+ tattr.c \
+ testhdf5.h \
+ ../src/H5private.h \
+ ../src/H5public.h \
+ ../src/H5config.h \
+ ../src/H5Eprivate.h \
+ ../src/H5Epublic.h \
+ ../src/H5Ipublic.h \
+ ../src/hdf5.h \
+ ../src/H5Apublic.h \
+ ../src/H5ACpublic.h \
+ ../src/H5Bpublic.h \
+ ../src/H5Dpublic.h \
+ ../src/H5Fpublic.h \
+ ../src/H5Gpublic.h \
+ ../src/H5HGpublic.h \
+ ../src/H5HLpublic.h \
+ ../src/H5MFpublic.h \
+ ../src/H5MMpublic.h \
+ ../src/H5Opublic.h \
+ ../src/H5Ppublic.h \
+ ../src/H5Zpublic.h
tfile.o: \
tfile.c \
testhdf5.h \
@@ -69,6 +100,29 @@ tohdr.o: \
../src/H5Tprivate.h \
../src/H5Tpublic.h \
../src/H5Sprivate.h
+tselect.o: \
+ tselect.c \
+ testhdf5.h \
+ ../src/H5private.h \
+ ../src/H5public.h \
+ ../src/H5config.h \
+ ../src/H5Eprivate.h \
+ ../src/H5Epublic.h \
+ ../src/H5Ipublic.h \
+ ../src/hdf5.h \
+ ../src/H5Apublic.h \
+ ../src/H5ACpublic.h \
+ ../src/H5Bpublic.h \
+ ../src/H5Dpublic.h \
+ ../src/H5Fpublic.h \
+ ../src/H5Gpublic.h \
+ ../src/H5HGpublic.h \
+ ../src/H5HLpublic.h \
+ ../src/H5MFpublic.h \
+ ../src/H5MMpublic.h \
+ ../src/H5Opublic.h \
+ ../src/H5Ppublic.h \
+ ../src/H5Zpublic.h
tstab.o: \
tstab.c \
testhdf5.h \
@@ -98,99 +152,32 @@ tstab.o: \
../src/H5Tprivate.h \
../src/H5Tpublic.h \
../src/H5Sprivate.h
-external.o: \
- external.c \
- ../src/hdf5.h \
+th5s.o: \
+ th5s.c \
+ testhdf5.h \
+ ../src/H5private.h \
../src/H5public.h \
../src/H5config.h \
- ../src/H5Ipublic.h \
- ../src/H5Apublic.h \
- ../src/H5ACpublic.h \
- ../src/H5Bpublic.h \
- ../src/H5Dpublic.h \
+ ../src/H5Eprivate.h \
../src/H5Epublic.h \
- ../src/H5Fpublic.h \
- ../src/H5Gpublic.h \
- ../src/H5HGpublic.h \
- ../src/H5HLpublic.h \
- ../src/H5MFpublic.h \
- ../src/H5MMpublic.h \
- ../src/H5Opublic.h \
- ../src/H5Ppublic.h \
- ../src/H5Zpublic.h \
- ../src/H5Spublic.h \
- ../src/H5Tpublic.h
-shtype.o: \
- shtype.c \
- ../src/hdf5.h \
- ../src/H5public.h \
- ../src/H5config.h \
../src/H5Ipublic.h \
- ../src/H5Apublic.h \
- ../src/H5ACpublic.h \
+ ../src/H5Bprivate.h \
../src/H5Bpublic.h \
- ../src/H5Dpublic.h \
- ../src/H5Epublic.h \
+ ../src/H5Fprivate.h \
../src/H5Fpublic.h \
- ../src/H5Gpublic.h \
- ../src/H5HGpublic.h \
- ../src/H5HLpublic.h \
- ../src/H5MFpublic.h \
- ../src/H5MMpublic.h \
- ../src/H5Opublic.h \
- ../src/H5Ppublic.h \
- ../src/H5Zpublic.h \
- ../src/H5Spublic.h
-iopipe.o: \
- iopipe.c \
- ../src/hdf5.h \
- ../src/H5public.h \
- ../src/H5config.h \
- ../src/H5Ipublic.h \
- ../src/H5Apublic.h \
- ../src/H5ACpublic.h \
- ../src/H5Bpublic.h \
../src/H5Dpublic.h \
- ../src/H5Epublic.h \
- ../src/H5Fpublic.h \
- ../src/H5Gpublic.h \
- ../src/H5HGpublic.h \
- ../src/H5HLpublic.h \
- ../src/H5MFpublic.h \
- ../src/H5MMpublic.h \
- ../src/H5Opublic.h \
- ../src/H5Ppublic.h \
- ../src/H5Zpublic.h \
+ ../src/H5Sprivate.h \
../src/H5Spublic.h \
- ../src/H5Tpublic.h
-hyperslab.o: \
- hyperslab.c \
- ../src/H5private.h \
- ../src/H5public.h \
- ../src/H5config.h \
- ../src/H5MMprivate.h \
- ../src/H5MMpublic.h
-extend.o: \
- extend.c \
- ../src/hdf5.h \
- ../src/H5public.h \
- ../src/H5config.h \
- ../src/H5Ipublic.h \
- ../src/H5Apublic.h \
- ../src/H5ACpublic.h \
- ../src/H5Bpublic.h \
- ../src/H5Dpublic.h \
- ../src/H5Epublic.h \
- ../src/H5Fpublic.h \
+ ../src/H5Gprivate.h \
../src/H5Gpublic.h \
- ../src/H5HGpublic.h \
- ../src/H5HLpublic.h \
- ../src/H5MFpublic.h \
- ../src/H5MMpublic.h \
+ ../src/H5Oprivate.h \
../src/H5Opublic.h \
- ../src/H5Ppublic.h \
- ../src/H5Zpublic.h \
- ../src/H5Spublic.h
+ ../src/H5HGprivate.h \
+ ../src/H5HGpublic.h \
+ ../src/H5Tprivate.h \
+ ../src/H5Tpublic.h \
+ ../src/H5Zprivate.h \
+ ../src/H5Zpublic.h
dtypes.o: \
dtypes.c \
../src/hdf5.h \
@@ -211,6 +198,7 @@ dtypes.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
+ ../src/H5Rpublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h \
../src/H5Tpkg.h \
@@ -218,22 +206,13 @@ dtypes.o: \
../src/H5Fprivate.h \
../src/H5private.h \
../src/H5Tprivate.h
-bittests.o: \
- bittests.c \
- ../src/H5Tpkg.h \
- ../src/H5HGprivate.h \
- ../src/H5HGpublic.h \
+hyperslab.o: \
+ hyperslab.c \
+ ../src/H5private.h \
../src/H5public.h \
../src/H5config.h \
- ../src/H5Fprivate.h \
- ../src/H5Fpublic.h \
- ../src/H5Ipublic.h \
- ../src/H5private.h \
- ../src/H5Dpublic.h \
- ../src/H5Tprivate.h \
- ../src/H5Tpublic.h \
- ../src/H5Gprivate.h \
- ../src/H5Gpublic.h
+ ../src/H5MMprivate.h \
+ ../src/H5MMpublic.h
istore.o: \
istore.c \
../src/H5private.h \
@@ -262,27 +241,31 @@ istore.o: \
../src/H5Sprivate.h \
../src/H5Spublic.h \
../src/H5Zprivate.h
-gheap.o: \
- gheap.c \
- ../src/H5private.h \
+dsets.o: \
+ dsets.c \
+ ../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
- ../src/H5Eprivate.h \
- ../src/H5Epublic.h \
../src/H5Ipublic.h \
- ../src/H5Fprivate.h \
- ../src/H5Fpublic.h \
+ ../src/H5Apublic.h \
+ ../src/H5ACpublic.h \
+ ../src/H5Bpublic.h \
../src/H5Dpublic.h \
- ../src/H5Gprivate.h \
+ ../src/H5Epublic.h \
+ ../src/H5Fpublic.h \
../src/H5Gpublic.h \
- ../src/H5Bprivate.h \
- ../src/H5Bpublic.h \
- ../src/H5HGprivate.h \
../src/H5HGpublic.h \
- ../src/H5Pprivate.h \
- ../src/H5Ppublic.h
-ragged.o: \
- ragged.c \
+ ../src/H5HLpublic.h \
+ ../src/H5MFpublic.h \
+ ../src/H5MMpublic.h \
+ ../src/H5Opublic.h \
+ ../src/H5Ppublic.h \
+ ../src/H5Zpublic.h \
+ ../src/H5Rpublic.h \
+ ../src/H5Spublic.h \
+ ../src/H5Tpublic.h
+cmpd_dset.o: \
+ cmpd_dset.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
@@ -303,30 +286,39 @@ ragged.o: \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
../src/H5Spublic.h \
- ../src/H5Tpublic.h \
- ../src/H5private.h
-testhdf5.o: \
- testhdf5.c \
- testhdf5.h \
- ../src/H5private.h \
+ ../src/H5Tpublic.h
+extend.o: \
+ extend.c \
+ ../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
- ../src/H5Eprivate.h \
- ../src/H5Epublic.h
-tattr.o: \
- tattr.c \
- testhdf5.h \
- ../src/H5private.h \
+ ../src/H5Ipublic.h \
+ ../src/H5Apublic.h \
+ ../src/H5ACpublic.h \
+ ../src/H5Bpublic.h \
+ ../src/H5Dpublic.h \
+ ../src/H5Epublic.h \
+ ../src/H5Fpublic.h \
+ ../src/H5Gpublic.h \
+ ../src/H5HGpublic.h \
+ ../src/H5HLpublic.h \
+ ../src/H5MFpublic.h \
+ ../src/H5MMpublic.h \
+ ../src/H5Opublic.h \
+ ../src/H5Ppublic.h \
+ ../src/H5Zpublic.h \
+ ../src/H5Rpublic.h
+external.o: \
+ external.c \
+ ../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
- ../src/H5Eprivate.h \
- ../src/H5Epublic.h \
../src/H5Ipublic.h \
- ../src/hdf5.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
+ ../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
@@ -335,21 +327,21 @@ tattr.o: \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
- ../src/H5Zpublic.h
-tselect.o: \
- tselect.c \
- testhdf5.h \
- ../src/H5private.h \
+ ../src/H5Zpublic.h \
+ ../src/H5Rpublic.h \
+ ../src/H5Spublic.h \
+ ../src/H5Tpublic.h
+iopipe.o: \
+ iopipe.c \
+ ../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
- ../src/H5Eprivate.h \
- ../src/H5Epublic.h \
../src/H5Ipublic.h \
- ../src/hdf5.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
+ ../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
@@ -358,35 +350,31 @@ tselect.o: \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
- ../src/H5Zpublic.h
-th5s.o: \
- th5s.c \
- testhdf5.h \
+ ../src/H5Zpublic.h \
+ ../src/H5Rpublic.h \
+ ../src/H5Spublic.h \
+ ../src/H5Tpublic.h
+gheap.o: \
+ gheap.c \
../src/H5private.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Eprivate.h \
../src/H5Epublic.h \
../src/H5Ipublic.h \
- ../src/H5Bprivate.h \
- ../src/H5Bpublic.h \
../src/H5Fprivate.h \
../src/H5Fpublic.h \
../src/H5Dpublic.h \
- ../src/H5Sprivate.h \
- ../src/H5Spublic.h \
../src/H5Gprivate.h \
../src/H5Gpublic.h \
- ../src/H5Oprivate.h \
- ../src/H5Opublic.h \
+ ../src/H5Bprivate.h \
+ ../src/H5Bpublic.h \
../src/H5HGprivate.h \
../src/H5HGpublic.h \
- ../src/H5Tprivate.h \
- ../src/H5Tpublic.h \
- ../src/H5Zprivate.h \
- ../src/H5Zpublic.h
-dsets.o: \
- dsets.c \
+ ../src/H5Pprivate.h \
+ ../src/H5Ppublic.h
+shtype.o: \
+ shtype.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
@@ -405,11 +393,9 @@ dsets.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
- ../src/H5Rpublic.h \
- ../src/H5Spublic.h \
- ../src/H5Tpublic.h
-cmpd_dset.o: \
- cmpd_dset.c \
+ ../src/H5Rpublic.h
+big.o: \
+ big.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
@@ -430,9 +416,10 @@ cmpd_dset.o: \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
../src/H5Spublic.h \
- ../src/H5Tpublic.h
-big.o: \
- big.c \
+ ../src/H5Tpublic.h \
+ ../src/H5private.h
+links.o: \
+ links.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
@@ -452,11 +439,9 @@ big.o: \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
- ../src/H5Spublic.h \
- ../src/H5Tpublic.h \
- ../src/H5private.h
-links.o: \
- links.c \
+ ../src/H5Spublic.h
+chunk.o: \
+ chunk.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
@@ -477,8 +462,24 @@ links.o: \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
../src/H5Spublic.h
-chunk.o: \
- chunk.c \
+bittests.o: \
+ bittests.c \
+ ../src/H5Tpkg.h \
+ ../src/H5HGprivate.h \
+ ../src/H5HGpublic.h \
+ ../src/H5public.h \
+ ../src/H5config.h \
+ ../src/H5Fprivate.h \
+ ../src/H5Fpublic.h \
+ ../src/H5Ipublic.h \
+ ../src/H5private.h \
+ ../src/H5Dpublic.h \
+ ../src/H5Tprivate.h \
+ ../src/H5Tpublic.h \
+ ../src/H5Gprivate.h \
+ ../src/H5Gpublic.h
+mtime.o: \
+ mtime.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
@@ -498,9 +499,11 @@ chunk.o: \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
- ../src/H5Spublic.h
-mtime.o: \
- mtime.c \
+ ../src/H5Spublic.h \
+ ../src/H5Tpublic.h \
+ ../src/H5private.h
+ragged.o: \
+ ragged.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
diff --git a/test/links.c b/test/links.c
index 0a0f807..013d8b8 100644
--- a/test/links.c
+++ b/test/links.c
@@ -176,8 +176,8 @@ cklinks(void)
}
/* Hard link */
- if (H5Gget_stat(file, "d1", TRUE, &sb1)<0) goto error;
- if (H5Gget_stat(file, "grp1/hard", TRUE, &sb2)<0) goto error;
+ if (H5Gget_objinfo(file, "d1", TRUE, &sb1)<0) goto error;
+ if (H5Gget_objinfo(file, "grp1/hard", TRUE, &sb2)<0) goto error;
if (H5G_DATASET!=sb2.type) {
puts("*FAILED*");
puts(" Unexpected object type should have been a dataset");
@@ -191,7 +191,7 @@ cklinks(void)
}
/* Symbolic link */
- if (H5Gget_stat(file, "grp1/soft", TRUE, &sb2)<0) goto error;
+ if (H5Gget_objinfo(file, "grp1/soft", TRUE, &sb2)<0) goto error;
if (H5G_DATASET!=sb2.type) {
puts("*FAILED*");
puts(" Unexpected object type should have been a dataset");
@@ -214,14 +214,14 @@ cklinks(void)
/* Dangling link */
H5E_BEGIN_TRY {
- status = H5Gget_stat(file, "grp1/dangle", TRUE, &sb2);
+ status = H5Gget_objinfo(file, "grp1/dangle", TRUE, &sb2);
} H5E_END_TRY;
if (status>=0) {
puts("*FAILED*");
- puts(" H5Gget_stat() should have failed for a dangling link.");
+ puts(" H5Gget_objinfo() should have failed for a dangling link.");
goto error;
}
- if (H5Gget_stat(file, "grp1/dangle", FALSE, &sb2)<0) goto error;
+ if (H5Gget_objinfo(file, "grp1/dangle", FALSE, &sb2)<0) goto error;
if (H5G_LINK!=sb2.type) {
puts("*FAILED*");
puts(" Unexpected object type should have been a symbolic link");
@@ -238,14 +238,14 @@ cklinks(void)
/* Recursive link */
H5E_BEGIN_TRY {
- status = H5Gget_stat(file, "grp1/recursive", TRUE, &sb2);
+ status = H5Gget_objinfo(file, "grp1/recursive", TRUE, &sb2);
} H5E_END_TRY;
if (status>=0) {
puts("*FAILED*");
- puts(" H5Gget_stat() should have failed for a recursive link.");
+ puts(" H5Gget_objinfo() should have failed for a recursive link.");
goto error;
}
- if (H5Gget_stat(file, "grp1/recursive", FALSE, &sb2)<0) goto error;
+ if (H5Gget_objinfo(file, "grp1/recursive", FALSE, &sb2)<0) goto error;
if (H5G_LINK!=sb2.type) {
puts("*FAILED*");
puts(" Unexpected object type should have been a symbolic link");
diff --git a/test/mtime.c b/test/mtime.c
index 401d7d7..a2e32c1 100644
--- a/test/mtime.c
+++ b/test/mtime.c
@@ -120,21 +120,21 @@ main(void)
/*
* Open the file and get the modification time. We'll test the new
- * H5Gget_stat() arguments too: being able to stat something without knowing
+ * H5Gget_objinfo() arguments too: being able to stat something without knowing
* its name.
*/
if ((file = H5Fopen(FILE_NAME_1, H5F_ACC_RDONLY, H5P_DEFAULT))<0) return 1;
- if (H5Gget_stat(file, "dset", TRUE, &sb1)<0) return 1;
+ if (H5Gget_objinfo(file, "dset", TRUE, &sb1)<0) return 1;
if ((dset=H5Dopen(file, "dset"))<0) return 1;
- if (H5Gget_stat(dset, ".", TRUE, &sb2)<0) return 1;
+ if (H5Gget_objinfo(dset, ".", TRUE, &sb2)<0) return 1;
if (H5Dclose(dset)<0) return 1;
if (H5Fclose(file)<0) return 1;
- /* Compare times from the two ways of calling H5Gget_stat() */
+ /* Compare times from the two ways of calling H5Gget_objinfo() */
if (sb1.objno[0]!=sb2.objno[0] || sb1.objno[1]!=sb2.objno[1] ||
sb1.mtime!=sb2.mtime) {
puts("*FAILED*");
- puts(" Calling H5Gget_stat() with the dataset ID returned different");
+ puts(" Calling H5Gget_objinfo() with the dataset ID returned different");
puts(" values than calling it with a file and dataset name.");
return 1;
}
diff --git a/test/tselect.c b/test/tselect.c
index 3223cdb..e38bbda 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -491,6 +491,7 @@ test_select_combo(void)
*tbuf2; /* temporary buffer pointer */
intn i,j; /* Counters */
herr_t ret; /* Generic return value */
+hbool_t valid; /* Generic boolean return value */
/* Output message about test being performed */
MESSAGE(5, ("Testing Combination of Hyperslab & Element Selection Functions\n"));
@@ -1153,21 +1154,21 @@ test_select_hyper_offset(void)
ret = H5Soffset_simple(sid1,offset);
CHECK(ret, FAIL, "H5Soffset_simple");
valid = H5Sselect_valid(sid1);
- VERIFY(valid, TRUE, "H5Svalid_offset");
+ VERIFY(valid, TRUE, "H5Sselect_valid");
/* Check an invalid offset */
offset[0]=10; offset[1]=0; offset[2]=0;
ret = H5Soffset_simple(sid1,offset);
CHECK(ret, FAIL, "H5Soffset_simple");
valid = H5Sselect_valid(sid1);
- VERIFY(valid, FALSE, "H5Svalid_offset");
+ VERIFY(valid, FALSE, "H5Sselect_valid");
/* Reset offset */
offset[0]=0; offset[1]=0; offset[2]=0;
ret = H5Soffset_simple(sid1,offset);
CHECK(ret, FAIL, "H5Soffset_simple");
valid = H5Sselect_valid(sid1);
- VERIFY(valid, TRUE, "H5Svalid_offset");
+ VERIFY(valid, TRUE, "H5Sselect_valid");
/* Select 15x26 hyperslab for memory dataset */
start[0]=15; start[1]=0;
@@ -1182,7 +1183,7 @@ test_select_hyper_offset(void)
ret = H5Soffset_simple(sid2,offset);
CHECK(ret, FAIL, "H5Soffset_simple");
valid = H5Sselect_valid(sid2);
- VERIFY(valid, TRUE, "H5Svalid_offset");
+ VERIFY(valid, TRUE, "H5Sselect_valid");
/* Create a dataset */
dataset=H5Dcreate(fid1,"Dataset1",H5T_NATIVE_UCHAR,sid1,H5P_DEFAULT);
@@ -1314,21 +1315,21 @@ test_select_point_offset(void)
ret = H5Soffset_simple(sid1,offset);
CHECK(ret, FAIL, "H5Soffset_simple");
valid = H5Sselect_valid(sid1);
- VERIFY(valid, TRUE, "H5Svalid_offset");
+ VERIFY(valid, TRUE, "H5Sselect_valid");
/* Check an invalid offset */
offset[0]=10; offset[1]=0; offset[2]=0;
ret = H5Soffset_simple(sid1,offset);
CHECK(ret, FAIL, "H5Soffset_simple");
valid = H5Sselect_valid(sid1);
- VERIFY(valid, FALSE, "H5Svalid_offset");
+ VERIFY(valid, FALSE, "H5Sselect_valid");
/* Reset offset */
offset[0]=0; offset[1]=0; offset[2]=0;
ret = H5Soffset_simple(sid1,offset);
CHECK(ret, FAIL, "H5Soffset_simple");
valid = H5Sselect_valid(sid1);
- VERIFY(valid, TRUE, "H5Svalid_offset");
+ VERIFY(valid, TRUE, "H5Sselect_valid");
/* Select sequence of ten points for write dataset */
coord2[0][0]=12; coord2[0][1]= 3;
@@ -1349,7 +1350,7 @@ test_select_point_offset(void)
ret = H5Soffset_simple(sid2,offset);
CHECK(ret, FAIL, "H5Soffset_simple");
valid = H5Sselect_valid(sid2);
- VERIFY(valid, TRUE, "H5Svalid_offset");
+ VERIFY(valid, TRUE, "H5Sselect_valid");
/* Create a dataset */
dataset=H5Dcreate(fid1,"Dataset1",H5T_NATIVE_UCHAR,sid1,H5P_DEFAULT);
diff --git a/tools/h5dump.c b/tools/h5dump.c
index 58d723c..8b38ad4 100644
--- a/tools/h5dump.c
+++ b/tools/h5dump.c
@@ -386,7 +386,7 @@ dump_all (hid_t group, const char *name, void __unused__ *op_data)
H5Eset_auto (NULL, NULL);
- H5Gget_stat(group, name, FALSE, &statbuf);
+ H5Gget_objinfo(group, name, FALSE, &statbuf);
switch (statbuf.type) {
case H5G_LINK:
diff --git a/tools/h5ls.c b/tools/h5ls.c
index 0351da0..8fbffeb 100644
--- a/tools/h5ls.c
+++ b/tools/h5ls.c
@@ -345,7 +345,7 @@ list (hid_t group, const char *name, void __unused__ *cd)
/* Get object information */
H5E_BEGIN_TRY {
- status = H5Gget_stat(group, name, FALSE, &sb);
+ status = H5Gget_objinfo(group, name, FALSE, &sb);
} H5E_END_TRY;
if (status<0) {
puts("**NOT FOUND**");
generated by cgit v0.12 at 2024-07-18 19:46:03 (GMT)