From: Martin Willi <martin@revosec.ch>
Date: Thu, 21 Oct 2010 14:35:01 +0000 (+0200)
Subject: Renamed mem_cred_t clear function internally to clear_, fixes potential name conflict
X-Git-Tag: 4.5.0~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8f5aaf0a435ff6951bbf06a368f09aeb4573685;p=thirdparty%2Fstrongswan.git

Renamed mem_cred_t clear function internally to clear_, fixes potential name conflict
---

diff --git a/src/libstrongswan/credentials/sets/mem_cred.c b/src/libstrongswan/credentials/sets/mem_cred.c
index 68ad1f1dd3..c29a99f1f5 100644
--- a/src/libstrongswan/credentials/sets/mem_cred.c
+++ b/src/libstrongswan/credentials/sets/mem_cred.c
@@ -371,7 +371,7 @@ METHOD(mem_cred_t, add_shared, void,
 	this->lock->unlock(this->lock);
 }
 
-METHOD(mem_cred_t, clear, void,
+METHOD(mem_cred_t, clear_, void,
 	private_mem_cred_t *this)
 {
 	this->lock->write_lock(this->lock);
@@ -391,7 +391,7 @@ METHOD(mem_cred_t, clear, void,
 METHOD(mem_cred_t, destroy, void,
 	private_mem_cred_t *this)
 {
-	_clear(this);
+	clear_(this);
 	this->trusted->destroy(this->trusted);
 	this->untrusted->destroy(this->untrusted);
 	this->keys->destroy(this->keys);
@@ -419,7 +419,7 @@ mem_cred_t *mem_cred_create()
 			.add_cert = _add_cert,
 			.add_key = _add_key,
 			.add_shared = _add_shared,
-			.clear = _clear,
+			.clear = _clear_,
 			.destroy = _destroy,
 		},
 		.trusted = linked_list_create(),