From dda8f1ba9fb2e731e2dd6aa325ed07add7905ec3 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@src.gnome.org>
Date: Thu, 26 Sep 2002 09:47:36 +0000
Subject: [PATCH] make sure ATTRIBUTE_UNUSED is always put after the attribute
 declaration,

* xinclude.c xmlschemas.c xmlschemastypes.c xpath.c: make sure
  ATTRIBUTE_UNUSED is always put after the attribute declaration,
  not before
Daniel
---
 ChangeLog         |  6 ++++++
 xinclude.c        |  2 +-
 xmlschemas.c      | 16 ++++++++--------
 xmlschemastypes.c |  6 +++---
 xpath.c           |  4 ++--
 5 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 199b1b99..f7f9ef59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Sep 26 11:45:42 CEST 2002 Daniel Veillard <daniel@veillard.com>
+
+	* xinclude.c xmlschemas.c xmlschemastypes.c xpath.c: make sure
+	  ATTRIBUTE_UNUSED is always put after the attribute declaration,
+	  not before
+
 Thu Sep 26 11:33:28 CEST 2002 Daniel Veillard <daniel@veillard.com>
 
 	* python/generator.py python/libxml2class.txt: fixed a stupid error
diff --git a/xinclude.c b/xinclude.c
index 74212937..b039ff5c 100644
--- a/xinclude.c
+++ b/xinclude.c
@@ -370,7 +370,7 @@ xmlXIncludeAddNode(xmlXIncludeCtxtPtr ctxt, xmlNodePtr cur) {
  */
 static void
 xmlXIncludeRecurseDoc(xmlXIncludeCtxtPtr ctxt, xmlDocPtr doc,
-	              ATTRIBUTE_UNUSED const xmlURL url) {
+	              const xmlURL url ATTRIBUTE_UNUSED) {
     xmlXIncludeCtxtPtr newctxt;
     int i;
 
diff --git a/xmlschemas.c b/xmlschemas.c
index 40bb57e7..5203ad7d 100644
--- a/xmlschemas.c
+++ b/xmlschemas.c
@@ -491,9 +491,9 @@ xmlSchemaErrorContext(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema,
  */
 static void
 xmlSchemaElementDump(xmlSchemaElementPtr elem, FILE * output,
-		     ATTRIBUTE_UNUSED const xmlChar *name,
-		     ATTRIBUTE_UNUSED const xmlChar *context,
-		     ATTRIBUTE_UNUSED const xmlChar *namespace)
+		     const xmlChar *name ATTRIBUTE_UNUSED,
+		     const xmlChar *context ATTRIBUTE_UNUSED,
+		     const xmlChar *namespace ATTRIBUTE_UNUSED)
 {
     if (elem == NULL)
         return;
@@ -3292,8 +3292,8 @@ static void
 xmlSchemaRefFixupCallback(xmlSchemaElementPtr elem,
 		     xmlSchemaParserCtxtPtr ctxt,
 		     const xmlChar *name,
-		     ATTRIBUTE_UNUSED const xmlChar *context,
-		     ATTRIBUTE_UNUSED const xmlChar *namespace)
+		     const xmlChar *context ATTRIBUTE_UNUSED,
+		     const xmlChar *namespace ATTRIBUTE_UNUSED)
 {
     if ((ctxt == NULL) || (elem == NULL))
 	return;
@@ -4170,7 +4170,7 @@ xmlSchemaCheckAttributes(xmlSchemaValidCtxtPtr ctxt, xmlNodePtr node) {
  */
 static int
 xmlSchemaValidateSimpleContent(xmlSchemaValidCtxtPtr ctxt,
-	                       ATTRIBUTE_UNUSED xmlNodePtr node) {
+	                       xmlNodePtr node ATTRIBUTE_UNUSED) {
     xmlNodePtr child;
     xmlSchemaTypePtr type, base;
     xmlChar *value;
@@ -4253,7 +4253,7 @@ xmlSchemaValidateCheckNodeList(xmlNodePtr nodelist) {
  *     number otherwise and -1 in case of internal or API error.
  */
 static xmlNodePtr
-xmlSchemaSkipIgnored(ATTRIBUTE_UNUSED xmlSchemaValidCtxtPtr ctxt,
+xmlSchemaSkipIgnored(xmlSchemaValidCtxtPtr ctxt ATTRIBUTE_UNUSED,
 	             xmlSchemaTypePtr type,
 	             xmlNodePtr node) {
     int mixed = 0;
@@ -4284,7 +4284,7 @@ xmlSchemaSkipIgnored(ATTRIBUTE_UNUSED xmlSchemaValidCtxtPtr ctxt,
  */
 static void
 xmlSchemaValidateCallback(xmlSchemaValidCtxtPtr ctxt,
-	                  ATTRIBUTE_UNUSED const xmlChar *name,
+	                  const xmlChar *name ATTRIBUTE_UNUSED,
 			  xmlSchemaTypePtr type,
 			  xmlNodePtr node) {
     xmlSchemaTypePtr oldtype = ctxt->type;
diff --git a/xmlschemastypes.c b/xmlschemastypes.c
index 90814eee..976b89f7 100644
--- a/xmlschemastypes.c
+++ b/xmlschemastypes.c
@@ -668,7 +668,7 @@ _xmlSchemaParseTimeZone (xmlSchemaValDatePtr dt, const xmlChar **str) {
  *         and -1 in case of internal or API error.
  */
 static int
-xmlSchemaValidateDates (ATTRIBUTE_UNUSED xmlSchemaTypePtr type,
+xmlSchemaValidateDates (xmlSchemaTypePtr type ATTRIBUTE_UNUSED,
 	                const xmlChar *dateTime, xmlSchemaValPtr *val) {
     xmlSchemaValPtr dt;
     int ret;
@@ -827,7 +827,7 @@ error:
  *         and -1 in case of internal or API error.
  */
 static int
-xmlSchemaValidateDuration (ATTRIBUTE_UNUSED xmlSchemaTypePtr type,
+xmlSchemaValidateDuration (xmlSchemaTypePtr type ATTRIBUTE_UNUSED,
 	                   const xmlChar *duration, xmlSchemaValPtr *val) {
     const xmlChar  *cur = duration;
     xmlSchemaValPtr dur;
@@ -1792,7 +1792,7 @@ xmlSchemaCompareValues(xmlSchemaValPtr x, xmlSchemaValPtr y) {
  *     number otherwise and -1 in case of internal or API error.
  */
 int
-xmlSchemaValidateFacet(ATTRIBUTE_UNUSED xmlSchemaTypePtr base,
+xmlSchemaValidateFacet(xmlSchemaTypePtr base ATTRIBUTE_UNUSED,
 	               xmlSchemaFacetPtr facet,
 	               const xmlChar *value, xmlSchemaValPtr val)
 {
diff --git a/xpath.c b/xpath.c
index 9aa8a3a5..e754d6f5 100644
--- a/xpath.c
+++ b/xpath.c
@@ -1284,8 +1284,8 @@ static const char *xmlXPathErrorMessages[] = {
  * Formats an error message.
  */
 void
-xmlXPatherror(xmlXPathParserContextPtr ctxt, ATTRIBUTE_UNUSED const char *file,
-              ATTRIBUTE_UNUSED int line, int no) {
+xmlXPatherror(xmlXPathParserContextPtr ctxt, const char *file ATTRIBUTE_UNUSED,
+              int line ATTRIBUTE_UNUSED, int no) {
     int n;
     const xmlChar *cur;
     const xmlChar *base;