From: Richard Maciel <[email protected]> list_init function in src/tspi/obj.c had a name too generic and it was being exported which was causing issues with other libraries.
Applying both solutions is unnecessary, but I think it needs to have a more specific name. Signed-off-by: Richard Maciel <[email protected]> --- src/include/obj_tpm.h | 2 +- src/tspi/obj.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/include/obj_tpm.h b/src/include/obj_tpm.h index 9eb1db7..b90812f 100644 --- a/src/include/obj_tpm.h +++ b/src/include/obj_tpm.h @@ -71,7 +71,7 @@ TSS_RESULT obj_tpm_get_cred(TSS_HTPM, TSS_FLAG, UINT32 *, BYTE **); #define TPM_LIST_DECLARE struct obj_list tpm_list #define TPM_LIST_DECLARE_EXTERN extern struct obj_list tpm_list -#define TPM_LIST_INIT() list_init(&tpm_list) +#define TPM_LIST_INIT() tspi_list_init(&tpm_list) #define TPM_LIST_CONNECT(a,b) obj_connectContext_list(&tpm_list, a, b) #define TPM_LIST_CLOSE(a) obj_list_close(&tpm_list, &tpm_free, a) diff --git a/src/tspi/obj.c b/src/tspi/obj.c index ad5c79a..c434d9a 100644 --- a/src/tspi/obj.c +++ b/src/tspi/obj.c @@ -39,8 +39,8 @@ NVSTORE_LIST_DECLARE; DELFAMILY_LIST_DECLARE; MIGDATA_LIST_DECLARE; -void -list_init(struct obj_list *list) +static void +tspi_list_init(struct obj_list *list) { list->head = NULL; MUTEX_INIT(list->lock); -- 1.8.1.4 ------------------------------------------------------------------------------ Managing the Performance of Cloud-Based Applications Take advantage of what the Cloud has to offer - Avoid Common Pitfalls. Read the Whitepaper. http://pubads.g.doubleclick.net/gampad/clk?id=121054471&iu=/4140/ostg.clktrk _______________________________________________ TrouSerS-tech mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/trousers-tech
