harmonize schema fragment comments (indentation, in .c, no space between

namespace and element name)

12 files changed, 161 insertions, 156 deletions

diff --git a/lasso/xml/disco_credentials.c b/lasso/xml/disco_credentials.c
index 1878b6da..98e3e19a 100644
--- a/lasso/xml/disco_credentials.c
+++ b/lasso/xml/disco_credentials.c
@@ -25,6 +25,18 @@
 
 #include <lasso/xml/disco_credentials.h>
 
+/*
+ * Schema fragment (liberty-idwsf-disco-svc-v1.0.xsd):
+ * 
+ * <xs:element name="Credentials" minOccurs="0">
+ *   <xs:complexType>
+ *     <xs:sequence>
+ *       <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ *     </xs:sequence>
+ *   </xs:complexType>
+ * </xs:element>
+ */
+
 
 /*****************************************************************************/
 /* public methods                                                            */
@@ -88,7 +100,9 @@ class_init(LassoDiscoCredentialsClass *klass)
 	nodeClass->init_from_xml = init_from_xml;
 }
 
-GType lasso_disco_credentials_get_type() {
+GType
+lasso_disco_credentials_get_type()
+{
 	static GType this_type = 0;
 
 	if (!this_type) {
diff --git a/lasso/xml/disco_credentials.h b/lasso/xml/disco_credentials.h
index 87456d58..9f15d856 100644
--- a/lasso/xml/disco_credentials.h
+++ b/lasso/xml/disco_credentials.h
@@ -34,32 +34,19 @@ extern "C" {
 
 #define LASSO_TYPE_DISCO_CREDENTIALS (lasso_disco_credentials_get_type())
 #define LASSO_DISCO_CREDENTIALS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-                                      LASSO_TYPE_DISCO_CREDENTIALS, LassoDiscoCredentials))
+			LASSO_TYPE_DISCO_CREDENTIALS, LassoDiscoCredentials))
 #define LASSO_DISCO_CREDENTIALS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
-                                          LASSO_TYPE_DISCO_CREDENTIALS, LassoDiscoCredentialsClass))
+			LASSO_TYPE_DISCO_CREDENTIALS, LassoDiscoCredentialsClass))
 #define LASSO_IS_DISCO_CREDENTIALS(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
-                                         LASSO_TYPE_DISCO_CREDENTIALS))
+			LASSO_TYPE_DISCO_CREDENTIALS))
 #define LASSO_IS_DISCO_CREDENTIALS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-                                                 LASSO_TYPE_DISCO_CREDENTIALS))
+			LASSO_TYPE_DISCO_CREDENTIALS))
 #define LASSO_DISCO_CREDENTIALS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
-                                          LASSO_TYPE_DISCO_CREDENTIALS, LassoDiscoCredentialsClass))
+			LASSO_TYPE_DISCO_CREDENTIALS, LassoDiscoCredentialsClass))
 
 typedef struct _LassoDiscoCredentials LassoDiscoCredentials;
 typedef struct _LassoDiscoCredentialsClass LassoDiscoCredentialsClass;
 
