Restoring authorship annotation for <orivej@yandex-team.ru>. Commit 1 of 2.

1 files changed, 33 insertions, 33 deletions

diff --git a/contrib/libs/libxml/catalog.c b/contrib/libs/libxml/catalog.c
index 7328fd319c..b6d63245c1 100644
--- a/contrib/libs/libxml/catalog.c
+++ b/contrib/libs/libxml/catalog.c
@@ -47,16 +47,16 @@
 #define MAX_CATAL_DEPTH	50
 
 #ifdef _WIN32
-# define PATH_SEPARATOR ';'
+# define PATH_SEPARATOR ';' 
 #else
-# define PATH_SEPARATOR ':'
+# define PATH_SEPARATOR ':' 
 #endif
 
 /**
  * TODO:
  *
  * macro to flag unimplemented blocks
- * XML_CATALOG_PREFER user env to select between system/public preferred
+ * XML_CATALOG_PREFER user env to select between system/public preferred 
  * option. C.f. Richard Tobin <richard@cogsci.ed.ac.uk>
  *> Just FYI, I am using an environment variable XML_CATALOG_PREFER with
  *> values "system" and "public".  I have made the default be "system" to
@@ -238,7 +238,7 @@ xmlCatalogErrMemory(const char *extra)
  *
  * Handle a catalog error
  */
-static void LIBXML_ATTR_FORMAT(4,0)
+static void LIBXML_ATTR_FORMAT(4,0) 
 xmlCatalogErr(xmlCatalogEntryPtr catal, xmlNodePtr node, int error,
                const char *msg, const xmlChar *str1, const xmlChar *str2,
 	       const xmlChar *str3)
@@ -319,13 +319,13 @@ xmlFreeCatalogEntryList(xmlCatalogEntryPtr ret);
 
 /**
  * xmlFreeCatalogEntry:
- * @payload:  a Catalog entry
+ * @payload:  a Catalog entry 
  *
  * Free the memory allocated to a Catalog entry
  */
 static void
