diff options
| author | Martin Willi <martin@revosec.ch> | 2010-10-21 16:35:01 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2010-10-28 13:06:19 +0000 |
| commit | c8f5aaf0a435ff6951bbf06a368f09aeb4573685 (patch) | |
| tree | 6af6e7d112038353fb315cc5a70761766bc9c946 /src | |
| parent | 5feda4272419c39597b5cbcccc3a04824e77a4dc (diff) | |
| download | strongswan-c8f5aaf0a435ff6951bbf06a368f09aeb4573685.tar.bz2 strongswan-c8f5aaf0a435ff6951bbf06a368f09aeb4573685.tar.xz | |
Renamed mem_cred_t clear function internally to clear_, fixes potential name conflict
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstrongswan/credentials/sets/mem_cred.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstrongswan/credentials/sets/mem_cred.c b/src/libstrongswan/credentials/sets/mem_cred.c index 68ad1f1dd..c29a99f1f 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(), |