diff options
| -rw-r--r-- | src/H5D.c | 2 | ||||
| -rw-r--r-- | src/H5G.c | 4 | ||||
| -rw-r--r-- | src/H5Osdim.c | 3 | ||||
| -rw-r--r-- | src/H5Osdtyp.c | 1 | ||||
| -rw-r--r-- | src/H5P.c | 2 |
5 files changed, 7 insertions, 5 deletions
@@ -680,7 +680,7 @@ herr_t H5D_release(hatom_t oid) H5MM_xfree (dataset); /* Delete the dataset from the atom group */ - if(H5Aatom_object(oid)==NULL) + if(H5Aremove_atom(oid)==NULL) HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL); done: @@ -256,7 +256,7 @@ H5G_namei (hdf5_file_t *f, H5G_entry_t *cwd, const char *name, * prevents us from saying `/foo/foo' where the root object has * the name `foo'. */ - H5O_name_t mesg; + H5O_name_t mesg={0}; if (!aside && dir->header==f->root_sym->header && H5O_read (f, dir->header, dir, H5O_NAME, 0, &mesg)) { if (!HDstrcmp (mesg.s, comp)) { @@ -334,7 +334,7 @@ static herr_t H5G_mkroot (hdf5_file_t *f, size_t size_hint) { H5O_stab_t stab; /*symbol table message */ - H5O_name_t name; /*object name message */ + H5O_name_t name={0}; /*object name message */ H5G_entry_t root; /*old root entry */ const char *root_name=NULL; /*name of old root object */ intn nlinks; /*number of links */ diff --git a/src/H5Osdim.c b/src/H5Osdim.c index 6ab0519..1d44f71 100644 --- a/src/H5Osdim.c +++ b/src/H5Osdim.c @@ -217,6 +217,7 @@ H5O_sim_dim_fast (const H5G_entry_t *ent, void *mesg) /* check args */ assert (ent); + assert (mesg); if (H5G_CACHED_SDATA==ent->type) { @@ -280,7 +281,7 @@ H5O_sim_dim_cache (H5G_entry_t *ent, const void *mesg) modified = BTRUE; ent->type = H5G_CACHED_SDATA; UINT32ENCODE(p,sdim->rank); - for(u=0; u<=sdim->rank; u++); + for(u=0; u<=sdim->rank; u++) UINT32ENCODE(p,sdim->size[u]); } /* end if */ else diff --git a/src/H5Osdtyp.c b/src/H5Osdtyp.c index a4b3c04..dc571eb 100644 --- a/src/H5Osdtyp.c +++ b/src/H5Osdtyp.c @@ -184,6 +184,7 @@ H5O_sim_dtype_fast (const H5G_entry_t *ent, void *mesg) sdtype->len=*p++; sdtype->arch=*p++; UINT16DECODE(p,sdtype->base); + sdtype->base=MAKE_ATOM(H5_DATATYPE,sdtype->base); /* convert into atomic base type */ } /* end if */ } /* end if */ else @@ -430,7 +430,7 @@ herr_t H5P_release(hatom_t oid) H5P_dim_t *dim; /* dimensionality object to release */ herr_t ret_value = SUCCEED; - FUNC_ENTER(H5Prelease, H5P_init_interface, FAIL); + FUNC_ENTER(H5P_release, H5P_init_interface, FAIL); /* Clear errors and check args and all the boring stuff. */ H5ECLEAR; |