mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-01 16:28:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r2509] Change code so that heap_size wasn't zero.

Browse Source
This commit is contained in:
Quincey Koziol 2000-09-06 10:34:30 -05:00
parent 404ee60bd4
commit 25ee8b4e8f
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/H5P.c
View File

@ -3385,9 +3385,7 @@ H5P_create_class(H5P_genclass_t *par_class, const char *name, uintn hashsize, ui
}
/* Allocate room for the class & it's hash table of properties */
/* Need to (intn) hashsize so that (hashsize-1) can be negative since hashsize can be 0. */
if (NULL==(pclass = H5MM_calloc (sizeof(H5P_genclass_t)+
((((intn)hashsize)-1)*sizeof(H5P_genprop_t *)))))
if (NULL==(pclass = H5MM_calloc (sizeof(H5P_genclass_t)+((hashsize-1)*sizeof(H5P_genprop_t *)))))
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL,"memory allocation failed");
/* Set class state */
@ -3542,7 +3540,7 @@ H5P_genplist_t *H5P_create_list(H5P_genclass_t *class)
*/
/* Allocate room for the property list & it's hash table of properties */
if (NULL==(plist = H5MM_calloc (sizeof(H5P_genplist_t)+(((intn)(class->hashsize)-1)*sizeof(H5P_genprop_t *)))))
if (NULL==(plist = H5MM_calloc (sizeof(H5P_genplist_t)+((class->hashsize-1)*sizeof(H5P_genprop_t *)))))
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL,"memory allocation failed");
/* Set class state */

2
src/H5Ppublic.h
View File

@ -61,7 +61,7 @@ extern "C" {
* The library created property list classes
*/
#define H5P_NO_CLASS_NEW (H5open(), H5P_NO_CLASS_g)
#define H5P_NO_CLASS_HASH_SIZE 0
#define H5P_NO_CLASS_HASH_SIZE 1 /* 1, not 0, otherwise allocations get weird */
#define H5P_FILE_CREATE_NEW (H5open(), H5P_FILE_CREATE_g)
#define H5P_FILE_CREATE_HASH_SIZE 17
#define H5P_FILE_ACCESS_NEW (H5open(), H5P_FILE_ACCESS_g)