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

src/tcs/rpc/tcstp/rpc_dir.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004-2006
  *
  */
 
@@ skipping 21 matching lines @@
 {
         TSS_RESULT result;
         TSS_HCONTEXT hContext;
         TCPA_DIRINDEX dirIndex;
         TCPA_DIGEST dirDigest;
         TPM_AUTH auth;
 
         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, &dirIndex, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_DIGEST, 2, &dirDigest, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_AUTH, 3, &auth, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MUTEX_LOCK(tcsp_lock);
 
@@ skipping 18 matching lines @@
 tcs_wrap_DirRead(struct tcsd_thread_data *data)
 {
         TSS_RESULT result;
         TSS_HCONTEXT hContext;
         TCPA_DIRINDEX dirIndex;
         TCPA_DIRVALUE dirValue;
 
         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, &dirIndex, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_DirRead_Internal(hContext, dirIndex, &dirValue);
 
         MUTEX_UNLOCK(tcsp_lock);
 
         if (result == TSS_SUCCESS) {
                 initData(&data->comm, 1);
                 if (setData(TCSD_PACKET_TYPE_DIGEST, 0, &dirValue, 0, &data->comm)) {
                         return TCSERR(TSS_E_INTERNAL_ERROR);
                 }
         } else
                 initData(&data->comm, 0);
 
         data->comm.hdr.u.result = result;
 
         return TSS_SUCCESS;
 }