From 221c1ef220b49d46fa05ff267f11445f6d1a8b44 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Wed, 9 Jul 2003 13:14:29 -0500 Subject: [svn-r7191] Purpose: Code cleanup Description: Track new "debug" modules for library. Platforms tested: h5committested --- MANIFEST | 5 ++ pablo/Makefile.in | 24 ++++---- src/Dependencies | 153 ++++++++++++++++++++++++++++++++---------------- src/Makefile.in | 34 +++++------ tools/misc/Dependencies | 36 ++++++------ tools/misc/h5debug.c | 6 +- 6 files changed, 158 insertions(+), 100 deletions(-) diff --git a/MANIFEST b/MANIFEST index 6f08a5f..b428cfb 100644 --- a/MANIFEST +++ b/MANIFEST @@ -857,6 +857,7 @@ ./src/H5F.c ./src/H5Fcontig.c ./src/H5Fcompact.c +./src/H5Fdbg.c ./src/H5Fistore.c ./src/H5Fpkg.h ./src/H5Fprivate.h @@ -908,9 +909,13 @@ ./src/H5Gpublic.h ./src/H5Gstab.c ./src/H5HG.c +./src/H5HGdbg.c +./src/H5HGpkg.h ./src/H5HGprivate.h ./src/H5HGpublic.h ./src/H5HL.c +./src/H5HLdbg.c +./src/H5HLpkg.h ./src/H5HLprivate.h ./src/H5HLpublic.h ./src/H5HP.c diff --git a/pablo/Makefile.in b/pablo/Makefile.in index 43a0b62..8f904f8 100644 --- a/pablo/Makefile.in +++ b/pablo/Makefile.in @@ -53,18 +53,18 @@ LIB_SRC=H5.c H5A.c H5AC.c H5B.c H5D.c H5Dio.c H5E.c H5F.c H5FD.c \ H5FDcore.c H5FDfamily.c H5FDfphdf5.c H5FDgass.c H5FDlog.c \ H5FDmpio.c H5FDmpiposix.c H5FDmulti.c H5FDsec2.c H5FDsrb.c \ H5FDstdio.c H5FDstream.c H5FL.c H5FO.c H5FP.c H5FPclient.c \ - H5FPserver.c H5FS.c H5Fcompact.c H5Fcontig.c H5Fistore.c H5Fseq.c \ - H5G.c H5Gent.c H5Gnode.c H5Gstab.c H5HG.c H5HL.c H5HP.c H5I.c \ - H5MF.c H5MM.c H5O.c H5Oattr.c H5Obogus.c H5Ocont.c H5Odtype.c \ - H5Oefl.c H5Ofill.c H5Olayout.c H5Omtime.c H5Oname.c H5Onull.c \ - H5Opline.c H5Osdspace.c H5Oshared.c H5Ostab.c H5P.c H5Pdcpl.c \ - H5Pdxpl.c H5Pfapl.c H5Pfcpl.c H5Ptest.c H5R.c H5RS.c H5S.c H5ST.c \ - H5Sall.c H5Shyper.c H5Smpio.c H5Snone.c H5Spoint.c H5Sselect.c \ - H5Stest.c H5T.c H5TB.c H5TS.c H5Tarray.c H5Tbit.c H5Tcommit.c \ - H5Tcompound.c H5Tconv.c H5Tcset.c H5Tenum.c H5Tfields.c H5Tfixed.c \ - H5Tfloat.c H5Tinit.c H5Tnative.c H5Toffset.c H5Topaque.c H5Torder.c \ - H5Tpad.c H5Tprecis.c H5Tstrpad.c H5Tvlen.c H5V.c H5Z.c H5Zdeflate.c \ - H5Zfletcher32.c H5Zshuffle.c H5Zszip.c H5detect.c + H5FPserver.c H5FS.c H5Fcompact.c H5Fcontig.c H5Fdbg.c H5Fistore.c \ + H5Fseq.c H5G.c H5Gent.c H5Gnode.c H5Gstab.c H5HG.c H5HGdbg.c H5HL.c \ + H5HLdbg.c H5HP.c H5I.c H5MF.c H5MM.c H5O.c H5Oattr.c H5Obogus.c \ + H5Ocont.c H5Odtype.c H5Oefl.c H5Ofill.c H5Olayout.c H5Omtime.c \ + H5Oname.c H5Onull.c H5Opline.c H5Osdspace.c H5Oshared.c H5Ostab.c \ + H5P.c H5Pdcpl.c H5Pdxpl.c H5Pfapl.c H5Pfcpl.c H5Ptest.c H5R.c H5RS.c \ + H5S.c H5ST.c H5Sall.c H5Shyper.c H5Smpio.c H5Snone.c H5Spoint.c \ + H5Sselect.c H5Stest.c H5T.c H5TB.c H5TS.c H5Tarray.c H5Tbit.c \ + H5Tcommit.c H5Tcompound.c H5Tconv.c H5Tcset.c H5Tenum.c H5Tfields.c \ + H5Tfixed.c H5Tfloat.c H5Tinit.c H5Tnative.c H5Toffset.c H5Topaque.c \ + H5Torder.c H5Tpad.c H5Tprecis.c H5Tstrpad.c H5Tvlen.c H5V.c H5Z.c \ + H5Zdeflate.c H5Zfletcher32.c H5Zshuffle.c H5Zszip.c H5detect.c PABLO_OBJ=PabloHDF.o PabloHDF_RT.o PabloHDF_SDDF.o PabloHDF_MPIO.o diff --git a/src/Dependencies b/src/Dependencies index 8e3e586..d6d6be2 100644 --- a/src/Dependencies +++ b/src/Dependencies @@ -67,14 +67,14 @@ H5A.lo: \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ $(srcdir)/H5RSprivate.h \ - $(srcdir)/H5HGprivate.h \ - $(srcdir)/H5HGpublic.h \ $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ $(srcdir)/H5Dprivate.h \ $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Oprivate.h \ $(srcdir)/H5Opublic.h \ + $(srcdir)/H5HGprivate.h \ + $(srcdir)/H5HGpublic.h \ $(srcdir)/H5Tprivate.h \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ @@ -424,6 +424,46 @@ H5Fcompact.lo: \ $(srcdir)/H5FDprivate.h \ $(srcdir)/H5FLprivate.h \ $(srcdir)/H5Vprivate.h +H5Fdbg.lo: \ + $(srcdir)/H5Fdbg.c \ + $(srcdir)/H5private.h \ + $(srcdir)/H5public.h \ + H5pubconf.h \ + $(srcdir)/H5api_adpt.h \ + $(srcdir)/H5MPprivate.h \ + $(srcdir)/H5FSprivate.h \ + $(srcdir)/H5Eprivate.h \ + $(srcdir)/H5Epublic.h \ + $(srcdir)/H5Ipublic.h \ + $(srcdir)/H5Fpkg.h \ + $(srcdir)/H5Fprivate.h \ + $(srcdir)/H5Fpublic.h \ + $(srcdir)/H5FDpublic.h \ + $(srcdir)/H5Bpublic.h \ + $(srcdir)/H5FOprivate.h \ + $(srcdir)/H5TBprivate.h \ + $(srcdir)/H5Gprivate.h \ + $(srcdir)/H5Gpublic.h \ + $(srcdir)/H5Bprivate.h \ + $(srcdir)/H5ACprivate.h \ + $(srcdir)/H5ACpublic.h \ + $(srcdir)/H5RSprivate.h \ + $(srcdir)/H5Iprivate.h \ + $(srcdir)/H5Pprivate.h \ + $(srcdir)/H5Ppublic.h \ + $(srcdir)/H5Dpublic.h \ + $(srcdir)/H5MMpublic.h \ + $(srcdir)/H5Zpublic.h \ + $(srcdir)/H5Oprivate.h \ + $(srcdir)/H5Opublic.h \ + $(srcdir)/H5Spublic.h \ + $(srcdir)/H5HGprivate.h \ + $(srcdir)/H5HGpublic.h \ + $(srcdir)/H5Tprivate.h \ + $(srcdir)/H5Tpublic.h \ + $(srcdir)/H5Rprivate.h \ + $(srcdir)/H5Rpublic.h \ + $(srcdir)/H5Zprivate.h H5Fistore.lo: \ $(srcdir)/H5Fistore.c \ $(srcdir)/H5private.h \ @@ -1010,38 +1050,7 @@ H5FDstream.lo: \ H5pubconf.h \ $(srcdir)/H5api_adpt.h \ $(srcdir)/H5MPprivate.h \ - $(srcdir)/H5FSprivate.h \ - $(srcdir)/H5Eprivate.h \ - $(srcdir)/H5Epublic.h \ - $(srcdir)/H5Ipublic.h \ - $(srcdir)/H5FDpublic.h \ - $(srcdir)/H5Fpublic.h \ - $(srcdir)/H5FDstream.h \ - $(srcdir)/H5Iprivate.h \ - $(srcdir)/H5MMprivate.h \ - $(srcdir)/H5MMpublic.h \ - $(srcdir)/H5Pprivate.h \ - $(srcdir)/H5Ppublic.h \ - $(srcdir)/H5Dpublic.h \ - $(srcdir)/H5Zpublic.h \ - $(srcdir)/H5Oprivate.h \ - $(srcdir)/H5Opublic.h \ - $(srcdir)/H5Spublic.h \ - $(srcdir)/H5HGprivate.h \ - $(srcdir)/H5HGpublic.h \ - $(srcdir)/H5Fprivate.h \ - $(srcdir)/H5Tprivate.h \ - $(srcdir)/H5Tpublic.h \ - $(srcdir)/H5Gprivate.h \ - $(srcdir)/H5Gpublic.h \ - $(srcdir)/H5Bprivate.h \ - $(srcdir)/H5Bpublic.h \ - $(srcdir)/H5ACprivate.h \ - $(srcdir)/H5ACpublic.h \ - $(srcdir)/H5RSprivate.h \ - $(srcdir)/H5Rprivate.h \ - $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Zprivate.h + $(srcdir)/H5FSprivate.h H5FL.lo: \ $(srcdir)/H5FL.c \ $(srcdir)/H5private.h \ @@ -1405,12 +1414,33 @@ H5HG.lo: \ $(srcdir)/H5Bprivate.h \ $(srcdir)/H5RSprivate.h \ $(srcdir)/H5FLprivate.h \ + $(srcdir)/H5HGpkg.h \ $(srcdir)/H5HGprivate.h \ $(srcdir)/H5HGpublic.h \ $(srcdir)/H5MFprivate.h \ $(srcdir)/H5FDprivate.h \ $(srcdir)/H5MMprivate.h \ $(srcdir)/H5MMpublic.h +H5HGdbg.lo: \ + $(srcdir)/H5HGdbg.c \ + $(srcdir)/H5private.h \ + $(srcdir)/H5public.h \ + H5pubconf.h \ + $(srcdir)/H5api_adpt.h \ + $(srcdir)/H5MPprivate.h \ + $(srcdir)/H5FSprivate.h \ + $(srcdir)/H5ACprivate.h \ + $(srcdir)/H5ACpublic.h \ + $(srcdir)/H5Fprivate.h \ + $(srcdir)/H5Fpublic.h \ + $(srcdir)/H5Ipublic.h \ + $(srcdir)/H5FDpublic.h \ + $(srcdir)/H5Eprivate.h \ + $(srcdir)/H5Epublic.h \ + $(srcdir)/H5HGpkg.h \ + $(srcdir)/H5HGprivate.h \ + $(srcdir)/H5HGpublic.h \ + $(srcdir)/H5Iprivate.h H5HL.lo: \ $(srcdir)/H5HL.c \ $(srcdir)/H5private.h \ @@ -1436,10 +1466,31 @@ H5HL.lo: \ $(srcdir)/H5Bprivate.h \ $(srcdir)/H5RSprivate.h \ $(srcdir)/H5FLprivate.h \ + $(srcdir)/H5HLpkg.h \ $(srcdir)/H5HLprivate.h \ $(srcdir)/H5HLpublic.h \ $(srcdir)/H5MFprivate.h \ - $(srcdir)/H5FDprivate.h \ + $(srcdir)/H5FDprivate.h +H5HLdbg.lo: \ + $(srcdir)/H5HLdbg.c \ + $(srcdir)/H5private.h \ + $(srcdir)/H5public.h \ + H5pubconf.h \ + $(srcdir)/H5api_adpt.h \ + $(srcdir)/H5MPprivate.h \ + $(srcdir)/H5FSprivate.h \ + $(srcdir)/H5ACprivate.h \ + $(srcdir)/H5ACpublic.h \ + $(srcdir)/H5Fprivate.h \ + $(srcdir)/H5Fpublic.h \ + $(srcdir)/H5Ipublic.h \ + $(srcdir)/H5FDpublic.h \ + $(srcdir)/H5Eprivate.h \ + $(srcdir)/H5Epublic.h \ + $(srcdir)/H5HLpkg.h \ + $(srcdir)/H5HLprivate.h \ + $(srcdir)/H5HLpublic.h \ + $(srcdir)/H5Iprivate.h \ $(srcdir)/H5MMprivate.h \ $(srcdir)/H5MMpublic.h H5HP.lo: \ @@ -1587,14 +1638,14 @@ H5Oattr.lo: \ $(srcdir)/H5Fpublic.h \ $(srcdir)/H5FDpublic.h \ $(srcdir)/H5RSprivate.h \ - $(srcdir)/H5HGprivate.h \ - $(srcdir)/H5HGpublic.h \ $(srcdir)/H5Sprivate.h \ $(srcdir)/H5Spublic.h \ $(srcdir)/H5Dprivate.h \ $(srcdir)/H5Dpublic.h \ $(srcdir)/H5Oprivate.h \ $(srcdir)/H5Opublic.h \ + $(srcdir)/H5HGprivate.h \ + $(srcdir)/H5HGpublic.h \ $(srcdir)/H5Tprivate.h \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Rprivate.h \ @@ -3212,9 +3263,19 @@ H5Tnative.lo: \ $(srcdir)/H5Epublic.h \ $(srcdir)/H5Ipublic.h \ $(srcdir)/H5Iprivate.h \ - $(srcdir)/H5MMprivate.h \ + $(srcdir)/H5Pprivate.h \ + $(srcdir)/H5Ppublic.h \ + $(srcdir)/H5Dpublic.h \ + $(srcdir)/H5Fpublic.h \ + $(srcdir)/H5FDpublic.h \ $(srcdir)/H5MMpublic.h \ - $(srcdir)/H5Tpkg.h \ + $(srcdir)/H5Zpublic.h \ + $(srcdir)/H5Oprivate.h \ + $(srcdir)/H5Opublic.h \ + $(srcdir)/H5Spublic.h \ + $(srcdir)/H5HGprivate.h \ + $(srcdir)/H5HGpublic.h \ + $(srcdir)/H5Fprivate.h \ $(srcdir)/H5Tprivate.h \ $(srcdir)/H5Tpublic.h \ $(srcdir)/H5Gprivate.h \ @@ -3223,21 +3284,13 @@ H5Tnative.lo: \ $(srcdir)/H5Bpublic.h \ $(srcdir)/H5ACprivate.h \ $(srcdir)/H5ACpublic.h \ - $(srcdir)/H5Fprivate.h \ - $(srcdir)/H5Fpublic.h \ - $(srcdir)/H5FDpublic.h \ $(srcdir)/H5RSprivate.h \ $(srcdir)/H5Rprivate.h \ $(srcdir)/H5Rpublic.h \ - $(srcdir)/H5Dprivate.h \ - $(srcdir)/H5Dpublic.h \ - $(srcdir)/H5Oprivate.h \ - $(srcdir)/H5Opublic.h \ - $(srcdir)/H5Spublic.h \ - $(srcdir)/H5HGprivate.h \ - $(srcdir)/H5HGpublic.h \ $(srcdir)/H5Zprivate.h \ - $(srcdir)/H5Zpublic.h + $(srcdir)/H5MMprivate.h \ + $(srcdir)/H5Tpkg.h \ + $(srcdir)/H5Dprivate.h H5Toffset.lo: \ $(srcdir)/H5Toffset.c \ $(srcdir)/H5private.h \ diff --git a/src/Makefile.in b/src/Makefile.in index e336099..406bc3b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -31,21 +31,21 @@ DISTCLEAN=libhdf5.settings ## Source and object files for the library (lexicographically)... LIB_SRC=H5.c H5A.c H5AC.c H5B.c H5D.c H5Dio.c H5E.c H5F.c H5Fcontig.c \ - H5Fcompact.c H5Fistore.c H5Fseq.c H5FD.c H5FDcore.c \ + H5Fcompact.c H5Fdbg.c H5Fistore.c H5Fseq.c H5FD.c H5FDcore.c \ H5FDfamily.c H5FDfphdf5.c H5FDgass.c H5FDlog.c H5FDmpio.c \ H5FDmpiposix.c H5FDmulti.c H5FDsec2.c H5FDsrb.c H5FDstdio.c \ H5FDstream.c H5FL.c H5FO.c H5FP.c H5FPclient.c H5FPserver.c H5FS.c \ - H5G.c H5Gent.c H5Gnode.c H5Gstab.c H5HG.c H5HL.c H5HP.c H5I.c H5MF.c \ - H5MM.c H5O.c H5Oattr.c H5Obogus.c H5Ocont.c H5Odtype.c H5Oefl.c \ - H5Ofill.c H5Olayout.c H5Omtime.c H5Oname.c H5Onull.c H5Opline.c \ - H5Osdspace.c H5Oshared.c H5Ostab.c H5P.c H5Pdcpl.c H5Pdxpl.c \ - H5Pfapl.c H5Pfcpl.c H5Ptest.c H5R.c H5RS.c H5S.c H5Sall.c H5Shyper.c \ - H5Smpio.c H5Snone.c H5Spoint.c H5Sselect.c H5Stest.c H5ST.c H5T.c \ - H5Tarray.c H5Tbit.c H5Tcommit.c H5Tcompound.c H5Tconv.c H5Tcset.c \ - H5Tenum.c H5Tfields.c H5Tfixed.c H5Tfloat.c H5Tinit.c H5Tnative.c \ - H5Toffset.c H5Topaque.c H5Torder.c H5Tpad.c H5Tprecis.c H5Tstrpad.c \ - H5Tvlen.c H5TB.c H5TS.c H5V.c H5Z.c H5Zdeflate.c H5Zfletcher32.c \ - H5Zshuffle.c H5Zszip.c + H5G.c H5Gent.c H5Gnode.c H5Gstab.c H5HG.c H5HGdbg.c H5HL.c H5HLdbg.c \ + H5HP.c H5I.c H5MF.c H5MM.c H5O.c H5Oattr.c H5Obogus.c H5Ocont.c \ + H5Odtype.c H5Oefl.c H5Ofill.c H5Olayout.c H5Omtime.c H5Oname.c \ + H5Onull.c H5Opline.c H5Osdspace.c H5Oshared.c H5Ostab.c H5P.c \ + H5Pdcpl.c H5Pdxpl.c H5Pfapl.c H5Pfcpl.c H5Ptest.c H5R.c H5RS.c H5S.c \ + H5Sall.c H5Shyper.c H5Smpio.c H5Snone.c H5Spoint.c H5Sselect.c \ + H5Stest.c H5ST.c H5T.c H5Tarray.c H5Tbit.c H5Tcommit.c H5Tcompound.c \ + H5Tconv.c H5Tcset.c H5Tenum.c H5Tfields.c H5Tfixed.c H5Tfloat.c \ + H5Tinit.c H5Tnative.c H5Toffset.c H5Topaque.c H5Torder.c H5Tpad.c \ + H5Tprecis.c H5Tstrpad.c H5Tvlen.c H5TB.c H5TS.c H5V.c H5Z.c \ + H5Zdeflate.c H5Zfletcher32.c H5Zshuffle.c H5Zszip.c LIB_OBJ=$(LIB_SRC:.c=.lo) @@ -65,11 +65,11 @@ PUB_HDR=H5public.h H5Apublic.h H5ACpublic.h H5Bpublic.h H5Dpublic.h \ PRIVATE_HDR=H5private.h H5Aprivate.h H5Apkg.h H5ACprivate.h H5Bprivate.h \ H5Dprivate.h H5Eprivate.h H5Fprivate.h H5FDprivate.h H5FLprivate.h \ H5FOprivate.h H5FPprivate.h H5FSprivate.h H5Gprivate.h H5Gpkg.h \ - H5HGprivate.h H5HLprivate.h H5HPprivate.h H5Iprivate.h H5MFprivate.h \ - H5MMprivate.h H5Oprivate.h H5Opkg.h H5Pprivate.h H5Ppkg.h \ - H5Rprivate.h H5RSprivate.h H5Sprivate.h H5STprivate.h \ - H5Tprivate.h H5TBprivate.h H5Tpkg.h H5TSprivate.h H5Vprivate.h \ - H5Zprivate.h H5Zpkg.h H5config.h + H5HGprivate.h H5HGpkg.h H5HLprivate.h H5HLpkg.h H5HPprivate.h \ + H5Iprivate.h H5MFprivate.h H5MMprivate.h H5Oprivate.h H5Opkg.h \ + H5Pprivate.h H5Ppkg.h H5Rprivate.h H5RSprivate.h H5Sprivate.h \ + H5STprivate.h H5Tprivate.h H5TBprivate.h H5Tpkg.h H5TSprivate.h \ + H5Vprivate.h H5Zprivate.h H5Zpkg.h H5config.h ## Number format detection ## The LD_LIBRARY_PATH setting is a klutch. diff --git a/tools/misc/Dependencies b/tools/misc/Dependencies index 56c4157..0a4086d 100644 --- a/tools/misc/Dependencies +++ b/tools/misc/Dependencies @@ -9,39 +9,39 @@ h5debug.lo: \ $(top_srcdir)/src/H5api_adpt.h \ $(top_srcdir)/src/H5MPprivate.h \ $(top_srcdir)/src/H5FSprivate.h \ - $(top_srcdir)/src/H5Iprivate.h \ - $(top_srcdir)/src/H5Ipublic.h \ $(top_srcdir)/src/H5Bprivate.h \ $(top_srcdir)/src/H5Bpublic.h \ $(top_srcdir)/src/H5ACprivate.h \ $(top_srcdir)/src/H5ACpublic.h \ $(top_srcdir)/src/H5Fprivate.h \ $(top_srcdir)/src/H5Fpublic.h \ + $(top_srcdir)/src/H5Ipublic.h \ $(top_srcdir)/src/H5FDpublic.h \ - $(top_srcdir)/src/H5Pprivate.h \ - $(top_srcdir)/src/H5Ppublic.h \ - $(top_srcdir)/src/H5Dpublic.h \ - $(top_srcdir)/src/H5MMpublic.h \ - $(top_srcdir)/src/H5Zpublic.h \ + $(top_srcdir)/src/H5Fpkg.h \ + $(top_srcdir)/src/H5FOprivate.h \ + $(top_srcdir)/src/H5TBprivate.h \ + $(top_srcdir)/src/H5Gprivate.h \ + $(top_srcdir)/src/H5Gpublic.h \ + $(top_srcdir)/src/H5RSprivate.h \ + $(top_srcdir)/src/H5HGprivate.h \ + $(top_srcdir)/src/H5HGpublic.h \ + $(top_srcdir)/src/H5HLprivate.h \ + $(top_srcdir)/src/H5HLpublic.h \ + $(top_srcdir)/src/H5Iprivate.h \ + $(top_srcdir)/src/H5Opkg.h \ $(top_srcdir)/src/H5Oprivate.h \ $(top_srcdir)/src/H5Opublic.h \ + $(top_srcdir)/src/H5Dpublic.h \ $(top_srcdir)/src/H5Spublic.h \ - $(top_srcdir)/src/H5HGprivate.h \ - $(top_srcdir)/src/H5HGpublic.h \ $(top_srcdir)/src/H5Tprivate.h \ $(top_srcdir)/src/H5Tpublic.h \ - $(top_srcdir)/src/H5Gprivate.h \ - $(top_srcdir)/src/H5Gpublic.h \ - $(top_srcdir)/src/H5RSprivate.h \ $(top_srcdir)/src/H5Rprivate.h \ $(top_srcdir)/src/H5Rpublic.h \ $(top_srcdir)/src/H5Zprivate.h \ - $(top_srcdir)/src/H5Fpkg.h \ - $(top_srcdir)/src/H5FOprivate.h \ - $(top_srcdir)/src/H5TBprivate.h \ - $(top_srcdir)/src/H5HLprivate.h \ - $(top_srcdir)/src/H5HLpublic.h \ - $(top_srcdir)/src/H5Opkg.h \ + $(top_srcdir)/src/H5Zpublic.h \ + $(top_srcdir)/src/H5Pprivate.h \ + $(top_srcdir)/src/H5Ppublic.h \ + $(top_srcdir)/src/H5MMpublic.h \ $(top_srcdir)/src/H5FDfamily.h h5createU8.lo: \ $(srcdir)/h5createU8.c \ diff --git a/tools/misc/h5debug.c b/tools/misc/h5debug.c index a27a4db..3643b25 100644 --- a/tools/misc/h5debug.c +++ b/tools/misc/h5debug.c @@ -28,14 +28,14 @@ #define H5O_PACKAGE /*suppress error about including H5Opkg */ #include "H5private.h" -#include "H5Iprivate.h" #include "H5Bprivate.h" -#include "H5Pprivate.h" #include "H5Fpkg.h" #include "H5Gprivate.h" #include "H5HGprivate.h" #include "H5HLprivate.h" +#include "H5Iprivate.h" #include "H5Opkg.h" +#include "H5Pprivate.h" /* File drivers */ #include "H5FDfamily.h" @@ -128,7 +128,7 @@ main(int argc, char *argv[]) /* * Debug the boot block. */ - status = H5F_debug(f, H5P_DATASET_XFER_DEFAULT, addr, stdout, 0, VCOL); + status = H5F_debug(f, H5P_DATASET_XFER_DEFAULT, stdout, 0, VCOL); } else if (!HDmemcmp(sig, H5HL_MAGIC, H5HL_SIZEOF_MAGIC)) { /* -- cgit v0.12