-/*
-The schema fragment (liberty-idwsf-disco-svc-v1.0.xsd):
-
-     <xs: element name="Credentials" minOccurs="0">
-       <xs: complexType>
-          <xs: sequence>
-            <xs: any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-          </xs: sequence>
-       </xs: complexType>
-     </xs: element>
-
-*/
-
 struct _LassoDiscoCredentials {
 	LassoNode parent;
 
@@ -68,7 +55,6 @@ struct _LassoDiscoCredentials {
 
 struct _LassoDiscoCredentialsClass {
 	LassoNodeClass parent;
-
 };
 
 LASSO_EXPORT GType lasso_disco_credentials_get_type(void);
diff --git a/lasso/xml/disco_query.c b/lasso/xml/disco_query.c
index 6a4e0c2f..8b21da10 100644
--- a/lasso/xml/disco_query.c
+++ b/lasso/xml/disco_query.c
@@ -25,6 +25,34 @@
 
 #include <lasso/xml/disco_query.h>
 
+/*
+ * Schema fragment (liberty-idwsf-disco-svc-v1.0.xsd):
+ * 
+ * <xs:group name="ResourceIDGroup">
+ *   <xs:sequence>
+ *      <xs:choice minOccurs="0" maxOccurs="1">
+ *        <xs:element ref="ResourceID"/>
+ *        <xs:element ref="EncryptedResourceID"/>
+ *      </xs:choice>
+ *   </xs:sequence>
+ * </xs:group>
+ * 
+ * <xs:element name="Query" type="QueryType"/>
+ * <xs:complexType name="QueryType">
+ *   <xs:sequence>
+ *      <xs:group ref="ResourceIDGroup"/>
+ *      <xs:element name="RequestedServiceType" minOccurs="0" maxOccurs="unbounded">
+ *        <xs:complexType>
+ *           <xs:sequence>
+ *             <xs:element ref="ServiceType"/>
+ *             <xs:element ref="Options" minOccurs="0"/>
+ *           </xs:sequence>
+ *        </xs:complexType>
+ *      </xs:element>
+ *   </xs:sequence>
+ *   <xs:attribute name="id" type="xs: ID" use="optional"/>
+ * </xs:complexType>
+ */
 
 /*****************************************************************************/
 /* private methods                                                           */
@@ -35,7 +63,8 @@
 	struct XmlSnippet snippets[] = { \
 		{ "ResourceID", SNIPPET_CONTENT, (void**)&query->ResourceID }, \
 		{ "EncryptedResourceID", SNIPPET_CONTENT, (void**)&query->EncryptedResourceID }, \
-		{ "RequestedServiceType", SNIPPET_LIST_NODES, (void**)&query->RequestedServiceType }, \
+		{ "RequestedServiceType", SNIPPET_LIST_NODES, \
+			(void**)&query->RequestedServiceType }, \
 		{ "id", SNIPPET_ATTRIBUTE, (void**)&query->id }, \
 		{ NULL, 0, NULL} \
 	};
@@ -93,7 +122,9 @@ class_init(LassoDiscoQueryClass *klass)
 	nodeClass->init_from_xml = init_from_xml;
 }
 
-GType lasso_disco_query_get_type() {
+GType
+lasso_disco_query_get_type()
+{
 	static GType this_type = 0;
 
 	if (!this_type) {
diff --git a/lasso/xml/disco_query.h b/lasso/xml/disco_query.h
index cb25f099..8655e7bd 100644
--- a/lasso/xml/disco_query.h
+++ b/lasso/xml/disco_query.h
@@ -35,57 +35,28 @@ extern "C" {
 
 #define LASSO_TYPE_DISCO_QUERY (lasso_disco_query_get_type())
 #define LASSO_DISCO_QUERY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-                                LASSO_TYPE_DISCO_QUERY, LassoDiscoQuery))
+			LASSO_TYPE_DISCO_QUERY, LassoDiscoQuery))
 #define LASSO_DISCO_QUERY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
-                                        LASSO_TYPE_DISCO_QUERY, LassoDiscoQueryClass))
+			LASSO_TYPE_DISCO_QUERY, LassoDiscoQueryClass))
 #define LASSO_IS_DISCO_QUERY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_DISCO_QUERY))
 #define LASSO_IS_DISCO_QUERY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),LASSO_TYPE_DISCO_QUERY))
-#define LASSO_DISCO_QUERY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
-                                        LASSO_TYPE_DISCO_QUERY, LassoDiscoQueryClass)) 
+#define LASSO_DISCO_QUERY_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_DISCO_QUERY, LassoDiscoQueryClass)) 
 
 typedef struct _LassoDiscoQuery LassoDiscoQuery;
 typedef struct _LassoDiscoQueryClass LassoDiscoQueryClass;
 
