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

src/tcs/rpc/tcstp/rpc_evlog.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 @@
 {
         TCS_CONTEXT_HANDLE hContext;
         TSS_PCR_EVENT *pEvent = NULL;
         TSS_RESULT result;
         UINT32 pcrIndex, number, totalSize;
         BYTE lengthOnly;
 
         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, &pcrIndex, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 2, &number, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (getData(TCSD_PACKET_TYPE_BYTE, 3, &lengthOnly, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
@@ skipping 38 matching lines @@
 tcs_wrap_GetPcrEventsByPcr(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         TSS_PCR_EVENT *ppEvents = NULL;
         TSS_RESULT result;
         UINT32 firstEvent, eventCount, totalSize, pcrIndex, i, j;
 
         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, &pcrIndex, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 2, &firstEvent, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 3, &eventCount, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
@@ skipping 34 matching lines @@
 tcs_wrap_GetPcrEventLog(struct tcsd_thread_data *data)
 {
         TCS_CONTEXT_HANDLE hContext;
         TSS_PCR_EVENT *ppEvents;
         TSS_RESULT result;
         UINT32 eventCount, totalSize, i, j;
 
         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_GetPcrEventLog_Internal(hContext, &eventCount, &ppEvents);
 
         if (result == TSS_SUCCESS) {
                 for (i = 0, totalSize = 0; i < eventCount; i++)
                         totalSize += get_pcr_event_size(&(ppEvents[i]));
 
                 initData(&data->comm, eventCount + 1);
                 if (setData(TCSD_PACKET_TYPE_UINT32, 0, &eventCount, 0, &data->comm)) {
                         free_external_events(eventCount, ppEvents);
@@ skipping 25 matching lines @@
 {
         TCS_CONTEXT_HANDLE hContext;
         TSS_PCR_EVENT event;
         TSS_RESULT result;
         UINT32 number;
 
         /* Receive */
         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_PCR_EVENT , 1, &event, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         result = TCS_LogPcrEvent_Internal(hContext, event, &number);
 
         if (result == TSS_SUCCESS) {
                 initData(&data->comm, 1);
                 if (setData(TCSD_PACKET_TYPE_UINT32, 0, &number, 0, &data->comm)) {
                         return TCSERR(TSS_E_INTERNAL_ERROR);
@@ skipping 68 matching lines @@
                         return TCSERR(TSS_E_OUTOFMEMORY);
                 }
 
                 UnloadBlob(offset, event->ulEventLength, blob, event->rgbEvent);
         } else {
                 event->rgbEvent = NULL;
         }
 
         return TSS_SUCCESS;
 }