harmony in snippets declaration

7 files changed, 14 insertions, 15 deletions

diff --git a/lasso/xml/disco_description.c b/lasso/xml/disco_description.c
index 2be3785a..d5aacdea 100644
--- a/lasso/xml/disco_description.c
+++ b/lasso/xml/disco_description.c
@@ -62,7 +62,7 @@
 #define snippets() \
 	LassoDiscoDescription *description = LASSO_DISCO_DESCRIPTION(node); \
 	struct XmlSnippet snippets[] = { \
-		{ "SecurityMechID", SNIPPET_CONTENT, (void**)&(description->SecurityMechID) },	\
+		{ "SecurityMechID", SNIPPET_CONTENT, (void**)&(description->SecurityMechID) }, \
 		{ "CredentialRef", SNIPPET_CONTENT, (void**)&(description->CredentialRef) }, \
 		{ "id", SNIPPET_ATTRIBUTE, (void**)&(description->id) }, \
 		{ NULL, 0, NULL} \
diff --git a/lasso/xml/disco_insert_entry.c b/lasso/xml/disco_insert_entry.c
index c41f940b..8b6de6c6 100644
--- a/lasso/xml/disco_insert_entry.c
+++ b/lasso/xml/disco_insert_entry.c
@@ -41,8 +41,7 @@
 /*****************************************************************************/
 
 #define snippets() \
-	LassoDiscoInsertEntry *entry = \
-		LASSO_DISCO_INSERT_ENTRY(node); \
+	LassoDiscoInsertEntry *entry = LASSO_DISCO_INSERT_ENTRY(node); \
 	struct XmlSnippet snippets[] = { \
 		{ "ResourceOffering", SNIPPET_NODE, (void**)&(entry->ResourceOffering) }, \
 		{ "any", SNIPPET_LIST_NODES, (void**)&(entry->any) }, \
diff --git a/lasso/xml/disco_modify.c b/lasso/xml/disco_modify.c
index 35e3c678..addd503b 100644
--- a/lasso/xml/disco_modify.c
+++ b/lasso/xml/disco_modify.c
@@ -55,8 +55,9 @@
 #define snippets() \
 	LassoDiscoModify *modify = LASSO_DISCO_MODIFY(node); \
 	struct XmlSnippet snippets[] = { \
-		{ "ResourceID", SNIPPET_CONTENT, (void**)&(modify->ResourceID) },	\
-		{ "EncryptedResourceID", SNIPPET_CONTENT, (void**)&(modify->EncryptedResourceID) }, \
+		{ "ResourceID", SNIPPET_CONTENT, (void**)&(modify->ResourceID) }, \
+		{ "EncryptedResourceID", SNIPPET_CONTENT, \
+			(void**)&(modify->EncryptedResourceID) }, \
 		{ "InsertEntry", SNIPPET_LIST_NODES, (void**)&(modify->InsertEntry) }, \
 		{ "RemoveEntry", SNIPPET_LIST_NODES, (void**)&(modify->RemoveEntry) }, \
 		{ "id", SNIPPET_ATTRIBUTE, (void**)&(modify->id) }, \
diff --git a/lasso/xml/disco_modify_response.c b/lasso/xml/disco_modify_response.c
index eedfdd41..1f426814 100644
--- a/lasso/xml/disco_modify_response.c
+++ b/lasso/xml/disco_modify_response.c
@@ -50,9 +50,9 @@
 #define snippets() \
 	LassoDiscoModifyResponse *response = LASSO_DISCO_MODIFY_RESPONSE(node); \
 	struct XmlSnippet snippets[] = { \
-		{ "Status", SNIPPET_NODE, (void**)&(response->Status) },	\
-		{ "id", SNIPPET_ATTRIBUTE, (void**)&(response->id) },	\
-		{ "newEntryIDs", SNIPPET_ATTRIBUTE, (void**)&(response->newEntryIDs) },	\
+		{ "Status", SNIPPET_NODE, (void**)&(response->Status) }, \
+		{ "id", SNIPPET_ATTRIBUTE, (void**)&(response->id) }, \
+		{ "newEntryIDs", SNIPPET_ATTRIBUTE, (void**)&(response->newEntryIDs) }, \
 		{ NULL, 0, NULL} \
 	};
 
diff --git a/lasso/xml/disco_options.c b/lasso/xml/disco_options.c
index 105535ee..5db5ab1a 100644
--- a/lasso/xml/disco_options.c
+++ b/lasso/xml/disco_options.c
@@ -43,7 +43,7 @@
 #define snippets() \
 	LassoDiscoOptions *options = LASSO_DISCO_OPTIONS(node); \
 	struct XmlSnippet snippets[] = { \
-		{ "Option", SNIPPET_LIST_CONTENT, (void**)&(options->Option) },	\
+		{ "Option", SNIPPET_LIST_CONTENT, (void**)&(options->Option) }, \
 		{ NULL, 0, NULL} \
 	};
 
diff --git a/lasso/xml/disco_resource_offering.c b/lasso/xml/disco_resource_offering.c
index 3baa2c94..4fcd2fa6 100644
--- a/lasso/xml/disco_resource_offering.c
+++ b/lasso/xml/disco_resource_offering.c
@@ -60,11 +60,11 @@
 /*****************************************************************************/
 
 #define snippets() \
-	LassoDiscoResourceOffering *resource = \
-		LASSO_DISCO_RESOURCE_OFFERING(node); \
+	LassoDiscoResourceOffering *resource = LASSO_DISCO_RESOURCE_OFFERING(node); \
 	struct XmlSnippet snippets[] = { \
-		{ "ResourceID", SNIPPET_CONTENT, (void**)&(resource->ResourceID) },	\
-		{ "EncryptedResourceID", SNIPPET_CONTENT, (void**)&(resource->EncryptedResourceID) }, \
+		{ "ResourceID", SNIPPET_CONTENT, (void**)&(resource->ResourceID) }, \
+		{ "EncryptedResourceID", SNIPPET_CONTENT, \
+			(void**)&(resource->EncryptedResourceID) }, \
 		{ "ServiceInstance", SNIPPET_NODE, (void**)&(resource->ServiceInstance) }, \
 		{ "Options", SNIPPET_NODE, (void**)&(resource->Options) }, \
 		{ "Abstract", SNIPPET_CONTENT, (void**)&(resource->Abstract) }, \
diff --git a/lasso/xml/disco_service_instance.c b/lasso/xml/disco_service_instance.c
index 343c5cec..b5d5e487 100644
--- a/lasso/xml/disco_service_instance.c
+++ b/lasso/xml/disco_service_instance.c
@@ -44,8 +44,7 @@
 /*****************************************************************************/
 
 #define snippets() \
-	LassoDiscoServiceInstance *instance = \
-		LASSO_DISCO_SERVICE_INSTANCE(node); \
+	LassoDiscoServiceInstance *instance = LASSO_DISCO_SERVICE_INSTANCE(node); \
 	struct XmlSnippet snippets[] = { \
 		{ "ServiceType", SNIPPET_CONTENT, (void**)&(instance->ServiceType) }, \
 		{ "ProviderID",  SNIPPET_CONTENT, (void**)&(instance->ProviderID) }, \