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

src/tcs/rpc/tcstp/rpc_caps.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004-2006
  *
  */
 
@@ skipping 23 matching lines @@
         TCPA_CAPABILITY_AREA capArea;
         UINT32 subCapSize;
         BYTE *subCap;
         UINT32 respSize;
         BYTE *resp;
         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, &capArea, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_UINT32, 2, &subCapSize, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         subCap = calloc(1, subCapSize);
         if (subCap == NULL) {
                 LogError("malloc of %u bytes failed.", subCapSize);
                 return TCSERR(TSS_E_OUTOFMEMORY);
@@ skipping 17 matching lines @@
                         free(resp);
                         return TCSERR(TSS_E_INTERNAL_ERROR);
                 }
                 free(resp);
         } else
                 initData(&data->comm, 0);
 
         data->comm.hdr.u.result = result;
         return TSS_SUCCESS;
 }