1
Author: Thorsten Alteholz <debian@alteholz.de>
2
Description: Make it compilable with gcc4.6
4
Index: trousers-0.3.5/src/tcs/rpc/tcstp/rpc_evlog.c
5
===================================================================
6
--- trousers-0.3.5.orig/src/tcs/rpc/tcstp/rpc_evlog.c 2011-08-16 19:35:38.000000000 +0200
7
+++ trousers-0.3.5/src/tcs/rpc/tcstp/rpc_evlog.c 2011-08-16 19:56:46.000000000 +0200
10
#include "rpc_tcstp_tcs.h"
14
tcs_wrap_GetPcrEvent(struct tcsd_thread_data *data)
18
data->comm.hdr.u.result = result;
20
+ if (totalSize==0){ }; /* calm gcc46 */
25
Index: trousers-0.3.5/src/tspi/obj_tpm.c
26
===================================================================
27
--- trousers-0.3.5.orig/src/tspi/obj_tpm.c 2011-08-16 19:00:07.000000000 +0200
28
+++ trousers-0.3.5/src/tspi/obj_tpm.c 2011-08-16 19:01:34.000000000 +0200
30
struct obj_list *list = &tpm_list;
31
struct tr_tpm_obj *tpm;
33
+ if (prev==NULL){ }; /* calm gcc46 */
35
pthread_mutex_lock(&list->lock);
37
for (obj = list->head; obj; prev = obj, obj = obj->next) {
38
Index: trousers-0.3.5/src/tspi/obj_encdata.c
39
===================================================================
40
--- trousers-0.3.5.orig/src/tspi/obj_encdata.c 2011-08-16 19:09:41.000000000 +0200
41
+++ trousers-0.3.5/src/tspi/obj_encdata.c 2011-08-16 19:10:08.000000000 +0200
43
struct obj_list *list = &encdata_list;
44
struct tr_encdata_obj *encdata;
46
+ if (prev==NULL){ }; /* calm gcc46 */
48
pthread_mutex_lock(&list->lock);
50
for (obj = list->head; obj; prev = obj, obj = obj->next) {
51
Index: trousers-0.3.5/src/tspi/obj_rsakey.c
52
===================================================================
53
--- trousers-0.3.5.orig/src/tspi/obj_rsakey.c 2011-08-16 19:15:14.000000000 +0200
54
+++ trousers-0.3.5/src/tspi/obj_rsakey.c 2011-08-16 19:18:22.000000000 +0200
56
struct tr_rsakey_obj *rsakey;
59
+ if (prev==NULL){ }; /* calm gcc46 */
61
MUTEX_LOCK(list->lock);
63
for (obj = list->head; obj; prev = obj, obj = obj->next) {
65
struct obj_list *list = &rsakey_list;
66
struct tr_rsakey_obj *rsakey;
68
+ if (prev==NULL){ }; /* calm gcc46 */
70
MUTEX_LOCK(list->lock);
72
for (obj = list->head; obj; prev = obj, obj = obj->next) {
73
Index: trousers-0.3.5/src/tspi/obj_nv.c
74
===================================================================
75
--- trousers-0.3.5.orig/src/tspi/obj_nv.c 2011-08-16 19:21:02.000000000 +0200
76
+++ trousers-0.3.5/src/tspi/obj_nv.c 2011-08-16 19:26:22.000000000 +0200
78
offset = offset + sizeof(UINT16) + pcrread_sizeOfSelect + sizeof(TPM_LOCALITY_SELECTION);
79
memcpy(*data, nv_data_public + offset, sizeof(TPM_COMPOSITE_HASH));
81
+ if (pcrwrite_sizeOfSelect==0){ }; /* calm gcc46 */
86
Index: trousers-0.3.5/src/tspi/obj_delfamily.c
87
===================================================================
88
--- trousers-0.3.5.orig/src/tspi/obj_delfamily.c 2011-08-16 19:28:52.000000000 +0200
89
+++ trousers-0.3.5/src/tspi/obj_delfamily.c 2011-08-16 19:29:13.000000000 +0200
91
struct obj_list *list = &delfamily_list;
92
struct tr_delfamily_obj *delfamily;
94
+ if (prev==NULL){ }; /* calm gcc46 */
96
pthread_mutex_lock(&list->lock);
98
*hFamily = NULL_HDELFAMILY;
99
Index: trousers-0.3.5/src/tspi/obj_migdata.c
100
===================================================================
101
--- trousers-0.3.5.orig/src/tspi/obj_migdata.c 2011-08-16 19:31:38.000000000 +0200
102
+++ trousers-0.3.5/src/tspi/obj_migdata.c 2011-08-16 19:32:17.000000000 +0200
105
TSS_RESULT result = TSS_SUCCESS;
107
+ if (result==TSS_SUCCESS){ }; /* calm gcc46 */
109
if ((obj = obj_list_get_obj(&migdata_list, hMigData)) == NULL)
110
return TSPERR(TSS_E_INVALID_HANDLE);
114
TSS_RESULT result = TSS_SUCCESS;
116
+ if (result==TSS_SUCCESS){ }; /* calm gcc46 */
118
if ((obj = obj_list_get_obj(&migdata_list, hMigData)) == NULL)
119
return TSPERR(TSS_E_INVALID_HANDLE);