[svn-r35] ./src/H5ACproto.h

./src/H5Aproto.h
./src/H5Bproto.h
./src/H5Cproto.h
./src/H5Dproto.h
./src/H5Eproto.h
./src/H5Fproto.h
./src/H5Gproto.h
./src/H5Hproto.h
./src/H5MFproto.h
./src/H5MMproto.h
./src/H5Mproto.h
./src/H5Oproto.h
./src/H5Pproto.h
./src/H5Tproto.h
./src/H5proto.h
	These files were removed from the library and renamed by
	changing `proto' to `public'.

./src/H5ACpublic.h	NEW
./src/H5Apublic.h	NEW
./src/H5Bpublic.h	NEW
./src/H5Cpublic.h	NEW
./src/H5Dpublic.h	NEW
./src/H5Epublic.h	NEW
./src/H5Fpublic.h	NEW
./src/H5Gpublic.h	NEW
./src/H5Hpublic.h	NEW
./src/H5MFpublic.h	NEW
./src/H5MMpublic.h	NEW
./src/H5Mpublic.h	NEW
./src/H5Opublic.h	NEW
./src/H5Ppublic.h	NEW
./src/H5Tpublic.h	NEW
./src/H5public.h	NEW
	These files came from the old H5*proto.h files.

./src/Makefile
./src/Makefile.in	NEW
	Removed.  Now generated automatically from Makefile.in by
	running configure.

./src/h5oplat.h
./src/hdf5fort.h
./src/hdf5gen.h
./src/hdf5glob.h
./src/hdf5lims.h
./src/hdf5meta.h
./src/hdf5pabl.h
./src/hdf5plat.h
./src/hdf5port.h
./src/hdf5type.h
	Removed.  The contents of these files has moved to other
	header files or source files depending on it's nature.

./src/H5.c
./src/H5A.c
./src/H5B.c
./src/H5C.c
./src/H5D.c
./src/H5E.c
./src/H5F.c
./src/H5G.c
./src/H5H.c
./src/H5M.c
./src/H5MF.c
./src/H5MM.c
./src/H5O.c
./src/H5Ocont.c
./src/H5Oname.c
./src/H5Onull.c
./src/H5Ostab.c
./src/H5P.c
./src/H5T.c
	Fixed include files.  Moved some things from old headers into
	these files.

./src/H5ACprivate.h
./src/H5Aprivate.h
./src/H5Bprivate.h
./src/H5Cprivate.h
./src/H5Dprivate.h
./src/H5Eprivate.h
./src/H5Fprivate.h
./src/H5Gprivate.h
./src/H5Hprivate.h
./src/H5MFprivate.h
./src/H5MMprivate.h
./src/H5Mprivate.h
./src/H5Oprivate.h
./src/H5Pprivate.h
./src/H5Tprivate.h
./src/H5private.h
./src/debug.c
	Fixed include files.

./src/hdf5.h
	This is now the top-level *PUBLIC* include file.  It should
	never appear in the library *.c files.

1 files changed, 18 insertions, 18 deletions

diff --git a/src/H5F.c b/src/H5F.c
index 89725ea..bed46fd 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -32,17 +32,15 @@ static char RcsId[] = "@(#)$Revision$";
        H5F_init_interface    -- initialize the H5F interface
  */
 
-#include <assert.h>
-
-#define HDF5_FILE_MASTER
-#include "hdf5.h"
-#undef HDF5_FILE_MASTER
-
 /* Packages needed by this file... */
-#include "H5private.h"      	/*library functions			*/
-#include "H5ACprivate.h"	/*cache					*/
-#include "H5Gprivate.h"		/*symbol tables				*/
-#include "H5MMprivate.h"	/*core memory management		*/
+#include <H5private.h>      	/*library functions			*/
+#include <H5Aprivate.h>		/*atoms					*/
+#include <H5ACprivate.h>	/*cache					*/
+#include <H5Cprivate.h>		/*templates				*/
+#include <H5Eprivate.h>		/*error handling			*/
+#include <H5Gprivate.h>		/*symbol tables				*/
+#include <H5Mprivate.h>		/*meta data				*/
+#include <H5MMprivate.h>	/*core memory management		*/
 
 #define PABLO_MASK	H5F_mask
 
