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

src/tcs/rpc/tcstp/rpc_seal.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004-2006
  *
  */
 
@@ skipping 31 matching lines @@
         BYTE *outData;
 
         int i = 0;
 
         memset(&emptyAuth, 0, sizeof(TPM_AUTH));
         memset(&pubAuth, 0, sizeof(TPM_AUTH));
 
         if (getData(TCSD_PACKET_TYPE_UINT32, i++, &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, i++, &keyHandle, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_ENCAUTH, i++, &KeyUsageAuth, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_UINT32, i++, &PCRInfoSize, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (PCRInfoSize > 0) {
                 PCRInfo = calloc(1, PCRInfoSize);
@@ skipping 100 matching lines @@
 
         UINT32 outDataSize;
         BYTE *outData;
         TSS_RESULT result;
 
         memset(&emptyAuth, 0, sizeof(TPM_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, &parentHandle, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_UINT32, 2, &inDataSize, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         inData = calloc(1, inDataSize);
         if (inData == NULL) {
                 LogError("malloc of %d bytes failed.", inDataSize);
                 return TCSERR(TSS_E_OUTOFMEMORY);
@@ skipping 58 matching lines @@
                         return TCSERR(TSS_E_INTERNAL_ERROR);
                 }
                 free(outData);
         } else
                 initData(&data->comm, 0);
 
         data->comm.hdr.u.result = result;
 
         return TSS_SUCCESS;
 }