]> git.ipfire.org Git - thirdparty/strongswan.git/commitdiff
Renamed mem_cred_t clear function internally to clear_, fixes potential name conflict
authorMartin Willi <martin@revosec.ch>
Thu, 21 Oct 2010 14:35:01 +0000 (16:35 +0200)
committerMartin Willi <martin@revosec.ch>
Thu, 28 Oct 2010 13:06:19 +0000 (13:06 +0000)
src/libstrongswan/credentials/sets/mem_cred.c

index 68ad1f1dd33348791c30f63341d36fce95fe8ec6..c29a99f1f5154ede4297a1b30e39c82375de11b9 100644 (file)
@@ -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(),