-/*
-The schema fragment (liberty-idwsf-disco-svc-v1.0.xsd):
-
-<xs: group name="ResourceIDGroup">
-  <xs: sequence>
-     <xs: choice minOccurs="0" maxOccurs="1">
-       <xs: element ref="ResourceID"/>
-       <xs: element ref="EncryptedResourceID"/>
-     </xs: choice>
-  </xs: sequence>
-</xs: group>
-
-<xs: element name="Query" type="QueryType"/>
-<xs: complexType name="QueryType">
-  <xs: sequence>
-     <xs: group ref="ResourceIDGroup"/>
-     <xs: element name="RequestedServiceType" minOccurs="0" maxOccurs="unbounded">
-       <xs: complexType>
-          <xs: sequence>
-            <xs: element ref="ServiceType"/>
-            <xs: element ref="Options" minOccurs="0"/>
-          </xs: sequence>
-       </xs: complexType>
-     </xs: element>
-  </xs: sequence>
-  <xs: attribute name="id" type="xs: ID" use="optional"/>
-</xs: complexType>
-*/
-
 struct _LassoDiscoQuery {
-  LassoNode parent;
+	LassoNode parent;
 
-  char *ResourceID;
-  char *EncryptedResourceID;
-  GList *RequestedServiceType;
-  gchar *id;
+	char *ResourceID;
+	char *EncryptedResourceID;
+	GList *RequestedServiceType;
+	char *id;
 };
 
 struct _LassoDiscoQueryClass {
-  LassoNodeClass parent;
+	LassoNodeClass parent;
 };
 
 LASSO_EXPORT GType lasso_disco_query_get_type(void);
diff --git a/lasso/xml/disco_query_response.c b/lasso/xml/disco_query_response.c
index 2de4dd18..62aad629 100644
--- a/lasso/xml/disco_query_response.c
+++ b/lasso/xml/disco_query_response.c
@@ -25,6 +25,25 @@
 
 #include <lasso/xml/disco_query_response.h>
 
+/*
+ * Schema fragment:
+ *
+ * <xs:element name="QueryResponse" type="QueryResponseType"/>
+ * <xs:complexType name="QueryResponseType">
+ *   <xs:sequence>
+ *     <xs:element ref="Status"/>
+ *     <xs:element ref="ResourceOffering" minOccurs="0" maxOccurs="unbounded"/>
+ *     <xs:element name="Credentials" minOccurs="0">
+ *       <xs:complexType>
+ *         <xs:sequence>
+ *           <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ *         </xs:sequence>
+ *       </xs:complexType>
+ *     </xs:element>
+ *   </xs:sequence>
+ *   <xs:attribute name="id" type="xs:ID" use="optional"/>
+ * </xs:complexType>
+ */
 
 /*****************************************************************************/
 /* public methods                                                            */
