summaryrefslogtreecommitdiffstats
path: root/src/H5F.c
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1998-02-27 20:07:37 (GMT)
committerRobb Matzke <matzke@llnl.gov>1998-02-27 20:07:37 (GMT)
commit0b4d32bb4a12fe0e34026c0f069aa99bf34cd834 (patch)
tree78bda62db83274079ca09e0d6bb4554dafa25544 /src/H5F.c
parented6d456f28862192e5768c279d96ca6da5d0f6cb (diff)
downloadhdf5-0b4d32bb4a12fe0e34026c0f069aa99bf34cd834.zip
hdf5-0b4d32bb4a12fe0e34026c0f069aa99bf34cd834.tar.gz
hdf5-0b4d32bb4a12fe0e34026c0f069aa99bf34cd834.tar.bz2
[svn-r301] Changes since 19980226
---------------------- ./bin/release Changed default to not tag CVS sources. ./src/H5F.c Replaced a constant switch with preprocessor directives. Removed a local variable which was set but not used. ./src/H5Fprivate.h Changed `long long' to `int64' to get rid of ansi warnings in a few places. Fixed bugs in INT64DECODE() and UINT64DECODE() for big-endian architectures. This fixes all the bugs with the Irix -64 compile. ./src/H5F.c The default address and length sizes are set according to the sizeof(size_t) now that the bugs have been fixed. ./src/H5Fpublic.h Removed a trailing comma in an enumerated type. ./src/H5Fstdio.c ./src/H5Fsec2.c Added two more calls to fseek64() and lseek64(). Removed `long long' in place of `int64' to suppress -ansi warnings. ./src/H5P.c Replaced a FAIL with H5F_LOW_ERROR. ./src/H5private.h ./configure.in Increased version number to hdf5-1.0.1a since we've already released hdf5-1.0.0a. Include <sys/types.h>. Fixed indentation. Fixed detection of off64_t for old Irix systems where it might be a struct. ./src/Makefile.in Moved a comment from the shell to the makefile since some versions of sh barf on interactive comments. ./config/linux Allow overriding of the CC variable from the command-line. It still defaults to gcc but this allows us to specify a complete path from test scripts by saying: CC=/usr/local/tools/gnu/gcc sh configure
Diffstat (limited to 'src/H5F.c')
-rw-r--r--src/H5F.c39
1 files changed, 19 insertions, 20 deletions
diff --git a/src/H5F.c b/src/H5F.c
index 36f23a6..da58e8c 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -77,8 +77,8 @@ const H5F_create_t H5F_create_dflt = {
0, /* unused */
0, /* unused */
},
- 4, /* Default offset size */
- 4, /* Default length size */
+ sizeof(size_t), /* Default offset size */
+ sizeof(size_t), /* Default length size */
HDF5_BOOTBLOCK_VERSION, /* Current Boot-Block version # */
HDF5_SMALLOBJECT_VERSION, /* Current Small-Object heap version # */
HDF5_FREESPACE_VERSION, /* Current Free-Space info version # */
@@ -143,23 +143,23 @@ H5F_init_interface(void)
/* Initialize the default file access template */
H5F_access_dflt.driver = H5F_LOW_DFLT;
- switch (H5F_LOW_DFLT) {
- case H5F_LOW_STDIO:
- case H5F_LOW_SEC2:
- case H5F_LOW_CORE:
- case H5F_LOW_SPLIT:
- case H5F_LOW_FAMILY:
- /* nothing more to init */
- break;
-
- case H5F_LOW_MPI:
-#ifdef HAVE_PARALLEL
- H5F_access_dflt.u.mpio.access_mode = 0;
- H5F_access_dflt.u.mpio.comm = MPI_COMM_NULL;
- H5F_access_dflt.u.mpio.info = MPI_INFO_NULL;
+#if (H5F_LOW_DFLT == H5F_LOW_SEC2)
+ /* Nothing to initialize */
+#elif (H5F_LOW_DFLT == H5F_LOW_STDIO)
+ /* Nothing to initialize */
+#elif (H5F_LOW_DFLT == H5F_LOW_CORE)
+ H5F_access_dflt.u.core.increment = 10*1024;
+#elif (H5F_LOW_DFLT == H5F_LOW_MPI)
+ H5F_access_dflt.u.mpio.access_mode = 0;
+ H5F_access_dflt.u.mpio.comm = MPI_COMM_NULL;
+ H5F_access_dflt.u.mpio.info = MPI_INFO_NULL;
+#elif (H5F_LOW_DFLT == H5F_LOW_SPLIT)
+ /* Nothing to initialize */
+#elif (H5F_LOW_DFLT == H5F_LOW_FAMILY)
+ /* Nothing to initialize */
+#else
+# error "Unknown default file driver"
#endif
- break;
- }
FUNC_LEAVE(ret_value);
}
@@ -1388,7 +1388,6 @@ H5F_close(H5F_t *f)
herr_t
H5Fclose(hid_t fid)
{
- H5F_t *file = NULL; /* file struct for file to close */
herr_t ret_value = SUCCEED;
FUNC_ENTER(H5Fclose, FAIL);
@@ -1397,7 +1396,7 @@ H5Fclose(hid_t fid)
if (H5_FILE != H5A_group(fid)) {
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file atom");
}
- if (NULL == (file = H5A_object(fid))) {
+ if (NULL == H5A_object(fid)) {
HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't unatomize file");
}