@@ -79,7 +77,7 @@ static herr_t H5F_init_interface(void)
     FUNC_ENTER (H5F_init_interface, NULL, FAIL);
 
     /* Initialize the atom group for the file IDs */
-    ret_value=H5Ainit_group(H5_FILE,HDF5_FILEID_HASHSIZE,0);
+    ret_value=H5Ainit_group(H5_FILE,H5A_FILEID_HASHSIZE,0);
 
     FUNC_LEAVE(ret_value);
 }	/* H5F_init_interface */
@@ -251,7 +249,7 @@ done:
 hbool_t H5Fis_hdf5(const char *filename)
 {
     hdf_file_t f_handle=H5F_INVALID_FILE;      /* file handle */
-    uint8 temp_buf[HDF5_FILE_SIGNATURE_LEN];    /* temporary buffer for checking file signature */
+    uint8 temp_buf[H5F_SIGNATURE_LEN];    /* temporary buffer for checking file signature */
     haddr_t curr_off=0;          /* The current offset to check in the file */
     size_t file_len=0;          /* The length of the file we are checking */
     hbool_t ret_value = BFALSE;
@@ -278,9 +276,9 @@ hbool_t H5Fis_hdf5(const char *filename)
       {
         if(H5F_SEEK(f_handle,curr_off)==FAIL)
             HGOTO_ERROR(H5E_IO, H5E_READERROR, BFAIL);
-        if(H5F_READ(f_handle,temp_buf, HDF5_FILE_SIGNATURE_LEN)==FAIL)
+        if(H5F_READ(f_handle,temp_buf, H5F_SIGNATURE_LEN)==FAIL)
             HGOTO_ERROR(H5E_IO, H5E_READERROR, BFAIL);
-        if(HDmemcmp(temp_buf,HDF5_FILE_SIGNATURE,HDF5_FILE_SIGNATURE_LEN)==0)
+        if(HDmemcmp(temp_buf,H5F_SIGNATURE,H5F_SIGNATURE_LEN)==0)
           {
             ret_value=BTRUE;
             break;
@@ -496,7 +494,7 @@ hatom_t H5Fcreate(const char *filename, uintn flags, hatom_t create_temp, hatom_
             HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL);
     
     /* Write out the file-signature */
-    if(H5F_WRITE(new_file->file_handle,HDF5_FILE_SIGNATURE,HDF5_FILE_SIGNATURE_LEN)==FAIL)
+    if(H5F_WRITE(new_file->file_handle,H5F_SIGNATURE,H5F_SIGNATURE_LEN)==FAIL)
         HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL);
 
     /* Encode the boot block */
@@ -659,9 +657,9 @@ hatom_t H5Fopen(const char *filename, uintn flags, hatom_t access_temp)
       {
         if(H5F_SEEK(new_file->file_handle,curr_off)==FAIL)
             HGOTO_ERROR(H5E_IO, H5E_READERROR, BFAIL);
-        if(H5F_READ(new_file->file_handle,temp_buf, HDF5_FILE_SIGNATURE_LEN)==FAIL)
+        if(H5F_READ(new_file->file_handle,temp_buf, H5F_SIGNATURE_LEN)==FAIL)
             HGOTO_ERROR(H5E_IO, H5E_READERROR, BFAIL);
-        if(HDmemcmp(temp_buf,HDF5_FILE_SIGNATURE,HDF5_FILE_SIGNATURE_LEN)==0)
+        if(HDmemcmp(temp_buf,H5F_SIGNATURE,H5F_SIGNATURE_LEN)==0)
           {
             new_file->file_create_parms.userblock_size=curr_off;
             break;
@@ -711,7 +709,9 @@ hatom_t H5Fopen(const char *filename, uintn flags, hatom_t access_temp)
        HGOTO_ERROR (H5E_IO, H5E_READERROR, FAIL);
     }
     /* Set the initial type of the root symbol-entry */
-    new_file->root_type= (new_file->root_sym->addr>=0) ? H5F_ROOT_UNKNOWN : H5F_NONE;
+#ifdef QUINCEY
+    new_file->root_type= (new_file->root_sym->header>=0) ? H5F_ROOT_UNKNOWN : H5F_NONE;
+#endif
 
     /* Get an atom for the file */
     if((ret_value=H5Aregister_atom(H5_FILE, new_file))==FAIL)