-xmlFreeCatalogEntry(void *payload, const xmlChar *name ATTRIBUTE_UNUSED) {
-    xmlCatalogEntryPtr ret = (xmlCatalogEntryPtr) payload;
+xmlFreeCatalogEntry(void *payload, const xmlChar *name ATTRIBUTE_UNUSED) { 
+    xmlCatalogEntryPtr ret = (xmlCatalogEntryPtr) payload; 
     if (ret == NULL)
 	return;
     /*
@@ -368,22 +368,22 @@ xmlFreeCatalogEntryList(xmlCatalogEntryPtr ret) {
 
     while (ret != NULL) {
 	next = ret->next;
-	xmlFreeCatalogEntry(ret, NULL);
+	xmlFreeCatalogEntry(ret, NULL); 
 	ret = next;
     }
 }
 
 /**
  * xmlFreeCatalogHashEntryList:
- * @payload:  a Catalog entry list
+ * @payload:  a Catalog entry list 
  *
  * Free the memory allocated to list of Catalog entries from the
  * catalog file hash.
  */
 static void
-xmlFreeCatalogHashEntryList(void *payload,
-                            const xmlChar *name ATTRIBUTE_UNUSED) {
-    xmlCatalogEntryPtr catal = (xmlCatalogEntryPtr) payload;
+xmlFreeCatalogHashEntryList(void *payload, 
+                            const xmlChar *name ATTRIBUTE_UNUSED) { 
+    xmlCatalogEntryPtr catal = (xmlCatalogEntryPtr) payload; 
     xmlCatalogEntryPtr children, next;
 
     if (catal == NULL)
@@ -394,11 +394,11 @@ xmlFreeCatalogHashEntryList(void *payload,
 	next = children->next;
 	children->dealloc = 0;
 	children->children = NULL;
-	xmlFreeCatalogEntry(children, NULL);
+	xmlFreeCatalogEntry(children, NULL); 
 	children = next;
     }
     catal->dealloc = 0;
-    xmlFreeCatalogEntry(catal, NULL);
+    xmlFreeCatalogEntry(catal, NULL); 
 }
 
 /**
@@ -443,7 +443,7 @@ xmlFreeCatalog(xmlCatalogPtr catal) {
     if (catal->xml != NULL)
 	xmlFreeCatalogEntryList(catal->xml);
     if (catal->sgml != NULL)
-	xmlHashFree(catal->sgml, xmlFreeCatalogEntry);
+	xmlHashFree(catal->sgml, xmlFreeCatalogEntry); 
     xmlFree(catal);
 }
 
@@ -462,10 +462,10 @@ xmlFreeCatalog(xmlCatalogPtr catal) {
  * Serialize an SGML Catalog entry
  */
 static void
-xmlCatalogDumpEntry(void *payload, void *data,
-                    const xmlChar *name ATTRIBUTE_UNUSED) {
-    xmlCatalogEntryPtr entry = (xmlCatalogEntryPtr) payload;
-    FILE *out = (FILE *) data;
+xmlCatalogDumpEntry(void *payload, void *data, 
+                    const xmlChar *name ATTRIBUTE_UNUSED) { 
+    xmlCatalogEntryPtr entry = (xmlCatalogEntryPtr) payload; 
+    FILE *out = (FILE *) data; 
     if ((entry == NULL) || (out == NULL))
 	return;
     switch (entry->type) {
@@ -728,10 +728,10 @@ BAD_CAST "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd");
  * Convert one entry from the catalog
  */
 static void
-xmlCatalogConvertEntry(void *payload, void *data,
-                       const xmlChar *name ATTRIBUTE_UNUSED) {
-    xmlCatalogEntryPtr entry = (xmlCatalogEntryPtr) payload;
-    xmlCatalogPtr catal = (xmlCatalogPtr) data;
+xmlCatalogConvertEntry(void *payload, void *data, 
+                       const xmlChar *name ATTRIBUTE_UNUSED) { 
+    xmlCatalogEntryPtr entry = (xmlCatalogEntryPtr) payload; 
+    xmlCatalogPtr catal = (xmlCatalogPtr) data; 
     if ((entry == NULL) || (catal == NULL) || (catal->sgml == NULL) ||
 	(catal->xml == NULL))
 	return;
@@ -764,7 +764,7 @@ xmlCatalogConvertEntry(void *payload, void *data,
 	    entry->type = XML_CATA_CATALOG;
 	    break;
 	default:
-	    xmlHashRemoveEntry(catal->sgml, entry->name, xmlFreeCatalogEntry);
+	    xmlHashRemoveEntry(catal->sgml, entry->name, xmlFreeCatalogEntry); 
 	    return;
     }
     /*
@@ -804,7 +804,7 @@ xmlConvertSGMLCatalog(xmlCatalogPtr catal) {
 	xmlGenericError(xmlGenericErrorContext,
 		"Converting SGML catalog to XML\n");
     }
-    xmlHashScan(catal->sgml, xmlCatalogConvertEntry, &catal);
+    xmlHashScan(catal->sgml, xmlCatalogConvertEntry, &catal); 
     return(0);
 }
 
@@ -2401,7 +2401,7 @@ xmlParseSGMLCatalog(xmlCatalogPtr catal, const xmlChar *value,
 		case SGML_CATA_ENTITY:
 		    if (*cur == '%')
 			type = SGML_CATA_PENTITY;
-                    /* Falls through. */
+                    /* Falls through. */ 
 		case SGML_CATA_PENTITY:
 		case SGML_CATA_DOCTYPE:
 		case SGML_CATA_LINKTYPE:
@@ -2491,7 +2491,7 @@ xmlParseSGMLCatalog(xmlCatalogPtr catal, const xmlChar *value,
 			                       NULL, XML_CATA_PREFER_NONE, NULL);
 		    res = xmlHashAddEntry(catal->sgml, name, entry);
 		    if (res < 0) {
-			xmlFreeCatalogEntry(entry, NULL);
+			xmlFreeCatalogEntry(entry, NULL); 
 		    }
 		    xmlFree(filename);
 		}
@@ -2504,7 +2504,7 @@ xmlParseSGMLCatalog(xmlCatalogPtr catal, const xmlChar *value,
 			                       XML_CATA_PREFER_NONE, NULL);
 		    res = xmlHashAddEntry(catal->sgml, sysid, entry);
 		    if (res < 0) {
-			xmlFreeCatalogEntry(entry, NULL);
+			xmlFreeCatalogEntry(entry, NULL); 
 		    }
 		} else {
 		    xmlChar *filename;
@@ -2942,7 +2942,7 @@ xmlACatalogDump(xmlCatalogPtr catal, FILE *out) {
     if (catal->type == XML_XML_CATALOG_TYPE) {
 	xmlDumpXMLCatalog(out, catal->xml);
     } else {
-	xmlHashScan(catal->sgml, xmlCatalogDumpEntry, out);
+	xmlHashScan(catal->sgml, xmlCatalogDumpEntry, out); 
     }
 }
 #endif /* LIBXML_OUTPUT_ENABLED */
@@ -3006,7 +3006,7 @@ xmlACatalogRemove(xmlCatalogPtr catal, const xmlChar *value) {
     if (catal->type == XML_XML_CATALOG_TYPE) {
 	res = xmlDelXMLCatalog(catal->xml, value);
     } else {
-	res = xmlHashRemoveEntry(catal->sgml, value, xmlFreeCatalogEntry);
+	res = xmlHashRemoveEntry(catal->sgml, value, xmlFreeCatalogEntry); 
 	if (res == 0)
 	    res = 1;
     }
@@ -3251,7 +3251,7 @@ xmlLoadCatalogs(const char *pathss) {
 	while (xmlIsBlank_ch(*cur)) cur++;
 	if (*cur != 0) {
 	    paths = cur;
-	    while ((*cur != 0) && (*cur != PATH_SEPARATOR) && (!xmlIsBlank_ch(*cur)))
+	    while ((*cur != 0) && (*cur != PATH_SEPARATOR) && (!xmlIsBlank_ch(*cur))) 
 		cur++;
 	    path = xmlStrndup((const xmlChar *)paths, cur - paths);
 #ifdef _WIN32
@@ -3267,7 +3267,7 @@ xmlLoadCatalogs(const char *pathss) {
 		xmlFree(path);
 	    }
 	}
-	while (*cur == PATH_SEPARATOR)
+	while (*cur == PATH_SEPARATOR) 
 	    cur++;
     }
 }
@@ -3287,7 +3287,7 @@ xmlCatalogCleanup(void) {
 	xmlGenericError(xmlGenericErrorContext,
 		"Catalogs cleanup\n");
     if (xmlCatalogXMLFiles != NULL)
-	xmlHashFree(xmlCatalogXMLFiles, xmlFreeCatalogHashEntryList);
+	xmlHashFree(xmlCatalogXMLFiles, xmlFreeCatalogHashEntryList); 
     xmlCatalogXMLFiles = NULL;
     if (xmlDefaultCatalog != NULL)
 	xmlFreeCatalog(xmlDefaultCatalog);