fix conflict in name declaration of functions for name identifiers settings

2 files changed, 6 insertions, 40 deletions

diff --git a/lasso/xml/lib_register_name_identifier_request.c b/lasso/xml/lib_register_name_identifier_request.c
index 2bd21cd0..c0e92893 100644
--- a/lasso/xml/lib_register_name_identifier_request.c
+++ b/lasso/xml/lib_register_name_identifier_request.c
@@ -63,8 +63,8 @@ From liberty-metadata-v1.0.xsd:
 /*****************************************************************************/
 
 void
-lasso_lib_register_name_identifier_request_set_idp_provided_name_identifier(LassoLibRegisterNameIdentifierRequest *node,
-									    LassoLibIDPProvidedNameIdentifier *idpProvidedNameIdentifier)
+lasso_lib_register_name_identifier_request_set_idpProvidedNameIdentifier(LassoLibRegisterNameIdentifierRequest *node,
+									 LassoLibIDPProvidedNameIdentifier *idpProvidedNameIdentifier)
 {
   g_assert(LASSO_IS_LIB_REGISTER_NAME_IDENTIFIER_REQUEST(node));
   g_assert(LASSO_IS_LIB_IDP_PROVIDED_NAME_IDENTIFIER(idpProvidedNameIdentifier));
@@ -76,8 +76,8 @@ lasso_lib_register_name_identifier_request_set_idp_provided_name_identifier(Lass
 }
 
 void
-lasso_lib_register_name_identifier_request_set_old_provided_name_identifier(LassoLibRegisterNameIdentifierRequest *node,
-									    LassoLibOLDProvidedNameIdentifier *oldProvidedNameIdentifier)
+lasso_lib_register_name_identifier_request_set_oldProvidedNameIdentifier(LassoLibRegisterNameIdentifierRequest *node,
+									 LassoLibOLDProvidedNameIdentifier *oldProvidedNameIdentifier)
 {
   g_assert(LASSO_IS_LIB_REGISTER_NAME_IDENTIFIER_REQUEST(node));
   g_assert(LASSO_IS_LIB_OLD_PROVIDED_NAME_IDENTIFIER(oldProvidedNameIdentifier));
@@ -89,36 +89,6 @@ lasso_lib_register_name_identifier_request_set_old_provided_name_identifier(Lass
 }
 
 void
-lasso_lib_register_name_identifier_request_update_nameIdentifiers(LassoLibRegisterNameIdentifierRequest *node)
-{
-  // IDPProvidedNameIdentifier
-  lasso_node_rename_prop(lasso_node_get_child(LASSO_NODE(node), "IDPProvidedNameIdentifier"),
-			 "NameQualifier", "IDPNameQualifier");
-  lasso_node_rename_prop(lasso_node_get_child(LASSO_NODE(node), "IDPProvidedNameIdentifier"),
-			 "Format", "IDPFormat");
-  
-  // SPProvidedNameIdentifier
-  lasso_node_rename_prop(lasso_node_get_child(LASSO_NODE(node), "SPProvidedNameIdentifier"),
-			 "NameQualifier", "SPNameQualifier");
-  lasso_node_rename_prop(lasso_node_get_child(LASSO_NODE(node), "SPProvidedNameIdentifier"),
-			 "Format", "SPFormat");
-  
-  // OldProvidedNameIdentifier
-  lasso_node_rename_prop(lasso_node_get_child(LASSO_NODE(node), "OldProvidedNameIdentifier"),
-			 "NameQualifier", "OldNameQualifier");
-  lasso_node_rename_prop(lasso_node_get_child(LASSO_NODE(node), "OldProvidedNameIdentifier"),
-			 "Format", "OldFormat");
-}
-
-void
-lasso_lib_register_name_identifier_request_restore_nameIdentifiers(LassoLibRegisterNameIdentifierRequest *node)
-{
-  // IDPProvidedNameIdentifier
-  lasso_node_rename_prop(lasso_node_get_child(LASSO_NODE(node), "IDPProvidedNameIdentifier"),
-			 "NameQualifier", "IDPNameQualifier");
-}
-
-void
 lasso_lib_register_name_identifier_request_set_providerID(LassoLibRegisterNameIdentifierRequest *node,
 							  const xmlChar *providerID)
 {
@@ -141,8 +111,8 @@ lasso_lib_register_name_identifier_request_set_relayState(LassoLibRegisterNameId
 }
 
 void
-lasso_lib_register_name_identifier_request_set_sp_provided_name_identifier(LassoLibRegisterNameIdentifierRequest *node,
-									   LassoLibSPProvidedNameIdentifier *spProvidedNameIdentifier)
+lasso_lib_register_name_identifier_request_set_spProvidedNameIdentifier(LassoLibRegisterNameIdentifierRequest *node,
+									LassoLibSPProvidedNameIdentifier *spProvidedNameIdentifier)
 {
   g_assert(LASSO_IS_LIB_REGISTER_NAME_IDENTIFIER_REQUEST(node));
   g_assert(LASSO_IS_LIB_SP_PROVIDED_NAME_IDENTIFIER(spProvidedNameIdentifier));
diff --git a/lasso/xml/lib_register_name_identifier_request.h b/lasso/xml/lib_register_name_identifier_request.h
index 2aac2a14..443f0820 100644
--- a/lasso/xml/lib_register_name_identifier_request.h
+++ b/lasso/xml/lib_register_name_identifier_request.h
@@ -62,10 +62,6 @@ LASSO_EXPORT void lasso_lib_register_name_identifier_request_set_relayState
 LASSO_EXPORT void lasso_lib_register_name_identifier_request_set_providerID                (LassoLibRegisterNameIdentifierRequest *,
 											    const xmlChar *);
 
-LASSO_EXPORT void lasso_lib_register_name_identifier_request_update_nameIdentifiers        (LassoLibRegisterNameIdentifierRequest *);
-
-LASSO_EXPORT void lasso_lib_register_name_identifier_request_restore_nameIdentifiers       (LassoLibRegisterNameIdentifierRequest *);
-
 LASSO_EXPORT void lasso_lib_register_name_identifier_request_set_idpProvidedNameIdentifier (LassoLibRegisterNameIdentifierRequest *,
 											    LassoLibIDPProvidedNameIdentifier *);