Bug#625413: Patch

[Thorsten Alteholz]

tags 625413 + patch
thanks

After this patch the package compiles with gcc4.6 again. I tried to be as 
less invasive as possible and kept all variables.

  ThorstenAuthor: Thorsten Alteholz <deb...@alteholz.de>
Description: Make it compilable with gcc4.6

Index: trousers-0.3.5/src/tcs/rpc/tcstp/rpc_evlog.c
===================================================================
--- trousers-0.3.5.orig/src/tcs/rpc/tcstp/rpc_evlog.c	2011-08-16 19:35:38.000000000 +0200
+++ trousers-0.3.5/src/tcs/rpc/tcstp/rpc_evlog.c	2011-08-16 19:56:46.000000000 +0200
@@ -26,7 +26,6 @@
 #include "tcs_utils.h"
 #include "rpc_tcstp_tcs.h"
 
-
 TSS_RESULT
 tcs_wrap_GetPcrEvent(struct tcsd_thread_data *data)
 {
@@ -83,6 +82,8 @@
 
 	data->comm.hdr.u.result = result;
 
+	if (totalSize==0){ }; /* calm gcc46 */
+
 	return TSS_SUCCESS;
 }
 
Index: trousers-0.3.5/src/tspi/obj_tpm.c
===================================================================
--- trousers-0.3.5.orig/src/tspi/obj_tpm.c	2011-08-16 19:00:07.000000000 +0200
+++ trousers-0.3.5/src/tspi/obj_tpm.c	2011-08-16 19:01:34.000000000 +0200
@@ -463,6 +463,8 @@
 	struct obj_list *list = &tpm_list;
 	struct tr_tpm_obj *tpm;
 
+	if (prev==NULL){ }; /* calm gcc46 */
+
 	pthread_mutex_lock(&list->lock);
 
 	for (obj = list->head; obj; prev = obj, obj = obj->next) {
Index: trousers-0.3.5/src/tspi/obj_encdata.c
===================================================================
--- trousers-0.3.5.orig/src/tspi/obj_encdata.c	2011-08-16 19:09:41.000000000 +0200
+++ trousers-0.3.5/src/tspi/obj_encdata.c	2011-08-16 19:10:08.000000000 +0200
@@ -431,6 +431,8 @@
 	struct obj_list *list = &encdata_list;
 	struct tr_encdata_obj *encdata;
 
+	if (prev==NULL){ }; /* calm gcc46 */
+
 	pthread_mutex_lock(&list->lock);
 
 	for (obj = list->head; obj; prev = obj, obj = obj->next) {
Index: trousers-0.3.5/src/tspi/obj_rsakey.c
===================================================================
--- trousers-0.3.5.orig/src/tspi/obj_rsakey.c	2011-08-16 19:15:14.000000000 +0200
+++ trousers-0.3.5/src/tspi/obj_rsakey.c	2011-08-16 19:18:22.000000000 +0200
@@ -1726,6 +1726,8 @@
 	struct tr_rsakey_obj *rsakey;
 	TSS_RESULT result;
 
+	if (prev==NULL){ }; /* calm gcc46 */
+
 	MUTEX_LOCK(list->lock);
 
 	for (obj = list->head; obj; prev = obj, obj = obj->next) {
@@ -1899,6 +1901,8 @@
 	struct obj_list *list = &rsakey_list;
 	struct tr_rsakey_obj *rsakey;
 
+	if (prev==NULL){ }; /* calm gcc46 */
+
 	MUTEX_LOCK(list->lock);
 
 	for (obj = list->head; obj; prev = obj, obj = obj->next) {
Index: trousers-0.3.5/src/tspi/obj_nv.c
===================================================================
--- trousers-0.3.5.orig/src/tspi/obj_nv.c	2011-08-16 19:21:02.000000000 +0200
+++ trousers-0.3.5/src/tspi/obj_nv.c	2011-08-16 19:26:22.000000000 +0200
@@ -470,6 +470,8 @@
 	offset = offset + sizeof(UINT16) + pcrread_sizeOfSelect + sizeof(TPM_LOCALITY_SELECTION);
 	memcpy(*data, nv_data_public + offset, sizeof(TPM_COMPOSITE_HASH));
 
+	if (pcrwrite_sizeOfSelect==0){ }; /* calm gcc46 */
+
 	return result;
 }
 
Index: trousers-0.3.5/src/tspi/obj_delfamily.c
===================================================================
--- trousers-0.3.5.orig/src/tspi/obj_delfamily.c	2011-08-16 19:28:52.000000000 +0200
+++ trousers-0.3.5/src/tspi/obj_delfamily.c	2011-08-16 19:29:13.000000000 +0200
@@ -90,6 +90,8 @@
 	struct obj_list *list = &delfamily_list;
 	struct tr_delfamily_obj *delfamily;
 
+	if (prev==NULL){ }; /* calm gcc46 */
+
 	pthread_mutex_lock(&list->lock);
 
 	*hFamily = NULL_HDELFAMILY;
Index: trousers-0.3.5/src/tspi/obj_migdata.c
===================================================================
--- trousers-0.3.5.orig/src/tspi/obj_migdata.c	2011-08-16 19:31:38.000000000 +0200
+++ trousers-0.3.5/src/tspi/obj_migdata.c	2011-08-16 19:32:17.000000000 +0200
@@ -363,6 +363,8 @@
 	BYTE *tmpMsaList;
 	TSS_RESULT result = TSS_SUCCESS;
 
+	if (result==TSS_SUCCESS){ }; /* calm gcc46 */
+
 	if ((obj = obj_list_get_obj(&migdata_list, hMigData)) == NULL)
 		return TSPERR(TSS_E_INVALID_HANDLE);
 
@@ -482,6 +484,8 @@
 	UINT64 offset;
 	TSS_RESULT result = TSS_SUCCESS;
 
+	if (result==TSS_SUCCESS){ }; /* calm gcc46 */
+
 	if ((obj = obj_list_get_obj(&migdata_list, hMigData)) == NULL)
 		return TSPERR(TSS_E_INVALID_HANDLE);