Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(233)

Unified Diff: src/tcs/rpc/tcstp/rpc_delegate.c

Issue 3581012: Upgrade from trousers 0.3.3 to 0.3.6 and from testsuite 0.2 to 0.3. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/trousers.git
Patch Set: git cl push Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/tcs/rpc/tcstp/rpc_daa.c ('k') | src/tcs/rpc/tcstp/rpc_dir.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/tcs/rpc/tcstp/rpc_delegate.c
diff --git a/src/tcs/rpc/tcstp/rpc_delegate.c b/src/tcs/rpc/tcstp/rpc_delegate.c
index cc98f3e9dfd781b28628bc11c48de5a878ff7e83..5bd0cd8cc116ce47683f59d216cd2c49d893aad1 100644
--- a/src/tcs/rpc/tcstp/rpc_delegate.c
+++ b/src/tcs/rpc/tcstp/rpc_delegate.c
@@ -47,7 +47,7 @@ tcs_wrap_Delegate_Manage(struct tcsd_thread_data *data)
if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
return TCSERR(TSS_E_INTERNAL_ERROR);
- LogDebugFn("thread %zd context %x", THREAD_ID, hContext);
+ LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
if (getData(TCSD_PACKET_TYPE_UINT32, 1, &familyId, 0, &data->comm))
return TCSERR(TSS_E_INTERNAL_ERROR);
@@ -133,7 +133,7 @@ tcs_wrap_Delegate_CreateKeyDelegation(struct tcsd_thread_data *data)
if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
return TCSERR(TSS_E_INTERNAL_ERROR);
- LogDebugFn("thread %zd context %x", THREAD_ID, hContext);
+ LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
if (getData(TCSD_PACKET_TYPE_UINT32, 1, &hKey, 0, &data->comm))
return TCSERR(TSS_E_INTERNAL_ERROR);
@@ -221,7 +221,7 @@ tcs_wrap_Delegate_CreateOwnerDelegation(struct tcsd_thread_data *data)
if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
return TCSERR(TSS_E_INTERNAL_ERROR);
- LogDebugFn("thread %zd context %x", THREAD_ID, hContext);
+ LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
if (getData(TCSD_PACKET_TYPE_BOOL, 1, &increment, 0, &data->comm))
return TCSERR(TSS_E_INTERNAL_ERROR);
@@ -305,7 +305,7 @@ tcs_wrap_Delegate_LoadOwnerDelegation(struct tcsd_thread_data *data)
if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
return TCSERR(TSS_E_INTERNAL_ERROR);
- LogDebugFn("thread %zd context %x", THREAD_ID, hContext);
+ LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
if (getData(TCSD_PACKET_TYPE_UINT32, 1, &index, 0, &data->comm))
return TCSERR(TSS_E_INTERNAL_ERROR);
@@ -345,7 +345,6 @@ tcs_wrap_Delegate_LoadOwnerDelegation(struct tcsd_thread_data *data)
initData(&data->comm, 1);
if (pAuth) {
if (setData(TCSD_PACKET_TYPE_AUTH, 0, pAuth, 0, &data->comm)) {
- free(blob);
return TCSERR(TSS_E_INTERNAL_ERROR);
}
}
@@ -370,7 +369,7 @@ tcs_wrap_Delegate_ReadTable(struct tcsd_thread_data *data)
if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
return TCSERR(TSS_E_INTERNAL_ERROR);
- LogDebugFn("thread %zd context %x", THREAD_ID, hContext);
+ LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
MUTEX_LOCK(tcsp_lock);
@@ -428,7 +427,7 @@ tcs_wrap_Delegate_UpdateVerificationCount(struct tcsd_thread_data *data)
if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
return TCSERR(TSS_E_INTERNAL_ERROR);
- LogDebugFn("thread %zd context %x", THREAD_ID, hContext);
+ LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
if (getData(TCSD_PACKET_TYPE_UINT32, 1, &inputSize, 0, &data->comm))
return TCSERR(TSS_E_INTERNAL_ERROR);
@@ -499,7 +498,7 @@ tcs_wrap_Delegate_VerifyDelegation(struct tcsd_thread_data *data)
if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
return TCSERR(TSS_E_INTERNAL_ERROR);
- LogDebugFn("thread %zd context %x", THREAD_ID, hContext);
+ LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
if (getData(TCSD_PACKET_TYPE_UINT32, 1, &delegateSize, 0, &data->comm))
return TCSERR(TSS_E_INTERNAL_ERROR);
@@ -543,7 +542,7 @@ tcs_wrap_DSAP(struct tcsd_thread_data *data)
if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
return TCSERR(TSS_E_INTERNAL_ERROR);
- LogDebugFn("thread %zd context %x", THREAD_ID, hContext);
+ LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
if (getData(TCSD_PACKET_TYPE_UINT16, 1, &entityType, 0, &data->comm))
return TCSERR(TSS_E_INTERNAL_ERROR);
« no previous file with comments | « src/tcs/rpc/tcstp/rpc_daa.c ('k') | src/tcs/rpc/tcstp/rpc_dir.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698