summaryrefslogtreecommitdiffstats
path: root/src/H5G.c
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1997-12-10 22:41:07 (GMT)
committerRobb Matzke <matzke@llnl.gov>1997-12-10 22:41:07 (GMT)
commit082dd8cda9ef3d49be23dfce49e10dd30d0758bc (patch)
treee60a32468ba14f758849f34454fdd8722b72edaa /src/H5G.c
parent3aee91269b83b09a186d214c55873fbbfa15602d (diff)
downloadhdf5-082dd8cda9ef3d49be23dfce49e10dd30d0758bc.zip
hdf5-082dd8cda9ef3d49be23dfce49e10dd30d0758bc.tar.gz
hdf5-082dd8cda9ef3d49be23dfce49e10dd30d0758bc.tar.bz2
[svn-r139] ./src/*.[ch]
Removed the interface initialization argument from FUNC_ENTER() and made it a locally-defined preprocessor symbol, INTERFACE_INIT. Changed `offset' to `address' and `length' to `size' in documentation so it's more consistent. `Offset' still appears occassionally when it refers to a byte offset within some other data structure. Moved interface termination function prototypes from public header files to .c files and made them static. ./src/H5.c ./src/H5public.h Added H5init() because it's possible that the predefined data types are not initialized. This happens only if the first call to the hdf5 library passes a predefined data type symbol as an argument. There should be some way to fix this... ./src/H5A.c ./src/H5Aprivate.h ./src/H5Apublic.h The free_func returns SUCCEED or FAIL, although the return value is ignored by H5A. This is so we can use the various H5*_close() functions to free things. H5Ainc_ref() and H5Adec_ref() are no longer public. Many of the other atom functions should also be made private, but I'll save that for later... Added additional template groups called H5_TEMPLATE_0 through H5_TEMPLATE_7 that are used by the various template subclasses. Increased the number of bits used for atom groups to prevent negative atoms. ./src/H5AC.c ./src/H5ACprivate.h Changed H5AC_new() to H5AC_create() to make names more consistent. ./src/H5B.c ./src/H5Bprivate.h Changed H5B_new() to H5B_create() to make names more consistent. ./src/H5C.c ./src/H5Cprivate.h ./src/H5Cpublic.h Now supports multiple subclasses of templates, although it's done with big switch statements. The default values for templates are defined in the source file to which that template belongs. This got rid of lots of needless preprocessor constants. Added H5Ccreate() to create a new template. Changed H5C_release() to H5Cclose() to make the naming more consistent. ./src/H5D.c ./src/H5Dprivate.h ./src/H5Dpublic.h Enhanced to use the new dataset interface, and uses the enhanced data type and data space interfaces, which haven't been completely implemented. The dataset interface doesn't handle non-contiguous storage, compression, or data type and space conversions yet. ./src/H5F.c ./src/H5Fprivate.h ./src/H5Fpublic.h Removed H5Fflush() since just calls H5F_flush(), which doesn't do what the user would probably think it does, namely, flush everything. It only flushes those things sitting in the H5AC cache and the boot block. Changed the `file_create_parms' field of H5F_low_t to just `create_parms' since the `file' part is obvious. ./src/H5Fistore.c Added some support for external files. Mostly just in the file format and not supported much by the library yet. I need to finish some dataset functions first. Changed H5F_istore_new() to H5F_istore_create() to make names more uniform across packages. ./src/H5Flow.c Flushing a file causes the file to be physically extended to the logical eof. This prevents H5F_open() from thinking a file has been truncated. Most of the time the file will already be that large, and when it isn't Unix will often just allocate the final block anyway. ./src/H5G.c ./src/H5Gent.c ./src/H5Gnode.c ./src/H5Gpkg.h ./src/H5Gprivate.h ./src/H5Gstab.c Removed H5G_basename() Removed (temporarily) data type information from symbol table entries and renamed H5G_CACHED_SDATA to H5G_CACHED_SDSPACE to reflect that it's a simple data space and has nothing to do with raw data. Changed H5G_node_new() to H5G_node_create() and H5G_stab_new() to H5G_stab_create() to make names more uniform across packages. Fixed an undefined address bug that happens when H5G_node_debug() program doesn't pass enough info to H5G_node_load(). ./src/H5H.c ./src/H5Hprivate.h Changed H5H_new() to H5H_create() to make the names more uniform across packages. ./src/H5M.c ./src/H5Mprivate.h ./src/H5Mpublic.h Nulled all the create functions. Most of the other callbacks are to public functions. Removed H5Mcreate(). Changed hobjtype_t to group_t since it has to be the same thing anyway. ./src/H5O.c ./src/H5Oprivate.h ./src/H5Osdim.c ./src/H5Osdtyp.c Changed H5O_SIM_DIM to H5O_SDSPACE (simple data space) since `simple data space' is its official name, not `simple dimensions'. Will eventually add H5O_CDSPACE for comples data spaces. Changed _sim_dim_ to _dspace_. Replaced H5O_SIM_DTYPE and the compound data type messages with a single H5O_DTYPE message. Changed _sim_dtype_ to _dtype_. Changed H5O_STD_STORE to H5O_CSTORE (contiguous storage) since contiguous storage is not necessarily standard. Changed _std_store_ to _cstore_ in H5Ocstore.c Added the H5O_EFL (external file list) message. Changed H5O_new() to H5O_create() to make names more uniform across packages. ./src/H5Oefl.c NEW External file list message for specifying which non-hdf5 files contain raw data for a dataset. ./src/H5P.c ./src/H5Pprivate.h ./src/H5Ppublic.h Renamed and moved data structures to make the names conform to our naming scheme. ./src/H5T.c ./src/H5Tprivate.h ./src/H5Tpublic.h ./src/H5Tpkg.h NEW Data structures redesigned to be more flexible. The interface was redesigned to make it more regular and to make some names more uniform across packages. ./src/H5detect.c Output was changed to produce a file that conforms to the hdf5 coding standard. ./src/Makefile.in Generates H5Tinit.c by running H5detect. ./src/debug.c Moved command argument processing.
Diffstat (limited to 'src/H5G.c')
-rw-r--r--src/H5G.c93
1 files changed, 21 insertions, 72 deletions
diff --git a/src/H5G.c b/src/H5G.c
index 5c1e2cd..a45ab02 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -47,9 +47,9 @@
#define H5G_INIT_HEAP 8192
#define PABLO_MASK H5G_mask
-/* Is the interface initialized? */
+/* Interface initialization */
static hbool_t interface_initialize_g = FALSE;
-
+#define INTERFACE_INIT NULL
/*-------------------------------------------------------------------------
@@ -92,7 +92,7 @@ H5Gnew (hid_t file, const char *name, size_t size_hint)
H5F_t *f=NULL;
H5G_entry_t *grp_handle=NULL;
- FUNC_ENTER (H5Gnew, NULL, FAIL);
+ FUNC_ENTER (H5Gnew, FAIL);
/* Check/fix arguments */
if (!name || !*name) {
@@ -158,7 +158,7 @@ H5Gset (hid_t file, const char *name)
{
H5F_t *f=NULL;
- FUNC_ENTER (H5Gset, NULL, FAIL);
+ FUNC_ENTER (H5Gset, FAIL);
/* Check/fix arguments */
if (!name || !*name) {
@@ -217,7 +217,7 @@ H5Gpush (hid_t file, const char *name)
{
H5F_t *f=NULL;
- FUNC_ENTER (H5Gpush, NULL, FAIL);
+ FUNC_ENTER (H5Gpush, FAIL);
/* Check/fix arguments */
if (!name || !*name) {
@@ -277,7 +277,7 @@ H5Gpop (hid_t file)
{
H5F_t *f=NULL;
- FUNC_ENTER (H5Gpop, NULL, FAIL);
+ FUNC_ENTER (H5Gpop, FAIL);
/* Check/fix arguments */
if (H5_FILE!=H5Aatom_group (file)) {
@@ -346,57 +346,6 @@ H5G_component (const char *name, size_t *size_p)
/*-------------------------------------------------------------------------
- * Function: H5G_basename
- *
- * Purpose: Returns a pointer into NAME for the start of the last
- * component of NAME. On return, the optional SIZE_P is
- * initialized to point to the size of the base name not
- * counting trailing slashes or the null character.
- *
- * Errors:
- *
- * Return: Success: Ptr to base name within NAME with SIZE_P
- * pointing to the number of characters in the
- * base name.
- *
- * Failure: Ptr to the null terminator of NAME.
- *
- * Programmer: Robb Matzke
- * matzke@llnl.gov
- * Aug 11 1997
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-#if 0
-static const char *
-H5G_basename (const char *name, size_t *size_p)
-{
- const char *s;
-
- assert (name);
-
- s = name + HDstrlen(name);
- while (s>name && '/'==s[-1]) --s; /*skip past trailing slashes*/
- while (s>name && '/'!=s[-1]) --s; /*skip past base name*/
-
- /*
- * If the input was the name of the root group `/' (or
- * equivalent) then return the null string.
- */
- if ('/'==*s) {
- if (size_p) *size_p = 0;
- return s + HDstrlen(s); /*null terminator*/
- }
-
- if (size_p) *size_p = HDstrcspn (s, "/");
- return s;
-}
-#endif
-
-
-/*-------------------------------------------------------------------------
* Function: H5G_namei
*
* Purpose: (Partially) translates a name to a symbol table entry.
@@ -476,7 +425,7 @@ H5G_namei (H5F_t *f, H5G_entry_t *cwg, const char *name,
H5F_addr_undef (&(grp_ent->header));
}
- FUNC_ENTER (H5G_namei, NULL, NULL);
+ FUNC_ENTER (H5G_namei, NULL);
/* check args */
assert (f);
@@ -619,7 +568,7 @@ H5G_mkroot (H5F_t *f, size_t size_hint)
H5G_entry_t *ent_ptr=NULL; /*pointer to a symbol table entry*/
const char *obj_name=NULL; /*name of old root object */
- FUNC_ENTER (H5G_mkroot, NULL, FAIL);
+ FUNC_ENTER (H5G_mkroot, FAIL);
/*
* Make sure that the file descriptor has the latest info -- someone might
@@ -657,7 +606,7 @@ H5G_mkroot (H5F_t *f, size_t size_hint)
* something goes wrong at this step, closing the `handle' will rewrite
* info back into f->root_sym because we set the dirty bit.
*/
- if (H5G_stab_new (f, f->shared->root_sym, size_hint)<0) {
+ if (H5G_stab_create (f, f->shared->root_sym, size_hint)<0) {
HGOTO_ERROR (H5E_SYM, H5E_CANTINIT, FAIL); /*cant create root*/
}
if (1!=H5O_link (f, f->shared->root_sym, 1)) {
@@ -753,7 +702,7 @@ H5G_new (H5F_t *f, const char *name, size_t size_hint)
size_t nchars; /*number of characters in compon*/
herr_t status; /*function return status */
- FUNC_ENTER (H5G_new, NULL, NULL);
+ FUNC_ENTER (H5G_new, NULL);
/* check args */
assert (f);
@@ -800,7 +749,7 @@ H5G_new (H5F_t *f, const char *name, size_t size_hint)
}
/* create group */
- if (H5G_stab_new (f, &ent, size_hint)<0) {
+ if (H5G_stab_create (f, &ent, size_hint)<0) {
HRETURN_ERROR (H5E_SYM, H5E_CANTINIT, NULL); /*can't create grp*/
}
@@ -851,7 +800,7 @@ H5G_set (H5F_t *f, const char *name)
H5O_stab_t stab_mesg;
herr_t ret_value=FAIL;
- FUNC_ENTER (H5G_set, NULL, FAIL);
+ FUNC_ENTER (H5G_set, FAIL);
if (NULL==(handle=H5G_open (f, name))) {
/* Can't open group */
@@ -913,7 +862,7 @@ H5G_getcwg (H5F_t *f)
{
H5G_entry_t *handle=NULL;
- FUNC_ENTER (H5G_getcwg, NULL, NULL);
+ FUNC_ENTER (H5G_getcwg, NULL);
if (f->cwg_stack && f->cwg_stack->handle) {
handle = f->cwg_stack->handle;
@@ -955,7 +904,7 @@ H5G_push (H5F_t *f, const char *name)
H5O_stab_t stab_mesg;
herr_t ret_value = FAIL;
- FUNC_ENTER (H5G_pushd, NULL, FAIL);
+ FUNC_ENTER (H5G_push, FAIL);
if (NULL==(handle=H5G_open (f, name))) {
/* Can't open group */
@@ -1009,7 +958,7 @@ H5G_pop (H5F_t *f)
{
H5G_cwgstk_t *stack=NULL;
- FUNC_ENTER (H5G_pop, NULL, FAIL);
+ FUNC_ENTER (H5G_pop, FAIL);
if ((stack=f->cwg_stack)) {
if (H5G_close (f, stack->handle)<0) {
@@ -1075,7 +1024,7 @@ H5G_create (H5F_t *f, const char *name, size_t ohdr_hint)
size_t nchars; /*number of characters in name */
char _comp[1024]; /*name component */
- FUNC_ENTER (H5G_create, NULL, NULL);
+ FUNC_ENTER (H5G_create, NULL);
/* Check args. */
assert (f);
@@ -1105,7 +1054,7 @@ H5G_create (H5F_t *f, const char *name, size_t ohdr_hint)
if (H5F_addr_defined (&(f->shared->root_sym->header))) {
HRETURN_ERROR (H5E_SYM, H5E_EXISTS, NULL); /*root exists*/
}
- if (H5O_new (f, 0, ohdr_hint, &(ent.header)/*out*/)<0) {
+ if (H5O_create (f, 0, ohdr_hint, &(ent.header)/*out*/)<0) {
/* can't create header */
HRETURN_ERROR (H5E_SYM, H5E_CANTINIT, NULL);
}
@@ -1141,7 +1090,7 @@ H5G_create (H5F_t *f, const char *name, size_t ohdr_hint)
/*
* Create the object header.
*/
- if (H5O_new (f, 0, ohdr_hint, &(ent.header)/*out*/)<0) {
+ if (H5O_create (f, 0, ohdr_hint, &(ent.header)/*out*/)<0) {
HRETURN_ERROR (H5E_SYM, H5E_CANTINIT, NULL);
}
@@ -1238,7 +1187,7 @@ H5G_open (H5F_t *f, const char *name)
H5G_entry_t grp;
H5G_entry_t *cwg=NULL;
- FUNC_ENTER (H5G_open, NULL, NULL);
+ FUNC_ENTER (H5G_open, NULL);
/* check args */
assert (f);
@@ -1287,7 +1236,7 @@ H5G_open (H5F_t *f, const char *name)
herr_t
H5G_close (H5F_t *f, H5G_entry_t *ent)
{
- FUNC_ENTER (H5G_close, NULL, FAIL);
+ FUNC_ENTER (H5G_close, FAIL);
assert (f);
@@ -1345,7 +1294,7 @@ H5G_find (H5F_t *f, const char *name,
H5G_entry_t *ent_p = NULL;
H5G_entry_t *cwg = NULL;
- FUNC_ENTER (H5G_find, NULL, FAIL);
+ FUNC_ENTER (H5G_find, FAIL);
/* check args */
assert (f);