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

src/tcs/rpc/tcstp/rpc_tick.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_ReadCurrentTicks(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         UINT32 pulCurrentTime;
         BYTE *prgbCurrentTime;
         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);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_ReadCurrentTicks_Internal(hContext, &pulCurrentTime, &prgbCurrentTime);
 
         MUTEX_UNLOCK(tcsp_lock);
 
         if (result == TSS_SUCCESS) {
                 initData(&data->comm, 2);
                 if (setData(TCSD_PACKET_TYPE_UINT32, 0, &pulCurrentTime, 0, &data->comm)) {
@@ skipping 21 matching lines @@
         TPM_AUTH auth, *pAuth;
         TPM_NONCE nonce;
         TPM_DIGEST digest;
         UINT32 sigSize, tcSize, i;
         BYTE *sig, *tc;
         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, &hKey, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_NONCE, 2, &nonce, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_DIGEST, 3, &digest, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_AUTH, 4, &auth, 0, &data->comm))
                 pAuth = NULL;
         else
@@ skipping 35 matching lines @@
                         free(sig);
                         free(tc);
                         return TCSERR(TSS_E_INTERNAL_ERROR);
                 }
         } else
                 initData(&data->comm, 0);
 
         data->comm.hdr.u.result = result;
         return TSS_SUCCESS;
 }