@@ -34,7 +53,8 @@
 	LassoDiscoQueryResponse *query_response = LASSO_DISCO_QUERY_RESPONSE(node); \
 	struct XmlSnippet snippets[] = { \
 		{ "Status", SNIPPET_NODE, (void**)&query_response->Status }, \
-		{ "ResourceOffering", SNIPPET_LIST_NODES, (void**)&query_response->ResourceOffering }, \
+		{ "ResourceOffering", SNIPPET_LIST_NODES, \
+			(void**)&query_response->ResourceOffering }, \
 		{ "Credentials", SNIPPET_NODE, (void**)&query_response->Credentials }, \
 		{ "id", SNIPPET_ATTRIBUTE, (void**)&query_response->id }, \
 		{ NULL, 0, NULL} \
@@ -45,8 +65,7 @@ static LassoNodeClass *parent_class = NULL;
 static xmlNode*
 get_xmlNode(LassoNode *node)
 { 
-	GList *ro, *credential;
-	xmlNode *xmlnode, *status_xmlNode, *ro_xmlNode, credential_xmlNode;
+	xmlNode *xmlnode;
 	snippets();
 
 	xmlnode = xmlNewNode(NULL, "QueryResponse");
@@ -60,12 +79,10 @@ get_xmlNode(LassoNode *node)
 static int
 init_from_xml(LassoNode *node, xmlNode *xmlnode)
 {
-	xmlNode *child_xmlNode;
 	snippets();
 	
 	if (parent_class->init_from_xml(node, xmlnode))
 		return -1;
-
 	init_xml_with_snippets(xmlnode, snippets);
 
 	return 0;
@@ -95,7 +112,9 @@ class_init(LassoDiscoQueryResponseClass *class)
 	nodeClass->init_from_xml = init_from_xml;
 }
 
-GType lasso_disco_query_response_get_type() {
+GType
+lasso_disco_query_response_get_type()
+{
 	static GType this_type = 0;
 
 	if (!this_type) {
diff --git a/lasso/xml/disco_query_response.h b/lasso/xml/disco_query_response.h
index 8433e442..0ff37b28 100644
--- a/lasso/xml/disco_query_response.h
+++ b/lasso/xml/disco_query_response.h
@@ -37,39 +37,20 @@ extern "C" {
 
 #define LASSO_TYPE_DISCO_QUERY_RESPONSE (lasso_disco_query_response_get_type())
 #define LASSO_DISCO_QUERY_RESPONSE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-                                         LASSO_TYPE_DISCO_QUERY_RESPONSE, LassoDiscoQueryResponse))
+			LASSO_TYPE_DISCO_QUERY_RESPONSE, LassoDiscoQueryResponse))
 #define LASSO_DISCO_QUERY_RESPONSE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
-                                     LASSO_TYPE_DISCO_QUERY_RESPONSE, LassoDiscoQueryResponseClass))
-#define LASSO_IS_DISCO_QUERY_RESPONSE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
-                                            LASSO_TYPE_DISCO_QUERY_RESPONSE))
-#define LASSO_IS_DISCO_QUERY_RESPONSE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-                                                    LASSO_TYPE_DISCO_QUERY_RESPONSE))
-#define LASSO_DISCO_QUERY_RESPONSE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
-                                     LASSO_TYPE_DISCO_QUERY_RESPONSE, LassoDiscoQueryResponseClass))
+			LASSO_TYPE_DISCO_QUERY_RESPONSE, LassoDiscoQueryResponseClass))
+#define LASSO_IS_DISCO_QUERY_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_DISCO_QUERY_RESPONSE))
+#define LASSO_IS_DISCO_QUERY_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_DISCO_QUERY_RESPONSE))
+#define LASSO_DISCO_QUERY_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_DISCO_QUERY_RESPONSE, \
+				    LassoDiscoQueryResponseClass))
 
 typedef struct _LassoDiscoQueryResponse LassoDiscoQueryResponse;
 typedef struct _LassoDiscoQueryResponseClass LassoDiscoQueryResponseClass;
 
