Imported Upstream version 4.6.4

1 files changed, 15 insertions, 17 deletions

diff --git a/src/libstrongswan/threading/thread_value.c b/src/libstrongswan/threading/thread_value.c
index 8f2a8846c..3fa70acb2 100644
--- a/src/libstrongswan/threading/thread_value.c
+++ b/src/libstrongswan/threading/thread_value.c
@@ -35,27 +35,20 @@ struct private_thread_value_t {
 
 };
 
-
-/**
- * Implementation of thread_value_t.set.
- */
-static void set(private_thread_value_t *this, void *val)
+METHOD(thread_value_t, set, void,
+	private_thread_value_t *this, void *val)
 {
 	pthread_setspecific(this->key, val);
 }
 
-/**
- * Implementation of thread_value_t.get.
- */
-static void *get(private_thread_value_t *this)
+METHOD(thread_value_t, get, void*,
+	private_thread_value_t *this)
 {
 	return pthread_getspecific(this->key);
 }
 
-/**
- * Implementation of thread_value_t.destroy.
- */
-static void destroy(private_thread_value_t *this)
+METHOD(thread_value_t, destroy, void,
+	private_thread_value_t *this)
 {
 	pthread_key_delete(this->key);
 	free(this);
@@ -67,10 +60,15 @@ static void destroy(private_thread_value_t *this)
  */
 thread_value_t *thread_value_create(thread_cleanup_t destructor)
 {
-	private_thread_value_t *this = malloc_thing(private_thread_value_t);
-	this->public.set = (void(*)(thread_value_t*,void*))set;
-	this->public.get = (void*(*)(thread_value_t*))get;
-	this->public.destroy = (void(*)(thread_value_t*))destroy;
+	private_thread_value_t *this;
+
+	INIT(this,
+		.public = {
+			.set = _set,
+			.get = _get,
+			.destroy = _destroy,
+		},
+	);
 
 	pthread_key_create(&this->key, destructor);
 	return &this->public;