40 lines
1.6 KiB
Diff
40 lines
1.6 KiB
Diff
--- trousers-0.3.1/src/include/obj_context.h~ 2007-08-28 20:13:39.000000000 +0100
|
|
+++ trousers-0.3.1/src/include/obj_context.h 2008-09-26 01:08:07.000000000 +0100
|
|
@@ -44,7 +44,7 @@ struct tr_context_obj {
|
|
};
|
|
|
|
/* obj_context.c */
|
|
-void context_free(void *data);
|
|
+void obj_context_free(void *data);
|
|
TSS_BOOL obj_is_context(TSS_HOBJECT);
|
|
TSS_RESULT obj_context_get_policy(TSS_HCONTEXT, UINT32, TSS_HPOLICY *);
|
|
TSS_BOOL obj_context_is_silent(TSS_HCONTEXT);
|
|
@@ -84,6 +84,6 @@ struct tcs_api_table *obj_context_get_tc
|
|
#define CONTEXT_LIST_DECLARE_EXTERN extern struct obj_list context_list
|
|
#define CONTEXT_LIST_INIT() list_init(&context_list)
|
|
#define CONTEXT_LIST_CONNECT(a,b) obj_connectContext_list(&context_list, a, b)
|
|
-#define CONTEXT_LIST_CLOSE(a) obj_list_close(&context_list, &context_free, a)
|
|
+#define CONTEXT_LIST_CLOSE(a) obj_list_close(&context_list, &obj_context_free, a)
|
|
|
|
#endif
|
|
--- trousers-0.3.1/src/tspi/obj_context.c~ 2007-10-26 21:34:52.000000000 +0100
|
|
+++ trousers-0.3.1/src/tspi/obj_context.c 2008-09-26 01:06:17.000000000 +0100
|
|
@@ -60,7 +60,7 @@ obj_context_add(TSS_HOBJECT *phObject)
|
|
|
|
/* Add the default policy */
|
|
if ((result = obj_policy_add(*phObject, TSS_POLICY_USAGE, &context->policy))) {
|
|
- obj_list_remove(&context_list, &context_free, *phObject, *phObject);
|
|
+ obj_list_remove(&context_list, &obj_context_free, *phObject, *phObject);
|
|
return result;
|
|
}
|
|
|
|
@@ -95,7 +95,7 @@ obj_context_get_tcs_api(TSS_HCONTEXT tsp
|
|
}
|
|
|
|
void
|
|
-context_free(void *data)
|
|
+obj_context_free(void *data)
|
|
{
|
|
struct tr_context_obj *context = (struct tr_context_obj *)data;
|
|
|