-/*
-
-  <xs:element name="QueryResponse" type="QueryResponseType"/>
-   <xs:complexType name="QueryResponseType">
-      <xs:sequence>
-         <xs:element ref="Status"/>
-         <xs:element ref="ResourceOffering" minOccurs="0" maxOccurs="unbounded"/>
-         <xs:element name="Credentials" minOccurs="0">
-            <xs:complexType>
-             <xs:sequence>
-               <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-             </xs:sequence>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-      <xs:attribute name="id" type="xs:ID" use="optional"/>
-   </xs:complexType>
-
-*/
-
 struct _LassoDiscoQueryResponse {
 	LassoNode parent;
 
@@ -77,11 +58,11 @@ struct _LassoDiscoQueryResponse {
 	GList *ResourceOffering;
 	LassoDiscoCredentials *Credentials;
 
-	gchar *id;
+	char *id;
 };
 
 struct _LassoDiscoQueryResponseClass {
-  LassoNodeClass parent;
+	LassoNodeClass parent;
 };
 
 LASSO_EXPORT GType lasso_disco_query_response_get_type(void);
diff --git a/lasso/xml/disco_requested_service_type.c b/lasso/xml/disco_requested_service_type.c
index d15d9d48..9a366507 100644
--- a/lasso/xml/disco_requested_service_type.c
+++ b/lasso/xml/disco_requested_service_type.c
@@ -24,15 +24,28 @@
  */
 
 #include "errors.h"
-
 #include <lasso/xml/disco_requested_service_type.h>
 
+/*
+ * Schema fragment (liberty-idwsf-disco-svc-v1.0.xsd):
+ *
+ * <xs:element name="RequestedServiceType" minOccurs="0" maxOccurs="unbounded">
+ *   <xs:complexType>
+ *      <xs:sequence>
+ *        <xs:element ref="ServiceType"/>
+ *        <xs:element ref="Options" minOccurs="0"/>
+ *      </xs:sequence>
+ *   </xs:complexType>
+ * </xs:element>
+ */
+
 /*****************************************************************************/
 /* public methods                                                            */
 /*****************************************************************************/
 
 #define snippets() \
-	LassoDiscoRequestedServiceType *RequestedServiceType = LASSO_DISCO_REQUESTED_SERVICE_TYPE(node); \
+	LassoDiscoRequestedServiceType *RequestedServiceType = \
+		LASSO_DISCO_REQUESTED_SERVICE_TYPE(node); \
 	struct XmlSnippet snippets[] = { \
 		{ "ServiceType", SNIPPET_CONTENT, (void**)&RequestedServiceType->ServiceType }, \
 		{ "Options", SNIPPET_NODE, (void**)&RequestedServiceType->Options }, \
@@ -44,8 +57,7 @@ static LassoNodeClass *parent_class = NULL;
 static xmlNode*
 get_xmlNode(LassoNode *node)
 { 
-	GList *option;
-	xmlNode *xmlnode, *options_xmlNode;
+	xmlNode *xmlnode;
 	snippets();
 
 	xmlnode = xmlNewNode(NULL, "RequestedServiceType");
@@ -59,12 +71,10 @@ get_xmlNode(LassoNode *node)
 static int
 init_from_xml(LassoNode *node, xmlNode *xmlnode)
 {
-	xmlNode *option_xmlNode;
 	snippets();
 	
 	if (parent_class->init_from_xml(node, xmlnode))
 		return -1;
-
 	init_xml_with_snippets(xmlnode, snippets);
 
 	return 0;
@@ -91,7 +101,9 @@ class_init(LassoDiscoRequestedServiceTypeClass *class)
 	nodeClass->init_from_xml = init_from_xml;
 }
 
-GType lasso_disco_requested_service_type_get_type() {
+GType
+lasso_disco_requested_service_type_get_type()
+{
 	static GType this_type = 0;
 
 	if (!this_type) {
diff --git a/lasso/xml/disco_requested_service_type.h b/lasso/xml/disco_requested_service_type.h
index ccfc58dc..ea77bfb4 100644
--- a/lasso/xml/disco_requested_service_type.h
+++ b/lasso/xml/disco_requested_service_type.h
@@ -30,37 +30,26 @@
 extern "C" {
 #endif /* __cplusplus */ 
 
-#include <lasso/xml/disco_options.h>
 #include <lasso/xml/xml.h>
+#include <lasso/xml/disco_options.h>
 
 #define LASSO_TYPE_DISCO_REQUESTED_SERVICE_TYPE (lasso_disco_requested_service_type_get_type())
 #define LASSO_DISCO_REQUESTED_SERVICE_TYPE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-                           LASSO_TYPE_DISCO_REQUESTED_SERVICE_TYPE, LassoDiscoRequestedServiceType))
-#define LASSO_DISCO_REQUESTED_SERVICE_TYPE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
-                      LASSO_TYPE_DISCO_REQUESTED_SERVICE_TYPE, LassoDiscoRequestedServiceTypeClass))
-#define LASSO_IS_DISCO_REQUESTED_SERVICE_TYPE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
-                                                           LASSO_TYPE_DISCO_REQUESTED_SERVICE_TYPE))
-#define LASSO_IS_DISCO_REQUESTED_SERVICE_TYPE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-                                                           LASSO_TYPE_DISCO_REQUESTED_SERVICE_TYPE))
-#define LASSO_DISCO_REQUESTED_SERVICE_TYPE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
-                      LASSO_TYPE_DISCO_REQUESTED_SERVICE_TYPE, LassoDiscoRequestedServiceTypeClass))
+			LASSO_TYPE_DISCO_REQUESTED_SERVICE_TYPE, LassoDiscoRequestedServiceType))
+#define LASSO_DISCO_REQUESTED_SERVICE_TYPE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_DISCO_REQUESTED_SERVICE_TYPE, \
+				 LassoDiscoRequestedServiceTypeClass))
+#define LASSO_IS_DISCO_REQUESTED_SERVICE_TYPE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_DISCO_REQUESTED_SERVICE_TYPE))
+#define LASSO_IS_DISCO_REQUESTED_SERVICE_TYPE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_DISCO_REQUESTED_SERVICE_TYPE))
+#define LASSO_DISCO_REQUESTED_SERVICE_TYPE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_DISCO_REQUESTED_SERVICE_TYPE, \
+				    LassoDiscoRequestedServiceTypeClass))
 
 typedef struct _LassoDiscoRequestedServiceType LassoDiscoRequestedServiceType;
 typedef struct _LassoDiscoRequestedServiceTypeClass LassoDiscoRequestedServiceTypeClass;
 
