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

src/tcs/rpc/tcstp/rpc_random.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004-2006
  *
  */
 
@@ skipping 20 matching lines @@
 tcs_wrap_GetRandom(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         UINT32 bytesRequested;
         BYTE *randomBytes = NULL;
         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, &bytesRequested, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_GetRandom_Internal(hContext, &bytesRequested, &randomBytes);
 
         MUTEX_UNLOCK(tcsp_lock);
 
@@ skipping 19 matching lines @@
 tcs_wrap_StirRandom(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         UINT32 inDataSize;
         BYTE *inData;
         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, &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);
         }
         if (getData(TCSD_PACKET_TYPE_PBYTE, 2, inData, inDataSize, &data->comm)) {
                 free(inData);
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         }
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_StirRandom_Internal(hContext, inDataSize, inData);
 
         MUTEX_UNLOCK(tcsp_lock);
         free(inData);
 
         initData(&data->comm, 0);
         data->comm.hdr.u.result = result;
 
         return TSS_SUCCESS;
 }