summaryrefslogtreecommitdiffstats
path: root/src/H5Fcore.c
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1998-04-08 21:43:02 (GMT)
committerRobb Matzke <matzke@llnl.gov>1998-04-08 21:43:02 (GMT)
commitc01750fa740943c0083711b353278143c79d50a3 (patch)
treefd475b7c7a3639c05b30625b43547850d687b948 /src/H5Fcore.c
parent68fa66bf8130d6a6e607e233da8cc61a154bf172 (diff)
downloadhdf5-c01750fa740943c0083711b353278143c79d50a3.zip
hdf5-c01750fa740943c0083711b353278143c79d50a3.tar.gz
hdf5-c01750fa740943c0083711b353278143c79d50a3.tar.bz2
[svn-r338] Changes since 19980407
---------------------- ./src/H5B.c ./src/H5D.c ./src/H5Dprivate.h ./src/H5Dpublic.h ./src/H5F.c ./src/H5Farray.c ./src/H5Fcore.c ./src/H5Ffamily.c ./src/H5Fistore.c ./src/H5Flow.c ./src/H5Fprivate.h ./src/H5Fpublic.h ./src/H5Fsec2.c ./src/H5Fsplit.c ./src/H5Fstdio.c ./src/H5G.c ./src/H5Gent.c ./src/H5Gnode.c ./src/H5HG.c ./src/H5HL.c ./src/H5MF.c ./src/H5MFprivate.h ./src/H5O.c ./src/H5Ocont.c ./src/H5Odtype.c ./src/H5Oefl.c ./src/H5Olayout.c ./src/H5Oname.c ./src/H5Oprivate.h ./src/H5Osdspace.c ./src/H5Oshared.c ./src/H5Ostab.c ./src/H5P.c ./src/H5Ppublic.h ./src/H5S.c ./src/H5Sprivate.h ./src/H5Spublic.h ./src/H5Ssimp.c ./src/H5Tconv.c ./src/H5Tpkg.h ./src/H5V.c ./src/H5Vprivate.h ./src/H5private.h ./src/H5public.h ./src/h5ls.c ./test/cmpd_dset.c ./test/dsets.c ./test/extend.c ./test/external.c ./test/hyperslab.c ./test/iopipe.c ./test/istore.c ./test/shtype.c ./test/tfile.c ./test/th5s.c Anything having to do with the size of a dataset now uses the types `hsize_t' and `hssize_t' which must be the same size and at least as large as `size_t'. This isn't fully tested yet, so hsize_t and hssize_t are defined as size_t and ssize_t in H5public.h. Setting them to larger values will trip up gcc versions less than 2.8.1 on x86 platforms. Documented unused function formals with `__unused__' before the formal name. This also has the effect of supressing warning messages for gcc since it's defined to be `__attribute__((unused))' in the H5private.h file. ./src/debug.c ./src/h5ls.c If the file name contains a `%' then the file is opened as a file family with H5P_DEFAULT for the file member access property list. ./src/h5ls.c The group name is optional, defaulting to `/'. ./src/hdf5.h Added some missing public header files.
Diffstat (limited to 'src/H5Fcore.c')
-rw-r--r--src/H5Fcore.c165
1 files changed, 81 insertions, 84 deletions
diff --git a/src/H5Fcore.c b/src/H5Fcore.c
index 9ff3c44..4f8e216 100644
--- a/src/H5Fcore.c
+++ b/src/H5Fcore.c
@@ -1,17 +1,17 @@
/*
* Copyright (C) 1997 NCSA
- * All rights reserved.
+ * All rights reserved.
*
* Programmer: Robb Matzke <matzke@llnl.gov>
- * Wednesday, October 22, 1997
+ * Wednesday, October 22, 1997
*
- * Purpose: This file implements an in-core temporary file. It's intended
- * for storing small temporary files such as wrappers generated
- * on the fly.
+ * Purpose: This file implements an in-core temporary file. It's intended
+ * for storing small temporary files such as wrappers generated
+ * on the fly.
*
* Note: This is mostly an exercise to help clean up parts of the H5F
- * package since this driver is quite different than the other
- * low level drivers we have so far.
+ * package since this driver is quite different than the other
+ * low level drivers we have so far.
*
*/
#include <H5private.h>
@@ -19,10 +19,10 @@
#include <H5Fprivate.h>
#include <H5MMprivate.h>
-#define H5F_CORE_DEV 0xffff /*pseudo dev for core until we fix things */
+#define H5F_CORE_DEV 0xffff /*pseudo dev for core until we fix things */
-#define PABLO_MASK H5F_core
-static hbool_t interface_initialize_g = FALSE;
+#define PABLO_MASK H5F_core
+static hbool_t interface_initialize_g = FALSE;
#define INTERFACE_INIT NULL
static hbool_t H5F_core_access(const char *name,
@@ -38,41 +38,40 @@ static herr_t H5F_core_write(H5F_low_t *lf, const H5F_access_t *access_parms,
const haddr_t *addr, size_t size,
const uint8 *buf);
-const H5F_low_class_t H5F_LOW_CORE_g[1] = {{
- H5F_core_access, /* access method */
- H5F_core_open, /* open method */
- H5F_core_close, /* close method */
- H5F_core_read, /* read method */
- H5F_core_write, /* write method */
- NULL, /* flush method */
- NULL, /* extend method */
+const H5F_low_class_t H5F_LOW_CORE_g[1] = {{
+ H5F_core_access, /* access method */
+ H5F_core_open, /* open method */
+ H5F_core_close, /* close method */
+ H5F_core_read, /* read method */
+ H5F_core_write, /* write method */
+ NULL, /* flush method */
+ NULL, /* extend method */
}};
/*-------------------------------------------------------------------------
- * Function: H5F_core_access
+ * Function: H5F_core_access
*
- * Purpose: Determines if the specified file already exists. This driver
- * doesn't use names, so every call to H5F_core_open() would
- * create a new file. Therefore, this function always returns
- * false and KEY is never initialized.
+ * Purpose: Determines if the specified file already exists. This driver
+ * doesn't use names, so every call to H5F_core_open() would
+ * create a new file. Therefore, this function always returns
+ * false and KEY is never initialized.
*
- * Return: Success: FALSE
+ * Return: Success: FALSE
*
- * Failure: FAIL
+ * Failure: FAIL
*
- * Programmer: Robb Matzke
- * Friday, October 24, 1997
+ * Programmer: Robb Matzke
+ * Friday, October 24, 1997
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static hbool_t
-H5F_core_access(const char *name __attribute__((unused)),
- const H5F_access_t *access_parms __attribute__((unused)),
- int mode __attribute__((unused)),
- H5F_search_t *key/*out*/ __attribute__((unused)))
+H5F_core_access(const char __unused__*name,
+ const H5F_access_t __unused__ *access_parms,
+ int __unused__ mode, H5F_search_t __unused__ *key/*out*/)
{
FUNC_ENTER(H5F_core_access, FAIL);
FUNC_LEAVE(FALSE);
@@ -80,39 +79,39 @@ H5F_core_access(const char *name __attribute__((unused)),
/*-------------------------------------------------------------------------
- * Function: H5F_core_open
+ * Function: H5F_core_open
*
- * Purpose: Opens a temporary file which will exist only in memory. The
- * NAME argument is unused. The FLAGS are a bit field with
- * the possible values defined in H5F_low_open().
+ * Purpose: Opens a temporary file which will exist only in memory. The
+ * NAME argument is unused. The FLAGS are a bit field with
+ * the possible values defined in H5F_low_open().
*
* Errors:
- * IO CANTOPENFILE Must creat file with write access.
+ * IO CANTOPENFILE Must creat file with write access.
*
- * Return: Success: Low-level file pointer
+ * Return: Success: Low-level file pointer
*
- * Failure: NULL
+ * Failure: NULL
*
- * Programmer: Robb Matzke
- * Wednesday, October 22, 1997
+ * Programmer: Robb Matzke
+ * Wednesday, October 22, 1997
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static H5F_low_t *
-H5F_core_open(const char *name __attribute__((unused)),
- const H5F_access_t *access_parms __attribute__((unused)),
+H5F_core_open(const char __unused__ *name,
+ const H5F_access_t __unused__ *access_parms,
uintn flags, H5F_search_t *key/*out*/)
{
- H5F_low_t *lf = NULL;
- static ino_t ino = 0;
+ H5F_low_t *lf = NULL;
+ static ino_t ino = 0;
FUNC_ENTER(H5F_core_open, NULL);
if (0 == (flags & H5F_ACC_RDWR) || 0 == (flags & H5F_ACC_CREAT)) {
- HRETURN_ERROR(H5E_IO, H5E_CANTOPENFILE, NULL,
- "must creat file with write access");
+ HRETURN_ERROR(H5E_IO, H5E_CANTOPENFILE, NULL,
+ "must creat file with write access");
}
lf = H5MM_xcalloc(1, sizeof(H5F_low_t));
@@ -122,8 +121,8 @@ H5F_core_open(const char *name __attribute__((unused)),
H5F_addr_reset(&(lf->eof));
if (key) {
- key->dev = H5F_CORE_DEV;
- key->ino = ino++;
+ key->dev = H5F_CORE_DEV;
+ key->ino = ino++;
}
FUNC_LEAVE(lf);
@@ -131,26 +130,25 @@ H5F_core_open(const char *name __attribute__((unused)),
/*-------------------------------------------------------------------------
- * Function: H5F_core_close
+ * Function: H5F_core_close
*
- * Purpose: Closes a file.
+ * Purpose: Closes a file.
*
* Errors:
*
- * Return: Success: SUCCEED
+ * Return: Success: SUCCEED
*
- * Failure: FAIL
+ * Failure: FAIL
*
- * Programmer: Robb Matzke
- * Wednesday, October 22, 1997
+ * Programmer: Robb Matzke
+ * Wednesday, October 22, 1997
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static herr_t
-H5F_core_close(H5F_low_t *lf,
- const H5F_access_t *access_parms __attribute__((unused)))
+H5F_core_close(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms)
{
FUNC_ENTER(H5F_core_close, FAIL);
@@ -163,32 +161,31 @@ H5F_core_close(H5F_low_t *lf,
/*-------------------------------------------------------------------------
- * Function: H5F_core_read
+ * Function: H5F_core_read
*
- * Purpose: Reads SIZE bytes beginning at address ADDR in file LF and
- * places them in buffer BUF. Reading past the logical or
- * physical end of the file returns zeros instead of failing.
+ * Purpose: Reads SIZE bytes beginning at address ADDR in file LF and
+ * places them in buffer BUF. Reading past the logical or
+ * physical end of the file returns zeros instead of failing.
*
* Errors:
*
- * Return: Success: SUCCEED
+ * Return: Success: SUCCEED
*
- * Failure: FAIL
+ * Failure: FAIL
*
- * Programmer: Robb Matzke
- * Wednesday, October 22, 1997
+ * Programmer: Robb Matzke
+ * Wednesday, October 22, 1997
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static herr_t
-H5F_core_read(H5F_low_t *lf,
- const H5F_access_t *access_parms __attribute__((unused)),
+H5F_core_read(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms,
const haddr_t *addr, size_t size, uint8 *buf)
{
- size_t n;
- size_t eof;
+ size_t n;
+ size_t eof;
FUNC_ENTER(H5F_core_read, FAIL);
@@ -199,11 +196,11 @@ H5F_core_read(H5F_low_t *lf,
eof = MIN(lf->eof.offset, lf->u.core.size);
if (addr->offset >= eof) {
- HDmemset(buf, 0, size);
+ HDmemset(buf, 0, size);
} else {
- n = MIN(size, eof - addr->offset);
- HDmemcpy(buf, lf->u.core.mem + addr->offset, n);
- HDmemset(buf + n, 0, size - n);
+ n = MIN(size, eof-addr->offset);
+ HDmemcpy(buf, lf->u.core.mem + addr->offset, n);
+ HDmemset(buf+n, 0, size-n);
}
FUNC_LEAVE(SUCCEED);
@@ -211,20 +208,20 @@ H5F_core_read(H5F_low_t *lf,
/*-------------------------------------------------------------------------
- * Function: H5F_core_write
+ * Function: H5F_core_write
*
- * Purpose: Writes SIZE bytes from the beginning of BUF into file LF at
- * file address ADDR. The file is extended as necessary to
- * accommodate the new data.
+ * Purpose: Writes SIZE bytes from the beginning of BUF into file LF at
+ * file address ADDR. The file is extended as necessary to
+ * accommodate the new data.
*
* Errors:
*
- * Return: Success: SUCCEED
+ * Return: Success: SUCCEED
*
- * Failure: FAIL
+ * Failure: FAIL
*
- * Programmer: Robb Matzke
- * Wednesday, October 22, 1997
+ * Programmer: Robb Matzke
+ * Wednesday, October 22, 1997
*
* Modifications:
*
@@ -255,17 +252,17 @@ H5F_core_write(H5F_low_t *lf, const H5F_access_t *access_parms,
need_more = addr->offset+size - lf->u.core.alloc;
need_more = increment*((need_more+increment-1)/increment);
- lf->u.core.alloc = lf->u.core.alloc + need_more;
- lf->u.core.mem = H5MM_xrealloc(lf->u.core.mem, lf->u.core.alloc);
+ lf->u.core.alloc = lf->u.core.alloc + need_more;
+ lf->u.core.mem = H5MM_xrealloc(lf->u.core.mem, lf->u.core.alloc);
}
/* Move the physical EOF marker */
if (addr->offset + size > lf->u.core.size) {
- lf->u.core.size = addr->offset + size;
+ lf->u.core.size = addr->offset + size;
}
/* Copy data */
- HDmemcpy(lf->u.core.mem + addr->offset, buf, size);
+ HDmemcpy(lf->u.core.mem+addr->offset, buf, size);
FUNC_LEAVE(SUCCEED);
}