-/*
-The schema fragment (liberty-idwsf-disco-svc-v1.0.xsd):
-     <xs: element name="RequestedServiceType" minOccurs="0" maxOccurs="unbounded">
-       <xs: complexType>
-          <xs: sequence>
-            <xs: element ref="ServiceType"/>
-            <xs: element ref="Options" minOccurs="0"/>
-          </xs: sequence>
-       </xs: complexType>
-     </xs: element>
-
-*/
-
 struct _LassoDiscoRequestedServiceType {
 	LassoNode parent;
 
@@ -70,12 +59,11 @@ struct _LassoDiscoRequestedServiceType {
 
 struct _LassoDiscoRequestedServiceTypeClass {
 	LassoNodeClass parent;
-
 };
 
 LASSO_EXPORT GType lasso_disco_requested_service_type_get_type(void);
 LASSO_EXPORT LassoDiscoRequestedServiceType* lasso_disco_requested_service_type_new(
-	                                                                   const char *ServiceType);
+		const char *ServiceType);
 
 #ifdef __cplusplus
 }
diff --git a/lasso/xml/lib_assertion.c b/lasso/xml/lib_assertion.c
index 5c4f7614..4cf2d403 100644
--- a/lasso/xml/lib_assertion.c
+++ b/lasso/xml/lib_assertion.c
@@ -95,7 +95,8 @@ class_init(LassoLibAssertionClass *klass)
 	LASSO_NODE_CLASS(klass)->init_from_xml = init_from_xml;
 }
 
-GType lasso_lib_assertion_get_type()
+GType
+lasso_lib_assertion_get_type()
 {
 	static GType this_type = 0;
 
diff --git a/lasso/xml/samlp_status.c b/lasso/xml/samlp_status.c
index acbc9abe..0979302d 100644
--- a/lasso/xml/samlp_status.c
+++ b/lasso/xml/samlp_status.c
@@ -98,7 +98,8 @@ class_init(LassoSamlpStatusClass *klass)
 	LASSO_NODE_CLASS(klass)->init_from_xml = init_from_xml;
 }
 
