diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-07-16 23:43:29 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-07-16 23:43:29 (GMT) |
| commit | 1e612c3a46880773d53ad315f3aef2104abb9347 (patch) | |
| tree | 1259838b4fe2f3bb8ca78c8f0b4dea00557c89d1 /src/H5FD.c | |
| parent | 5e94d0336fa7a0ebc0a25d002b413221284691b6 (diff) | |
| parent | 75f4e51a1a076ea2f1602619e2a7d7bcce13c2f1 (diff) | |
| download | hdf5-1e612c3a46880773d53ad315f3aef2104abb9347.zip hdf5-1e612c3a46880773d53ad315f3aef2104abb9347.tar.gz hdf5-1e612c3a46880773d53ad315f3aef2104abb9347.tar.bz2 | |
[svn-r22584] merge from trunk and resolve type ID registration
Diffstat (limited to 'src/H5FD.c')
| -rw-r--r-- | src/H5FD.c | 14 |
1 files changed, 12 insertions, 2 deletions
@@ -103,6 +103,17 @@ static int H5FD_driver_query(const H5FD_class_t *driver, unsigned long *flags/*o */ static unsigned long H5FD_file_serial_no_g; +/* File driver ID class */ +static const H5I_class_t H5I_VFL_CLS[1] = {{ + H5I_VFL, /* ID class value */ + 0, /* Class flags */ + 64, /* Minimum hash size for class */ + 0, /* # of reserved IDs for class */ + (H5I_free_t)H5FD_free_cls, /* Callback routine for closing objects of this class */ + NULL /* Callback routine for closing auxilary objects of this class */ +}}; + + /*------------------------------------------------------------------------- * Function: H5FD_init @@ -153,8 +164,7 @@ H5FD_init_interface(void) FUNC_ENTER_NOAPI_NOINIT - if(H5I_register_type(H5I_VFL, (size_t)H5I_VFL_HASHSIZE, 0, - (H5I_free_t)H5FD_free_cls, NULL)<H5I_FILE) + if(H5I_register_type(H5I_VFL_CLS) < 0) HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "unable to initialize interface") /* Reset the file serial numbers */ |