Source
committed 2d6d5cad0cc593
593
/* get the location object */594
594
if(NULL == (vol_obj = (H5VL_object_t *)H5I_object(loc_id)))595
595
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "invalid file identifier")596
596
597
597
/* Open the datatype */598
598
if(NULL == (dt = H5VL_datatype_open(vol_obj->data, loc_params, vol_obj->driver->cls, 599
599
name, tapl_id, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL)))600
600
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, H5I_INVALID_HID, "unable to open named datatype")601
601
602
602
/* Register the type and return the ID */603
-
if((ret_value = H5VL_register_id(H5I_DATATYPE, dt, vol_obj->driver, TRUE)) < 0)603
+
if((ret_value = H5VL_register(H5I_DATATYPE, dt, vol_obj->driver, TRUE)) < 0)604
604
HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to register named datatype")605
605
606
606
done:607
607
/* Cleanup on error */608
608
if(H5I_INVALID_HID == ret_value)609
609
if(dt && H5VL_datatype_close(dt, vol_obj->driver->cls, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL) < 0)610
610
HDONE_ERROR(H5E_DATATYPE, H5E_CLOSEERROR, H5I_INVALID_HID, "unable to release datatype")611
611
612
612
FUNC_LEAVE_API(ret_value)613
613
} /* end H5Topen2() */