Upgrade from trousers 0.3.3 to 0.3.6 and from testsuite 0.2 to 0.3.

src/tcs/rpc/tcstp/rpc_counter.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004-2007
  *
  */
 
@@ skipping 20 matching lines @@
 tcs_wrap_ReadCounter(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         TSS_COUNTER_ID idCounter;
         TPM_COUNTER_VALUE counterValue;
         TSS_RESULT result;
 
         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, &idCounter, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_ReadCounter_Internal(hContext, idCounter, &counterValue);
 
         MUTEX_UNLOCK(tcsp_lock);
 
@@ skipping 16 matching lines @@
         TPM_COUNTER_VALUE counterValue;
         TPM_AUTH auth;
         TPM_ENCAUTH encauth;
         UINT32 LabelSize;
         BYTE *pLabel = NULL;
         TSS_RESULT result;
 
         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, &LabelSize, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if ((pLabel = calloc(1, LabelSize)) == NULL) {
                 LogError("malloc of %u bytes failed.", LabelSize);
                 return TCSERR(TSS_E_OUTOFMEMORY);
         }
 
         if (getData(TCSD_PACKET_TYPE_PBYTE, 2, &pLabel, LabelSize, &data->comm)) {
@@ skipping 38 matching lines @@
 {
         TCS_CONTEXT_HANDLE hContext;
         TSS_COUNTER_ID idCounter;
         TPM_COUNTER_VALUE counterValue;
         TPM_AUTH auth;
         TSS_RESULT result;
 
         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, &idCounter, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_AUTH, 2, &auth, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_IncrementCounter_Internal(hContext, idCounter, &auth, &counterValue);
 
@@ skipping 16 matching lines @@
 tcs_wrap_ReleaseCounter(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         TSS_COUNTER_ID idCounter;
         TPM_AUTH auth;
         TSS_RESULT result;
 
         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, &idCounter, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_AUTH, 2, &auth, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_ReleaseCounter_Internal(hContext, idCounter, &auth);
 
@@ skipping 14 matching lines @@
 tcs_wrap_ReleaseCounterOwner(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         TSS_COUNTER_ID idCounter;
         TPM_AUTH auth;
         TSS_RESULT result;
 
         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, &idCounter, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_AUTH, 2, &auth, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_ReleaseCounterOwner_Internal(hContext, idCounter, &auth);
 
         MUTEX_UNLOCK(tcsp_lock);
 
         if (result == TSS_SUCCESS) {
                 initData(&data->comm, 1);
                 if (setData(TCSD_PACKET_TYPE_AUTH, 0, &auth, 0, &data->comm))
                         return TCSERR(TSS_E_INTERNAL_ERROR);
         } else
                 initData(&data->comm, 0);
 
         data->comm.hdr.u.result = result;
         return TSS_SUCCESS;
 }