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

src/tcs/rpc/tcstp/rpc_context.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004-2006
  *
  */
 
@@ skipping 16 matching lines @@
 #include "rpc_tcstp_tcs.h"
 
 
 TSS_RESULT
 tcs_wrap_OpenContext(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         TSS_RESULT result;
         UINT32 tpm_version = tpm_metrics.version.minor;
 
-        LogDebugFn("thread %zd", THREAD_ID);
+        LogDebugFn("thread %ld", THREAD_ID);
 
         result = TCS_OpenContext_Internal(&hContext);
         if (result == TSS_SUCCESS) {
                 initData(&data->comm, 2);
                 if (setData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
                         return TCSERR(TSS_E_INTERNAL_ERROR);
 
                 if (setData(TCSD_PACKET_TYPE_UINT32, 1, &tpm_version, 0, &data->comm))
                         return TCSERR(TSS_E_INTERNAL_ERROR);
 
@@ skipping 11 matching lines @@
 
 TSS_RESULT
 tcs_wrap_CloseContext(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         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);
 
         result = TCS_CloseContext_Internal(hContext);
 
         /* This will signal the thread that the connection has been closed cleanly */
         if (result == TSS_SUCCESS)
                 data->context = NULL_TCS_HANDLE;
 
         initData(&data->comm, 0);
         data->comm.hdr.u.result = result;
 
         return TSS_SUCCESS;
 }