diff options
author | Frederic Peters <fpeters@entrouvert.com> | 2004-12-23 13:10:31 +0000 |
---|---|---|
committer | Frederic Peters <fpeters@entrouvert.com> | 2004-12-23 13:10:31 +0000 |
commit | bccdbae1277e673173bed2cdcf8f914e08c9adab (patch) | |
tree | 0663b4320de13f4d5ee2918deb4cbb9c26414c33 /lasso/xml | |
parent | 693ad7ea6160ca9a06398143a65069d11cfd5ada (diff) | |
download | lasso-bccdbae1277e673173bed2cdcf8f914e08c9adab.tar.gz lasso-bccdbae1277e673173bed2cdcf8f914e08c9adab.tar.xz lasso-bccdbae1277e673173bed2cdcf8f914e08c9adab.zip |
Removed _new functions for abstract classes; added _new functions for classes
that only had _new_full functions. Documented a little bit; marked public
members in structures as such.
Diffstat (limited to 'lasso/xml')
50 files changed, 91 insertions, 73 deletions
diff --git a/lasso/xml/lib_assertion.c b/lasso/xml/lib_assertion.c index d3023f0a..9b4eb441 100644 --- a/lasso/xml/lib_assertion.c +++ b/lasso/xml/lib_assertion.c @@ -106,6 +106,12 @@ lasso_lib_assertion_get_type() } LassoLibAssertion* +lasso_lib_assertion_new() +{ + return g_object_new(LASSO_TYPE_LIB_ASSERTION, NULL); +} + +LassoLibAssertion* lasso_lib_assertion_new_full(const char *issuer, const char *requestID, const char *audience, const char *notBefore, const char *notOnOrAfter) { diff --git a/lasso/xml/lib_assertion.h b/lasso/xml/lib_assertion.h index 7529f2e9..01c5ed9c 100644 --- a/lasso/xml/lib_assertion.h +++ b/lasso/xml/lib_assertion.h @@ -49,6 +49,8 @@ typedef struct _LassoLibAssertionClass LassoLibAssertionClass; struct _LassoLibAssertion { LassoSamlAssertion parent; + + /*< public >*/ char *InResponseTo; }; @@ -58,6 +60,7 @@ struct _LassoLibAssertionClass { LASSO_EXPORT GType lasso_lib_assertion_get_type (void); +LASSO_EXPORT LassoLibAssertion* lasso_lib_assertion_new(void); LASSO_EXPORT LassoLibAssertion* lasso_lib_assertion_new_full( const char *issuer, const char *requestID, const char *audience, const char *notBefore, const char *notOnOrAfter); diff --git a/lasso/xml/lib_authentication_statement.c b/lasso/xml/lib_authentication_statement.c index 6c300a1a..c6487d4c 100644 --- a/lasso/xml/lib_authentication_statement.c +++ b/lasso/xml/lib_authentication_statement.c @@ -106,6 +106,12 @@ lasso_lib_authentication_statement_get_type() } LassoLibAuthenticationStatement* +lasso_lib_authentication_statement_new(void) +{ + return g_object_new(LASSO_TYPE_LIB_AUTHENTICATION_STATEMENT, NULL); +} + +LassoLibAuthenticationStatement* lasso_lib_authentication_statement_new_full(const char *authenticationMethod, const char *authenticationInstant, const char *reauthenticateOnOrAfter, diff --git a/lasso/xml/lib_authentication_statement.h b/lasso/xml/lib_authentication_statement.h index 5e9a7399..35f82c4c 100644 --- a/lasso/xml/lib_authentication_statement.h +++ b/lasso/xml/lib_authentication_statement.h @@ -54,6 +54,7 @@ typedef struct _LassoLibAuthenticationStatementClass LassoLibAuthenticationState struct _LassoLibAuthenticationStatement { LassoSamlAuthenticationStatement parent; + /*< public >*/ /* <xs:element ref="AuthnContext" minOccurs="0"/> */ LassoLibAuthnContext *AuthnContext; /* <xs:attribute name="ReauthenticateOnOrAfter" type="xs:dateTime" use="optional"/> */ @@ -67,6 +68,7 @@ struct _LassoLibAuthenticationStatementClass { }; LASSO_EXPORT GType lasso_lib_authentication_statement_get_type (void); +LASSO_EXPORT LassoLibAuthenticationStatement* lasso_lib_authentication_statement_new(void); LASSO_EXPORT LassoLibAuthenticationStatement* lasso_lib_authentication_statement_new_full( const char *authenticationMethod, const char *authenticationInstant, diff --git a/lasso/xml/lib_authn_context.h b/lasso/xml/lib_authn_context.h index 42c3dd39..79e5066b 100644 --- a/lasso/xml/lib_authn_context.h +++ b/lasso/xml/lib_authn_context.h @@ -49,6 +49,8 @@ typedef struct _LassoLibAuthnContextClass LassoLibAuthnContextClass; struct _LassoLibAuthnContext { LassoNode parent; + + /*< public >*/ /* <xs:element name="AuthnContextClassRef" type="xs:anyURI" minOccurs="0"/> */ char *AuthnContextClassRef; /* <xs:element name="AuthnContextStatementRef" type="xs:anyURI"/> */ diff --git a/lasso/xml/lib_authn_request.h b/lasso/xml/lib_authn_request.h index 31f7e218..6ce68bf0 100644 --- a/lasso/xml/lib_authn_request.h +++ b/lasso/xml/lib_authn_request.h @@ -52,6 +52,7 @@ typedef struct _LassoLibAuthnRequestClass LassoLibAuthnRequestClass; struct _LassoLibAuthnRequest { LassoSamlpRequestAbstract parent; + /*< public >*/ /* <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/> */ GList *Extension; /* <xs:element ref="ProviderID"/> */ diff --git a/lasso/xml/lib_authn_request_envelope.h b/lasso/xml/lib_authn_request_envelope.h index 5f8e3466..fe1e183f 100644 --- a/lasso/xml/lib_authn_request_envelope.h +++ b/lasso/xml/lib_authn_request_envelope.h @@ -55,6 +55,7 @@ typedef struct _LassoLibAuthnRequestEnvelopeClass LassoLibAuthnRequestEnvelopeCl struct _LassoLibAuthnRequestEnvelope { LassoNode parent; + /*< public >*/ /* <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/> */ GList *Extension; /* <xs:element ref="AuthnRequest"/> */ diff --git a/lasso/xml/lib_authn_response.h b/lasso/xml/lib_authn_response.h index bc805413..2d16f5ad 100644 --- a/lasso/xml/lib_authn_response.h +++ b/lasso/xml/lib_authn_response.h @@ -53,6 +53,7 @@ typedef struct _LassoLibAuthnResponseClass LassoLibAuthnResponseClass; struct _LassoLibAuthnResponse { LassoSamlpResponse parent; + /*< public >*/ /* <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/> */ GList *Extension; /* <xs:element ref="ProviderID"/> */ diff --git a/lasso/xml/lib_authn_response_envelope.h b/lasso/xml/lib_authn_response_envelope.h index b413b325..bb24b659 100644 --- a/lasso/xml/lib_authn_response_envelope.h +++ b/lasso/xml/lib_authn_response_envelope.h @@ -52,6 +52,7 @@ typedef struct _LassoLibAuthnResponseEnvelopeClass LassoLibAuthnResponseEnvelope struct _LassoLibAuthnResponseEnvelope { LassoNode parent; + /*< public >*/ LassoNode *Extension; /* XXX */ LassoLibAuthnResponse *AuthnResponse; char *AssertionConsumerServiceURL; diff --git a/lasso/xml/lib_federation_termination_notification.h b/lasso/xml/lib_federation_termination_notification.h index 2750abdb..1ae46c50 100644 --- a/lasso/xml/lib_federation_termination_notification.h +++ b/lasso/xml/lib_federation_termination_notification.h @@ -57,6 +57,7 @@ typedef struct _LassoLibFederationTerminationNotificationClass \ struct _LassoLibFederationTerminationNotification { LassoSamlpRequestAbstract parent; + /*< public >*/ /* <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/> */ GList *Extension; /* <xs:element ref="ProviderID"/> */ diff --git a/lasso/xml/lib_idp_entries.h b/lasso/xml/lib_idp_entries.h index fc872556..b8474310 100644 --- a/lasso/xml/lib_idp_entries.h +++ b/lasso/xml/lib_idp_entries.h @@ -51,6 +51,7 @@ typedef struct _LassoLibIDPEntriesClass LassoLibIDPEntriesClass; struct _LassoLibIDPEntries{ LassoNode parent; + /*< public >*/ /* <xs:element ref="IDPEntry" maxOccurs="unbounded"/> */ GList *IDPEntry; }; diff --git a/lasso/xml/lib_idp_entry.h b/lasso/xml/lib_idp_entry.h index ddd9984c..89223aab 100644 --- a/lasso/xml/lib_idp_entry.h +++ b/lasso/xml/lib_idp_entry.h @@ -50,6 +50,7 @@ typedef struct _LassoLibIDPEntryClass LassoLibIDPEntryClass; struct _LassoLibIDPEntry{ LassoNode parent; + /*< public >*/ /* <xs:element ref="ProviderID"/> */ char *ProviderID; /* <xs:element name="ProviderName" type="xs:string" minOccurs="0"/> */ diff --git a/lasso/xml/lib_idp_list.h b/lasso/xml/lib_idp_list.h index 29f6830c..bfc05167 100644 --- a/lasso/xml/lib_idp_list.h +++ b/lasso/xml/lib_idp_list.h @@ -50,6 +50,7 @@ typedef struct _LassoLibIDPListClass LassoLibIDPListClass; struct _LassoLibIDPList { LassoNode parent; + /*< public >*/ /* <xs:element ref="IDPEntries"/> */ LassoLibIDPEntries *IDPEntries; /* <xs:element ref="GetComplete" minOccurs="0"/> */ diff --git a/lasso/xml/lib_logout_request.h b/lasso/xml/lib_logout_request.h index a4237ef7..70fb4a07 100644 --- a/lasso/xml/lib_logout_request.h +++ b/lasso/xml/lib_logout_request.h @@ -53,6 +53,7 @@ typedef struct _LassoLibLogoutRequestClass LassoLibLogoutRequestClass; struct _LassoLibLogoutRequest { LassoSamlpRequestAbstract parent; + /*< public >*/ /* <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/> */ GList *Extension; char *ProviderID; diff --git a/lasso/xml/lib_name_identifier_mapping_request.h b/lasso/xml/lib_name_identifier_mapping_request.h index 401f0cc9..b200b876 100644 --- a/lasso/xml/lib_name_identifier_mapping_request.h +++ b/lasso/xml/lib_name_identifier_mapping_request.h @@ -56,6 +56,7 @@ typedef struct _LassoLibNameIdentifierMappingRequestClass \ struct _LassoLibNameIdentifierMappingRequest { LassoSamlpRequestAbstract parent; + /*< public >*/ /* <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/> */ GList *Extension; /* <xs:element ref="ProviderID"/> */ diff --git a/lasso/xml/lib_name_identifier_mapping_response.h b/lasso/xml/lib_name_identifier_mapping_response.h index dddf3a72..ca27a27a 100644 --- a/lasso/xml/lib_name_identifier_mapping_response.h +++ b/lasso/xml/lib_name_identifier_mapping_response.h @@ -58,6 +58,7 @@ typedef struct _LassoLibNameIdentifierMappingResponseClass \ struct _LassoLibNameIdentifierMappingResponse { LassoSamlpResponseAbstract parent; + /*< public >*/ /* <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/> */ GList *Extension; /* <xs:element ref="ProviderID"/> */ diff --git a/lasso/xml/lib_register_name_identifier_request.h b/lasso/xml/lib_register_name_identifier_request.h index d0dacd27..48879d97 100644 --- a/lasso/xml/lib_register_name_identifier_request.h +++ b/lasso/xml/lib_register_name_identifier_request.h @@ -56,6 +56,7 @@ typedef struct _LassoLibRegisterNameIdentifierRequestClass \ struct _LassoLibRegisterNameIdentifierRequest { LassoSamlpRequestAbstract parent; + /*< public >*/ /* <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/> */ GList *Extension; /* <xs:element ref="ProviderID"/> */ diff --git a/lasso/xml/lib_request_authn_context.h b/lasso/xml/lib_request_authn_context.h index 76aaac1e..40826320 100644 --- a/lasso/xml/lib_request_authn_context.h +++ b/lasso/xml/lib_request_authn_context.h @@ -52,6 +52,8 @@ typedef struct _LassoLibRequestAuthnContextClass LassoLibRequestAuthnContextClas struct _LassoLibRequestAuthnContext { LassoNode parent; + + /*< public >*/ /* <xs:element name="AuthnContextClassRef" type="xs:anyURI" maxOccurs="unbounded"/> */ char *AuthnContextClassRef; /* XXX: should actually be a list */ /* <xs:element name="AuthnContextStatementRef" type="xs:anyURI" maxOccurs="unbounded"/> */ diff --git a/lasso/xml/lib_scoping.h b/lasso/xml/lib_scoping.h index d4f2c591..655ac23a 100644 --- a/lasso/xml/lib_scoping.h +++ b/lasso/xml/lib_scoping.h @@ -50,6 +50,8 @@ typedef struct _LassoLibScopingClass LassoLibScopingClass; struct _LassoLibScoping { LassoNode parent; + + /*< public >*/ /* <xs:element name="ProxyCount" type="xs:nonNegativeInteger" minOccurs="0"/> */ int ProxyCount; /* <xs:element ref="IDPList" minOccurs="0"/> */ diff --git a/lasso/xml/lib_status_response.h b/lasso/xml/lib_status_response.h index 0e4c9e6a..b7f483bb 100644 --- a/lasso/xml/lib_status_response.h +++ b/lasso/xml/lib_status_response.h @@ -53,6 +53,7 @@ typedef struct _LassoLibStatusResponseClass LassoLibStatusResponseClass; struct _LassoLibStatusResponse { LassoSamlpResponseAbstract parent; + /*< public >*/ /* <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/> */ GList *Extension; /* <xs:element ref="ProviderID"/> */ diff --git a/lasso/xml/lib_subject.h b/lasso/xml/lib_subject.h index bc8c4cf1..5b315a29 100644 --- a/lasso/xml/lib_subject.h +++ b/lasso/xml/lib_subject.h @@ -49,6 +49,8 @@ typedef struct _LassoLibSubjectClass LassoLibSubjectClass; struct _LassoLibSubject { LassoSamlSubject parent; + + /*< public >*/ /* <xs:element ref="IDPProvidedNameIdentifier"/> */ LassoSamlNameIdentifier *IDPProvidedNameIdentifier; }; diff --git a/lasso/xml/saml_advice.h b/lasso/xml/saml_advice.h index acceb33f..d013fd31 100644 --- a/lasso/xml/saml_advice.h +++ b/lasso/xml/saml_advice.h @@ -48,6 +48,8 @@ typedef struct _LassoSamlAdviceClass LassoSamlAdviceClass; struct _LassoSamlAdvice { LassoNode parent; + + /*< public >*/ /* XXX: unbounded; both should be GList */ /* <element ref="saml:AssertionIDReference"/> */ char *AssertionIDReference; diff --git a/lasso/xml/saml_assertion.h b/lasso/xml/saml_assertion.h index 1a556af7..84cbbb64 100644 --- a/lasso/xml/saml_assertion.h +++ b/lasso/xml/saml_assertion.h @@ -56,6 +56,7 @@ typedef struct _LassoSamlAssertionClass LassoSamlAssertionClass; struct _LassoSamlAssertion { LassoNode parent; + /*< public >*/ /* <element ref="saml:Conditions" minOccurs="0"/> */ LassoSamlConditions *Conditions; /* <element ref="saml:Advice" minOccurs="0"/> */ diff --git a/lasso/xml/saml_attribute.h b/lasso/xml/saml_attribute.h index a4040f58..468d333f 100644 --- a/lasso/xml/saml_attribute.h +++ b/lasso/xml/saml_attribute.h @@ -50,6 +50,7 @@ typedef struct _LassoSamlAttributeClass LassoSamlAttributeClass; struct _LassoSamlAttribute { LassoSamlAttributeDesignator parent; + /*< public >*/ GList *AttributeValue; }; diff --git a/lasso/xml/saml_attribute_designator.h b/lasso/xml/saml_attribute_designator.h index ab0106fb..42da3d5c 100644 --- a/lasso/xml/saml_attribute_designator.h +++ b/lasso/xml/saml_attribute_designator.h @@ -53,6 +53,7 @@ typedef struct _LassoSamlAttributeDesignatorClass LassoSamlAttributeDesignatorCl struct _LassoSamlAttributeDesignator { LassoNode parent; + /*< public >*/ char *AttributeName; char *AttributeNamespace; }; diff --git a/lasso/xml/saml_attribute_statement.h b/lasso/xml/saml_attribute_statement.h index b2155443..09aee5d6 100644 --- a/lasso/xml/saml_attribute_statement.h +++ b/lasso/xml/saml_attribute_statement.h @@ -53,6 +53,7 @@ typedef struct _LassoSamlAttributeStatementClass LassoSamlAttributeStatementClas struct _LassoSamlAttributeStatement { LassoSamlSubjectStatementAbstract parent; + /*< public >*/ GList *Attribute; }; diff --git a/lasso/xml/saml_audience_restriction_condition.h b/lasso/xml/saml_audience_restriction_condition.h index ac107dc9..03563dd5 100644 --- a/lasso/xml/saml_audience_restriction_condition.h +++ b/lasso/xml/saml_audience_restriction_condition.h @@ -54,6 +54,8 @@ typedef struct _LassoSamlAudienceRestrictionConditionClass \ struct _LassoSamlAudienceRestrictionCondition { LassoSamlConditionAbstract parent; + + /*< public >*/ /* <element ref="saml:Audience" maxOccurs="unbounded"/> */ char *Audience; /* XXX: unbounded -> GList */ }; diff --git a/lasso/xml/saml_authentication_statement.h b/lasso/xml/saml_authentication_statement.h index 95c2afd0..adcacb6c 100644 --- a/lasso/xml/saml_authentication_statement.h +++ b/lasso/xml/saml_authentication_statement.h @@ -54,6 +54,8 @@ typedef struct _LassoSamlAuthenticationStatementClass LassoSamlAuthenticationSta struct _LassoSamlAuthenticationStatement { LassoSamlSubjectStatementAbstract parent; + + /*< public >*/ /* <element ref="saml:SubjectLocality" minOccurs="0"/> */ LassoSamlSubjectLocality *SubjectLocality; /* <element ref="saml:AuthorityBinding" minOccurs="0" maxOccurs="unbounded"/> */ diff --git a/lasso/xml/saml_authority_binding.h b/lasso/xml/saml_authority_binding.h index 065d570e..a4e4951a 100644 --- a/lasso/xml/saml_authority_binding.h +++ b/lasso/xml/saml_authority_binding.h @@ -53,6 +53,7 @@ typedef struct _LassoSamlAuthorityBindingClass LassoSamlAuthorityBindingClass; struct _LassoSamlAuthorityBinding { LassoNode parent; + /*< public >*/ /* <attribute name="AuthorityKind" type="QName" use="required"/> */ char *AuthorityKind; /* <attribute name="Location" type="anyURI" use="required"/> */ diff --git a/lasso/xml/saml_condition_abstract.c b/lasso/xml/saml_condition_abstract.c index deae0b8f..1e3ec214 100644 --- a/lasso/xml/saml_condition_abstract.c +++ b/lasso/xml/saml_condition_abstract.c @@ -79,17 +79,3 @@ lasso_saml_condition_abstract_get_type() } return this_type; } - -/** - * lasso_saml_condition_abstract_new: - * - * Creates a new saml:ConditionAbstract node object. - * - * Return value: the new @LassoSamlConditionAbstract - **/ -LassoNode* -lasso_saml_condition_abstract_new() -{ - return g_object_new(LASSO_TYPE_SAML_CONDITION_ABSTRACT, NULL); -} - diff --git a/lasso/xml/saml_condition_abstract.h b/lasso/xml/saml_condition_abstract.h index de74dd98..1a171c3d 100644 --- a/lasso/xml/saml_condition_abstract.h +++ b/lasso/xml/saml_condition_abstract.h @@ -59,7 +59,6 @@ struct _LassoSamlConditionAbstractClass { }; LASSO_EXPORT GType lasso_saml_condition_abstract_get_type(void); -LASSO_EXPORT LassoNode* lasso_saml_condition_abstract_new(void); #ifdef __cplusplus } diff --git a/lasso/xml/saml_conditions.h b/lasso/xml/saml_conditions.h index 813ae0c6..4c423c08 100644 --- a/lasso/xml/saml_conditions.h +++ b/lasso/xml/saml_conditions.h @@ -52,6 +52,7 @@ typedef struct _LassoSamlConditionsClass LassoSamlConditionsClass; struct _LassoSamlConditions { LassoNode parent; + /*< public >*/ /* <element ref="saml:Condition"/> XXX: unbounded */ /* LassoSamlCondition *Condition; XXX missing from lasso */ /* <element ref="saml:AudienceRestrictionCondition"/> XXX: unbounded */ diff --git a/lasso/xml/saml_name_identifier.h b/lasso/xml/saml_name_identifier.h index 709650f8..73051762 100644 --- a/lasso/xml/saml_name_identifier.h +++ b/lasso/xml/saml_name_identifier.h @@ -52,6 +52,8 @@ typedef struct _LassoSamlNameIdentifierClass LassoSamlNameIdentifierClass; struct _LassoSamlNameIdentifier { LassoNode parent; + + /*< public >*/ char *NameQualifier; char *Format; char *content; diff --git a/lasso/xml/saml_statement_abstract.c b/lasso/xml/saml_statement_abstract.c index 294db1de..5d4b49c6 100644 --- a/lasso/xml/saml_statement_abstract.c +++ b/lasso/xml/saml_statement_abstract.c @@ -79,16 +79,3 @@ lasso_saml_statement_abstract_get_type() } return this_type; } - -/** - * lasso_saml_statement_abstract_new: - * - * Creates a new saml:StatementAbstract node object. - * - * Return value: the new @LassoSamlStatementAbstract - **/ -LassoNode* lasso_saml_statement_abstract_new() -{ - return g_object_new(LASSO_TYPE_SAML_STATEMENT_ABSTRACT, NULL); -} - diff --git a/lasso/xml/saml_statement_abstract.h b/lasso/xml/saml_statement_abstract.h index 946e620f..2240fdf3 100644 --- a/lasso/xml/saml_statement_abstract.h +++ b/lasso/xml/saml_statement_abstract.h @@ -59,7 +59,6 @@ struct _LassoSamlStatementAbstractClass { }; LASSO_EXPORT GType lasso_saml_statement_abstract_get_type(void); -LASSO_EXPORT LassoNode* lasso_saml_statement_abstract_new(void); #ifdef __cplusplus } diff --git a/lasso/xml/saml_subject.h b/lasso/xml/saml_subject.h index 227eb80d..1d02020b 100644 --- a/lasso/xml/saml_subject.h +++ b/lasso/xml/saml_subject.h @@ -50,6 +50,8 @@ typedef struct _LassoSamlSubjectClass LassoSamlSubjectClass; struct _LassoSamlSubject { LassoNode parent; + + /*< public >*/ LassoSamlNameIdentifier *NameIdentifier; LassoSamlSubjectConfirmation *SubjectConfirmation; }; diff --git a/lasso/xml/saml_subject_confirmation.h b/lasso/xml/saml_subject_confirmation.h index 6893b8a3..adc5ab8a 100644 --- a/lasso/xml/saml_subject_confirmation.h +++ b/lasso/xml/saml_subject_confirmation.h @@ -53,6 +53,7 @@ typedef struct _LassoSamlSubjectConfirmationClass LassoSamlSubjectConfirmationCl struct _LassoSamlSubjectConfirmation { LassoNode parent; + /*< public >*/ /* <element ref="saml:ConfirmationMethod" maxOccurs="unbounded"/> */ char *ConfirmationMethod; /* XXX: unbounded and should be enum */ /* <element ref="saml:SubjectConfirmationData" minOccurs="0"/> */ diff --git a/lasso/xml/saml_subject_locality.h b/lasso/xml/saml_subject_locality.h index 3c72a45f..af447c9f 100644 --- a/lasso/xml/saml_subject_locality.h +++ b/lasso/xml/saml_subject_locality.h @@ -52,6 +52,8 @@ typedef struct _LassoSamlSubjectLocalityClass LassoSamlSubjectLocalityClass; struct _LassoSamlSubjectLocality { LassoNode parent; + + /*< public >*/ /* <attribute name="IPAddress" type="string" use="optional"/> */ char *IPAddress; /* <attribute name="DNSAddress" type="string" use="optional"/> */ diff --git a/lasso/xml/saml_subject_statement_abstract.c b/lasso/xml/saml_subject_statement_abstract.c index 083224dc..7365afd7 100644 --- a/lasso/xml/saml_subject_statement_abstract.c +++ b/lasso/xml/saml_subject_statement_abstract.c @@ -93,17 +93,3 @@ lasso_saml_subject_statement_abstract_get_type() } return this_type; } - -/** - * lasso_saml_subject_statement_abstract_new: - * - * Creates a new saml:SubjectStatementAbstract node object. - * - * Return value: the new @LassoSamlSubjectStatementAbstract - **/ -LassoNode* -lasso_saml_subject_statement_abstract_new() -{ - return g_object_new(LASSO_TYPE_SAML_SUBJECT_STATEMENT_ABSTRACT, NULL); -} - diff --git a/lasso/xml/saml_subject_statement_abstract.h b/lasso/xml/saml_subject_statement_abstract.h index d2e61526..80f9db3a 100644 --- a/lasso/xml/saml_subject_statement_abstract.h +++ b/lasso/xml/saml_subject_statement_abstract.h @@ -54,6 +54,8 @@ typedef struct _LassoSamlSubjectStatementAbstractClass LassoSamlSubjectStatement struct _LassoSamlSubjectStatementAbstract { LassoSamlStatementAbstract parent; + + /*< public >*/ /* <element ref="saml:Subject"/> */ LassoSamlSubject *Subject; }; @@ -63,7 +65,6 @@ struct _LassoSamlSubjectStatementAbstractClass { }; LASSO_EXPORT GType lasso_saml_subject_statement_abstract_get_type(void); -LASSO_EXPORT LassoNode* lasso_saml_subject_statement_abstract_new(void); #ifdef __cplusplus } diff --git a/lasso/xml/samlp_request.h b/lasso/xml/samlp_request.h index a2239b26..a01c53c0 100644 --- a/lasso/xml/samlp_request.h +++ b/lasso/xml/samlp_request.h @@ -50,6 +50,7 @@ typedef struct _LassoSamlpRequestClass LassoSamlpRequestClass; struct _LassoSamlpRequest { LassoSamlpRequestAbstract parent; + /*< public >*/ /* <element name="AssertionArtifact" type="string"/> */ char *AssertionArtifact; }; diff --git a/lasso/xml/samlp_request_abstract.c b/lasso/xml/samlp_request_abstract.c index 970a6394..4500988f 100644 --- a/lasso/xml/samlp_request_abstract.c +++ b/lasso/xml/samlp_request_abstract.c @@ -129,9 +129,3 @@ lasso_samlp_request_abstract_get_type() return this_type; } -LassoNode* -lasso_samlp_request_abstract_new() -{ - return g_object_new(LASSO_TYPE_SAMLP_REQUEST_ABSTRACT, NULL); -} - diff --git a/lasso/xml/samlp_request_abstract.h b/lasso/xml/samlp_request_abstract.h index 213b490b..07d40e6e 100644 --- a/lasso/xml/samlp_request_abstract.h +++ b/lasso/xml/samlp_request_abstract.h @@ -53,6 +53,7 @@ typedef struct _LassoSamlpRequestAbstractClass LassoSamlpRequestAbstractClass; struct _LassoSamlpRequestAbstract { LassoNode parent; + /*< public >*/ /* <element ref="samlp:RespondWith" minOccurs="0" maxOccurs="unbounded"/> */ char *RespondWith; /* XXX: turn into a GList */ /* <attribute name="RequestID" type="saml:IDType" use="required"/> */ @@ -76,8 +77,6 @@ struct _LassoSamlpRequestAbstractClass { LASSO_EXPORT GType lasso_samlp_request_abstract_get_type (void); -LASSO_EXPORT LassoNode* lasso_samlp_request_abstract_new (void); - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/lasso/xml/samlp_response.h b/lasso/xml/samlp_response.h index c8f940d3..5e081531 100644 --- a/lasso/xml/samlp_response.h +++ b/lasso/xml/samlp_response.h @@ -52,6 +52,7 @@ typedef struct _LassoSamlpResponseClass LassoSamlpResponseClass; struct _LassoSamlpResponse { LassoSamlpResponseAbstract parent; + /*< public >*/ /* <element ref="samlp:Status"/> */ LassoSamlpStatus *Status; /* <element ref="saml:Assertion" minOccurs="0" maxOccurs="unbounded"/> */ diff --git a/lasso/xml/samlp_response_abstract.c b/lasso/xml/samlp_response_abstract.c index 7e78496c..5f86e10d 100644 --- a/lasso/xml/samlp_response_abstract.c +++ b/lasso/xml/samlp_response_abstract.c @@ -148,10 +148,3 @@ lasso_samlp_response_abstract_fill(LassoSamlpResponseAbstract *response, response->InResponseTo = g_strdup(InResponseTo); response->Recipient = g_strdup(Recipient); } - -LassoNode* -lasso_samlp_response_abstract_new() -{ - return g_object_new(LASSO_TYPE_SAMLP_RESPONSE_ABSTRACT, NULL); -} - diff --git a/lasso/xml/samlp_response_abstract.h b/lasso/xml/samlp_response_abstract.h index 23342f0e..89251f0c 100644 --- a/lasso/xml/samlp_response_abstract.h +++ b/lasso/xml/samlp_response_abstract.h @@ -53,6 +53,7 @@ typedef struct _LassoSamlpResponseAbstractClass LassoSamlpResponseAbstractClass; struct _LassoSamlpResponseAbstract { LassoNode parent; + /*< public >*/ /* <attribute name="ResponseID" type="saml:IDType" use="required"/> */ char *ResponseID; /* <attribute name="InResponseTo" type="saml:IDReferenceType" use="optional"/> */ @@ -76,7 +77,6 @@ struct _LassoSamlpResponseAbstractClass { }; LASSO_EXPORT GType lasso_samlp_response_abstract_get_type (void); -LASSO_EXPORT LassoNode* lasso_samlp_response_abstract_new (void); LASSO_EXPORT void lasso_samlp_response_abstract_fill(LassoSamlpResponseAbstract *response, const char *InResponseTo, const char *Recipient); diff --git a/lasso/xml/samlp_status.h b/lasso/xml/samlp_status.h index 8b8c1bcd..c30eb68f 100644 --- a/lasso/xml/samlp_status.h +++ b/lasso/xml/samlp_status.h @@ -50,6 +50,7 @@ typedef struct _LassoSamlpStatusClass LassoSamlpStatusClass; struct _LassoSamlpStatus { LassoNode parent; + /*< public >*/ /* <element ref="samlp:StatusCode"/> */ LassoSamlpStatusCode *StatusCode; /* <element ref="samlp:StatusMessage" minOccurs="0" maxOccurs="1"/> */ diff --git a/lasso/xml/samlp_status_code.h b/lasso/xml/samlp_status_code.h index b3c306ae..4a99bb5d 100644 --- a/lasso/xml/samlp_status_code.h +++ b/lasso/xml/samlp_status_code.h @@ -49,6 +49,8 @@ typedef struct _LassoSamlpStatusCodeClass LassoSamlpStatusCodeClass; struct _LassoSamlpStatusCode { LassoNode parent; + + /*< public >*/ /* <element ref="samlp:StatusCode" minOccurs="0"/> */ LassoSamlpStatusCode *StatusCode; /* <attribute name="Value" type="QName" use="required"/> */ diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c index 262a4bf9..922de4ed 100644 --- a/lasso/xml/xml.c +++ b/lasso/xml/xml.c @@ -59,10 +59,11 @@ static void xmlCleanNs(xmlNode *root_node); /** * lasso_node_dump: * @node: a #LassoNode - * @encoding: the name of the encoding to use or NULL. + * @encoding: the name of character set encoding to use or NULL for default + * (UTF-8). * @format: whether formatting is allowed * - * Dumps @node. All datas in object are dumped in an XML format. + * Dumps @node. All datas in object are dumped in an XML format. * * Return value: a full XML dump of @node. The string must be freed by the * caller. @@ -752,7 +753,7 @@ lasso_node_get_type() * * Creates a new #LassoNode. * - * Return value: a new node + * Return value: a newly created #LassoNode object **/ LassoNode* lasso_node_new() @@ -760,6 +761,14 @@ lasso_node_new() return g_object_new(LASSO_TYPE_NODE, NULL); } +/** + * lasso_node_new_from_dump: + * @dump: XML object dump + * + * Restores the @dump to a new #LassoNode subclass. + * + * Return value: a newly created object; or NULL if an error occured. + **/ LassoNode* lasso_node_new_from_dump(const char *dump) { @@ -957,7 +966,7 @@ lasso_node_init_from_message(LassoNode *node, const char *message) /** - * lasso_node_class_add_snippets + * lasso_node_class_add_snippets: * @klass: object class * @snippets: array of XmlSnippet (NULL terminated) **/ @@ -968,7 +977,7 @@ lasso_node_class_add_snippets(LassoNodeClass *klass, struct XmlSnippet *snippets } /** - * lasso_node_class_add_snippets + * lasso_node_class_add_snippets: * @klass: object class * @snippets: array of QuerySnippet (NULL terminated) **/ @@ -979,7 +988,7 @@ lasso_node_class_add_query_snippets(LassoNodeClass *klass, struct QuerySnippet * } /** - * lasso_node_class_set_nodename + * lasso_node_class_set_nodename: * @klass: object class * @name: name for element node **/ @@ -993,7 +1002,7 @@ lasso_node_class_set_nodename(LassoNodeClass *klass, char *name) /** - * lasso_node_class_set_ns + * lasso_node_class_set_ns: * @klass: object class * @href: namespace uri * @prefix: namespace prefix @@ -1362,7 +1371,8 @@ lasso_node_init_from_query_fields(LassoNode *node, char **query_fields) return TRUE; } -static void xmlDeclareNs(xmlNode *root_node, xmlNode *node) +static void +xmlDeclareNs(xmlNode *root_node, xmlNode *node) { xmlNs *ns; xmlNode *t; @@ -1378,12 +1388,14 @@ static void xmlDeclareNs(xmlNode *root_node, xmlNode *node) xmlDeclareNs(root_node, t); } -static int sameNs(xmlNs *ns1, xmlNs *ns2) +static int +sameNs(xmlNs *ns1, xmlNs *ns2) { return (ns1 == NULL && ns2 == NULL) || (ns1 && ns2 && strcmp(ns1->href, ns2->href) == 0); } -static void xmlUseNsDef(xmlNs *ns, xmlNode *node) +static void +xmlUseNsDef(xmlNs *ns, xmlNode *node) { xmlNode *t; xmlNs *ns2, *ns3; @@ -1418,7 +1430,8 @@ static void xmlUseNsDef(xmlNs *ns, xmlNode *node) * xmlCleanNs removes duplicate xml namespace declarations and merge them on * the @root_node. **/ -static void xmlCleanNs(xmlNode *root_node) +static void +xmlCleanNs(xmlNode *root_node) { xmlNs *ns; xmlNode *t; @@ -1433,4 +1446,3 @@ static void xmlCleanNs(xmlNode *root_node) xmlUseNsDef(ns, t); } } - diff --git a/lasso/xml/xml.h b/lasso/xml/xml.h index 1da85f0b..105f8895 100644 --- a/lasso/xml/xml.h +++ b/lasso/xml/xml.h @@ -97,7 +97,7 @@ struct _LassoNodeClass { LASSO_EXPORT GType lasso_node_get_type(void); LASSO_EXPORT LassoNode* lasso_node_new(void); -LASSO_EXPORT LassoNode* lasso_node_new_from_dump(const char *buffer); +LASSO_EXPORT LassoNode* lasso_node_new_from_dump(const char *dump); LASSO_EXPORT LassoNode* lasso_node_new_from_soap(const char *soap); LASSO_EXPORT LassoNode* lasso_node_new_from_xmlNode(xmlNode* node); |