-GType lasso_samlp_status_get_type()
+GType
+lasso_samlp_status_get_type()
 {
 	static GType this_type = 0;
 
diff --git a/lasso/xml/utility_status.c b/lasso/xml/utility_status.c
index 59a6f5ab..de2e46d1 100644
--- a/lasso/xml/utility_status.c
+++ b/lasso/xml/utility_status.c
@@ -25,6 +25,26 @@
 
 #include <lasso/xml/utility_status.h>
 
+/*
+ * Schema fragment
+ *
+ * <xs:element name="Status" type="StatusType">
+ *   <xs:annotation>
+ *     <xs:documentation> A standard Status type</xs:documentation>
+ *   </xs:annotation>
+ * </xs:element>
+ * <xs:complexType name="StatusType">
+ *   <xs:annotation>
+ *     <xs:documentation> A type that may be used for status codes. </xs:documentation>
+ *   </xs:annotation>
+ *   <xs:sequence>
+ *     <xs:element ref="Status" minOccurs="0"/>
+ *   </xs:sequence>
+ *   <xs:attribute name="code" type="xs:QName" use="required"/>
+ *   <xs:attribute name="ref" type="xs:NCName" use="optional"/>
+ *   <xs:attribute name="comment" type="xs:string" use="optional"/>
+ * </xs:complexType>
+ */
 
 /*****************************************************************************/
 /* private methods                                                           */
diff --git a/lasso/xml/utility_status.h b/lasso/xml/utility_status.h
index d2ed7ce6..54fde9bb 100644
--- a/lasso/xml/utility_status.h
+++ b/lasso/xml/utility_status.h
@@ -34,37 +34,18 @@ extern "C" {
 
 #define LASSO_TYPE_UTILITY_STATUS (lasso_utility_status_get_type())
 #define LASSO_UTILITY_STATUS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-                                                     LASSO_TYPE_UTILITY_STATUS, LassoUtilityStatus))
+			LASSO_TYPE_UTILITY_STATUS, LassoUtilityStatus))
 #define LASSO_UTILITY_STATUS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
-                                                LASSO_TYPE_UTILITY_STATUS, LassoUtilityStatusClass))
+			LASSO_TYPE_UTILITY_STATUS, LassoUtilityStatusClass))
 #define LASSO_IS_UTILITY_STATUS(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_UTILITY_STATUS))
-#define LASSO_IS_UTILITY_STATUS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-                                                                         LASSO_TYPE_UTILITY_STATUS))
-#define LASSO_UTILITY_STATUS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
-                                                LASSO_TYPE_UTILITY_STATUS, LassoUtilityStatusClass))
+#define LASSO_IS_UTILITY_STATUS_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_UTILITY_STATUS))
+#define LASSO_UTILITY_STATUS_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_UTILITY_STATUS, LassoUtilityStatusClass))
 
 typedef struct _LassoUtilityStatus LassoUtilityStatus;
 typedef struct _LassoUtilityStatusClass LassoUtilityStatusClass;
 
-/*
-   <xs:element name="Status" type="StatusType">
-        <xs:annotation>
-            <xs:documentation> A standard Status type</xs:documentation>
-        </xs:annotation>
-    </xs:element>
-    <xs:complexType name="StatusType">
-        <xs:annotation>
-            <xs:documentation> A type that may be used for status codes. </xs:documentation>
-        </xs:annotation>
-        <xs:sequence>
-            <xs:element ref="Status" minOccurs="0"/>
-        </xs:sequence>
-        <xs:attribute name="code" type="xs:QName" use="required"/>
-        <xs:attribute name="ref" type="xs:NCName" use="optional"/>
-        <xs:attribute name="comment" type="xs:string" use="optional"/>
-    </xs:complexType>
-*/
-
 struct _LassoUtilityStatus {
 	LassoNode parent;