summaryrefslogtreecommitdiff
path: root/ckcapi-session.c
diff options
context:
space:
mode:
authorStef Walter <stef@memberwebs.com>2007-05-06 13:40:52 +0000
committerStef Walter <stef@memberwebs.com>2007-05-06 13:40:52 +0000
commit80ca168a6b656dfc7bcc0cc32e90391b66b6bf4c (patch)
tree61a23ca635748acfa8d23a98105494ad575bc4f1 /ckcapi-session.c
parent8ae74e82e50a2e4e7e48b6a25aad42fadfbcfaca (diff)
Complete trust for Mozilla.
Diffstat (limited to 'ckcapi-session.c')
-rw-r--r--ckcapi-session.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/ckcapi-session.c b/ckcapi-session.c
index 8d00316..dc35ce0 100644
--- a/ckcapi-session.c
+++ b/ckcapi-session.c
@@ -14,8 +14,9 @@ static SessionList the_sessions = { NULL, 0 };
static void
object_data_release(CkCapiObjectData* objdata)
{
- ASSERT(objdata->data_funcs.release);
- (objdata->data_funcs.release)(objdata->data);
+ ASSERT(objdata->data_funcs);
+ ASSERT(objdata->data_funcs->release);
+ (objdata->data_funcs->release)(objdata->data);
free(objdata);
}
@@ -359,7 +360,8 @@ ckcapi_session_get_object_data(CkCapiSession* sess, CkCapiObject* obj,
ASSERT(sess);
ASSERT(sess->object_data);
ASSERT(obj);
- ASSERT(obj->obj_funcs.load_data);
+ ASSERT(obj->obj_funcs);
+ ASSERT(obj->obj_funcs->load_data);
ASSERT(objdata);
id = obj->id;
@@ -373,7 +375,7 @@ ckcapi_session_get_object_data(CkCapiSession* sess, CkCapiObject* obj,
return CKR_HOST_MEMORY;
newdata->object = id;
- ret = (obj->obj_funcs.load_data)(sess, obj, newdata);
+ ret = (obj->obj_funcs->load_data)(sess, obj, newdata);
if(ret != CKR_OK) {
free(newdata);
return ret;
@@ -381,7 +383,7 @@ ckcapi_session_get_object_data(CkCapiSession* sess, CkCapiObject* obj,
newdata->object = id;
ASSERT(newdata->data);
- ASSERT(newdata->data_funcs.release);
+ ASSERT(newdata->data_funcs);
if(!ckcapi_hash_set(sess->object_data, &newdata->object,
sizeof(newdata->object), newdata)) {