summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>1997-08-01 22:48:01 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>1997-08-01 22:48:01 (GMT)
commit5cc4d0dcde9fb0f5a941c90a1de9ab964d09a163 (patch)
treef726cf0393700434fd482040c13826c8e3518ffc
parentf474322ca57d2bc5b5f99a7b92cf34d9ad319389 (diff)
downloadhdf5-5cc4d0dcde9fb0f5a941c90a1de9ab964d09a163.zip
hdf5-5cc4d0dcde9fb0f5a941c90a1de9ab964d09a163.tar.gz
hdf5-5cc4d0dcde9fb0f5a941c90a1de9ab964d09a163.tar.bz2
[svn-r11] Moved haddr_t from H5Fprivate.h to H5Fproto.h (so I can store the address of
the object header in the dataset structure). Also deleted the support for a "per file" error stack, since we've decided to go with a "per thread" model (currently).
-rw-r--r--src/H5F.c4
-rw-r--r--src/H5Fprivate.h14
-rw-r--r--src/H5Fproto.h10
3 files changed, 10 insertions, 18 deletions
diff --git a/src/H5F.c b/src/H5F.c
index e924630..7a43ca9 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -345,9 +345,6 @@ H5F_new (void)
{
hdf5_file_t *f = H5MM_xcalloc (1, sizeof(hdf5_file_t));
- /* Create an error stack for errors with this file */
- f->file_err = H5Enew_err_stack(HDF5_FILE_ERRSTACK);
-
/* Create a cache */
H5AC_new (f);
@@ -383,7 +380,6 @@ H5F_dest (hdf5_file_t *f)
{
if (f) {
H5AC_dest (f);
- if(f->file_err!=0) H5Edelete_err_stack (f->file_err);
f->dir = H5MM_xfree (f->dir);
f->filename = H5MM_xfree (f->filename);
H5MM_xfree (f);
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index 9d45af8..2856b6a 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -32,26 +32,12 @@
#define H5F_SIZEOF_OFFSET(F) ((F)->file_create_parms.offset_size)
#define H5F_SIZEOF_SIZE(F) ((F)->file_create_parms.length_size)
-/* Size of the default error stack for file IDs */
-#define HDF5_FILE_ERRSTACK 16
-
-/*
- * If we're using POSIXUNBUFIO and lseek64() is available, then use
- * 64-bit file offsets. Otherwise use whatever `off_t' is.
- */
-#if (FILELIB==POSIXUNBUFIO) && defined(H5_HAVE_OFF64_T) && defined(H5_HAVE_LSEEK64)
-typedef off64_t haddr_t;
-#else
-typedef off_t haddr_t;
-#endif
-
/* Define the structure to store the file information for HDF5 files */
typedef struct {
char *dir; /* Directory the file is located within */
char *filename; /* Filename of file */
uintn acc_perm; /* Access Permissions for file */
hdf_file_t file_handle; /* File handle for actual I/O */
- int32 file_err; /* Error stack ID for this file */
uintn ref_count; /* Reference count for number of times file is opened */
uint32 consist_flags; /* File Consistency Flags */
haddr_t smallobj_off; /* Offset of small-object heap within the file */
diff --git a/src/H5Fproto.h b/src/H5Fproto.h
index 0600179..7236bdd 100644
--- a/src/H5Fproto.h
+++ b/src/H5Fproto.h
@@ -23,6 +23,16 @@
#define H5ACC_WRITE 0x0001 /* User in H5Fopen to open a file with write access */
#define H5ACC_OVERWRITE 0x0002 /* User in H5Fcreate truncate an existing file */
+/*
+ * If we're using POSIXUNBUFIO and lseek64() is available, then use
+ * 64-bit file offsets. Otherwise use whatever `off_t' is.
+ */
+#if (FILELIB==POSIXUNBUFIO) && defined(H5_HAVE_OFF64_T) && defined(H5_HAVE_LSEEK64)
+typedef off64_t haddr_t;
+#else
+typedef off_t haddr_t;
+#endif
+
#if defined c_plusplus || defined __cplusplus
extern "C"
{