From 669d1321282a30053c93a104e913e8f3a405f65a Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Wed, 30 Mar 2011 15:01:11 +1100 Subject: [PATCH] refactory: s/initFrom/initWith/g --- mech_eap/util_attr.cpp | 18 +++++++++--------- mech_eap/util_attr.h | 10 +++++----- mech_eap/util_radius.cpp | 8 ++++---- mech_eap/util_radius.h | 4 ++-- mech_eap/util_saml.cpp | 8 ++++---- mech_eap/util_saml.h | 4 ++-- mech_eap/util_shib.cpp | 8 ++++---- mech_eap/util_shib.h | 4 ++-- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/mech_eap/util_attr.cpp b/mech_eap/util_attr.cpp index 4ded612..4d4efde 100644 --- a/mech_eap/util_attr.cpp +++ b/mech_eap/util_attr.cpp @@ -219,7 +219,7 @@ gss_eap_attr_ctx::releaseProvider(unsigned int type) * Initialize a context from an existing context. */ bool -gss_eap_attr_ctx::initFromExistingContext(const gss_eap_attr_ctx *manager) +gss_eap_attr_ctx::initWithExistingContext(const gss_eap_attr_ctx *manager) { bool ret = true; @@ -235,7 +235,7 @@ gss_eap_attr_ctx::initFromExistingContext(const gss_eap_attr_ctx *manager) provider = m_providers[i]; - ret = provider->initFromExistingContext(this, + ret = provider->initWithExistingContext(this, manager->m_providers[i]); if (ret == false) { releaseProvider(i); @@ -250,7 +250,7 @@ gss_eap_attr_ctx::initFromExistingContext(const gss_eap_attr_ctx *manager) * Initialize a context from a GSS credential and context. */ bool -gss_eap_attr_ctx::initFromGssContext(const gss_cred_id_t cred, +gss_eap_attr_ctx::initWithGssContext(const gss_cred_id_t cred, const gss_ctx_id_t ctx) { bool ret = true; @@ -270,7 +270,7 @@ gss_eap_attr_ctx::initFromGssContext(const gss_cred_id_t cred, provider = m_providers[i]; - ret = provider->initFromGssContext(this, cred, ctx); + ret = provider->initWithGssContext(this, cred, ctx); if (ret == false) { releaseProvider(i); break; @@ -331,7 +331,7 @@ gss_eap_attr_ctx::initWithJsonObject(JSONObject &obj) provider = m_providers[type]; - ret = provider->initFromGssContext(this, + ret = provider->initWithGssContext(this, GSS_C_NO_CREDENTIAL, GSS_C_NO_CONTEXT); if (ret == false) { @@ -377,7 +377,7 @@ gss_eap_attr_ctx::jsonRepresentation(void) const * Initialize a context from an exported context or name token */ bool -gss_eap_attr_ctx::initFromBuffer(const gss_buffer_t buffer) +gss_eap_attr_ctx::initWithBuffer(const gss_buffer_t buffer) { OM_uint32 major, minor; bool ret; @@ -1014,7 +1014,7 @@ gssEapImportAttrContext(OM_uint32 *minor, try { ctx = new gss_eap_attr_ctx(); - if (ctx->initFromBuffer(buffer)) { + if (ctx->initWithBuffer(buffer)) { name->attrCtx = ctx; major = GSS_S_COMPLETE; *minor = 0; @@ -1056,7 +1056,7 @@ gssEapDuplicateAttrContext(OM_uint32 *minor, try { ctx = new gss_eap_attr_ctx(); - if (ctx->initFromExistingContext(in->attrCtx)) { + if (ctx->initWithExistingContext(in->attrCtx)) { out->attrCtx = ctx; major = GSS_S_COMPLETE; *minor = 0; @@ -1161,7 +1161,7 @@ gssEapCreateAttrContext(OM_uint32 *minor, try { ctx = new gss_eap_attr_ctx(); - if (ctx->initFromGssContext(gssCred, gssCtx)) { + if (ctx->initWithGssContext(gssCred, gssCtx)) { major = GSS_S_COMPLETE; *minor = 0; } else { diff --git a/mech_eap/util_attr.h b/mech_eap/util_attr.h index c727e82..e3f3567 100644 --- a/mech_eap/util_attr.h +++ b/mech_eap/util_attr.h @@ -77,13 +77,13 @@ public: return true; } - virtual bool initFromExistingContext(const gss_eap_attr_ctx *manager, + virtual bool initWithExistingContext(const gss_eap_attr_ctx *manager, const gss_eap_attr_provider *ctx GSSEAP_UNUSED) { return initWithManager(manager); } - virtual bool initFromGssContext(const gss_eap_attr_ctx *manager, + virtual bool initWithGssContext(const gss_eap_attr_ctx *manager, const gss_cred_id_t cred GSSEAP_UNUSED, const gss_ctx_id_t ctx GSSEAP_UNUSED) { @@ -187,8 +187,8 @@ public: gss_eap_attr_ctx(void); ~gss_eap_attr_ctx(void); - bool initFromExistingContext(const gss_eap_attr_ctx *manager); - bool initFromGssContext(const gss_cred_id_t cred, + bool initWithExistingContext(const gss_eap_attr_ctx *manager); + bool initWithGssContext(const gss_cred_id_t cred, const gss_ctx_id_t ctx); bool getAttributeTypes(gss_eap_attr_enumeration_cb, void *data) const; @@ -210,7 +210,7 @@ public: gss_any_t input) const; void exportToBuffer(gss_buffer_t buffer) const; - bool initFromBuffer(const gss_buffer_t buffer); + bool initWithBuffer(const gss_buffer_t buffer); static std::string composeAttributeName(const gss_buffer_t prefix, diff --git a/mech_eap/util_radius.cpp b/mech_eap/util_radius.cpp index 09f4559..d1ee24b 100644 --- a/mech_eap/util_radius.cpp +++ b/mech_eap/util_radius.cpp @@ -63,12 +63,12 @@ gss_eap_radius_attr_provider::~gss_eap_radius_attr_provider(void) } bool -gss_eap_radius_attr_provider::initFromExistingContext(const gss_eap_attr_ctx *manager, +gss_eap_radius_attr_provider::initWithExistingContext(const gss_eap_attr_ctx *manager, const gss_eap_attr_provider *ctx) { const gss_eap_radius_attr_provider *radius; - if (!gss_eap_attr_provider::initFromExistingContext(manager, ctx)) + if (!gss_eap_attr_provider::initWithExistingContext(manager, ctx)) return false; radius = static_cast(ctx); @@ -82,11 +82,11 @@ gss_eap_radius_attr_provider::initFromExistingContext(const gss_eap_attr_ctx *ma } bool -gss_eap_radius_attr_provider::initFromGssContext(const gss_eap_attr_ctx *manager, +gss_eap_radius_attr_provider::initWithGssContext(const gss_eap_attr_ctx *manager, const gss_cred_id_t gssCred, const gss_ctx_id_t gssCtx) { - if (!gss_eap_attr_provider::initFromGssContext(manager, gssCred, gssCtx)) + if (!gss_eap_attr_provider::initWithGssContext(manager, gssCred, gssCtx)) return false; if (gssCtx != GSS_C_NO_CONTEXT) { diff --git a/mech_eap/util_radius.h b/mech_eap/util_radius.h index a7878df..ebd348b 100644 --- a/mech_eap/util_radius.h +++ b/mech_eap/util_radius.h @@ -44,9 +44,9 @@ public: gss_eap_radius_attr_provider(void); ~gss_eap_radius_attr_provider(void); - bool initFromExistingContext(const gss_eap_attr_ctx *source, + bool initWithExistingContext(const gss_eap_attr_ctx *source, const gss_eap_attr_provider *ctx); - bool initFromGssContext(const gss_eap_attr_ctx *source, + bool initWithGssContext(const gss_eap_attr_ctx *source, const gss_cred_id_t cred, const gss_ctx_id_t ctx); diff --git a/mech_eap/util_saml.cpp b/mech_eap/util_saml.cpp index 2187f48..b4ab0ea 100644 --- a/mech_eap/util_saml.cpp +++ b/mech_eap/util_saml.cpp @@ -73,7 +73,7 @@ gss_eap_saml_assertion_provider::~gss_eap_saml_assertion_provider(void) } bool -gss_eap_saml_assertion_provider::initFromExistingContext(const gss_eap_attr_ctx *manager, +gss_eap_saml_assertion_provider::initWithExistingContext(const gss_eap_attr_ctx *manager, const gss_eap_attr_provider *ctx) { /* Then we may be creating from an existing attribute context */ @@ -81,7 +81,7 @@ gss_eap_saml_assertion_provider::initFromExistingContext(const gss_eap_attr_ctx assert(m_assertion == NULL); - if (!gss_eap_attr_provider::initFromExistingContext(manager, ctx)) + if (!gss_eap_attr_provider::initWithExistingContext(manager, ctx)) return false; saml = static_cast(ctx); @@ -91,7 +91,7 @@ gss_eap_saml_assertion_provider::initFromExistingContext(const gss_eap_attr_ctx } bool -gss_eap_saml_assertion_provider::initFromGssContext(const gss_eap_attr_ctx *manager, +gss_eap_saml_assertion_provider::initWithGssContext(const gss_eap_attr_ctx *manager, const gss_cred_id_t gssCred, const gss_ctx_id_t gssCtx) { @@ -102,7 +102,7 @@ gss_eap_saml_assertion_provider::initFromGssContext(const gss_eap_attr_ctx *mana assert(m_assertion == NULL); - if (!gss_eap_attr_provider::initFromGssContext(manager, gssCred, gssCtx)) + if (!gss_eap_attr_provider::initWithGssContext(manager, gssCred, gssCtx)) return false; /* diff --git a/mech_eap/util_saml.h b/mech_eap/util_saml.h index eeb17e3..9110ad4 100644 --- a/mech_eap/util_saml.h +++ b/mech_eap/util_saml.h @@ -52,9 +52,9 @@ public: gss_eap_saml_assertion_provider(void); ~gss_eap_saml_assertion_provider(void); - bool initFromExistingContext(const gss_eap_attr_ctx *source, + bool initWithExistingContext(const gss_eap_attr_ctx *source, const gss_eap_attr_provider *ctx); - bool initFromGssContext(const gss_eap_attr_ctx *source, + bool initWithGssContext(const gss_eap_attr_ctx *source, const gss_cred_id_t cred, const gss_ctx_id_t ctx); diff --git a/mech_eap/util_shib.cpp b/mech_eap/util_shib.cpp index dd4fe3f..918f947 100644 --- a/mech_eap/util_shib.cpp +++ b/mech_eap/util_shib.cpp @@ -83,12 +83,12 @@ gss_eap_shib_attr_provider::~gss_eap_shib_attr_provider(void) } bool -gss_eap_shib_attr_provider::initFromExistingContext(const gss_eap_attr_ctx *manager, +gss_eap_shib_attr_provider::initWithExistingContext(const gss_eap_attr_ctx *manager, const gss_eap_attr_provider *ctx) { const gss_eap_shib_attr_provider *shib; - if (!gss_eap_attr_provider::initFromExistingContext(manager, ctx)) { + if (!gss_eap_attr_provider::initWithExistingContext(manager, ctx)) { return false; } @@ -142,11 +142,11 @@ exportMechSecContext(OM_uint32 *minor, } bool -gss_eap_shib_attr_provider::initFromGssContext(const gss_eap_attr_ctx *manager, +gss_eap_shib_attr_provider::initWithGssContext(const gss_eap_attr_ctx *manager, const gss_cred_id_t gssCred, const gss_ctx_id_t gssCtx) { - if (!gss_eap_attr_provider::initFromGssContext(manager, gssCred, gssCtx)) + if (!gss_eap_attr_provider::initWithGssContext(manager, gssCred, gssCtx)) return false; auto_ptr resolver(ShibbolethResolver::create()); diff --git a/mech_eap/util_shib.h b/mech_eap/util_shib.h index 8080e0c..4cf7481 100644 --- a/mech_eap/util_shib.h +++ b/mech_eap/util_shib.h @@ -54,9 +54,9 @@ public: gss_eap_shib_attr_provider(void); ~gss_eap_shib_attr_provider(void); - bool initFromExistingContext(const gss_eap_attr_ctx *source, + bool initWithExistingContext(const gss_eap_attr_ctx *source, const gss_eap_attr_provider *ctx); - bool initFromGssContext(const gss_eap_attr_ctx *source, + bool initWithGssContext(const gss_eap_attr_ctx *source, const gss_cred_id_t cred, const gss_ctx_id_t ctx); -- 2.1.4