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

22 files changed, 140 insertions, 140 deletions

diff --git a/contrib/libs/libxml/include/libxml/HTMLparser.h b/contrib/libs/libxml/include/libxml/HTMLparser.h
index c4baf6519e..a7554420db 100644
--- a/contrib/libs/libxml/include/libxml/HTMLparser.h
+++ b/contrib/libs/libxml/include/libxml/HTMLparser.h
@@ -115,12 +115,12 @@ XMLPUBFUN htmlParserCtxtPtr XMLCALL
 XMLPUBFUN int XMLCALL
 			htmlParseDocument(htmlParserCtxtPtr ctxt);
 XMLPUBFUN htmlDocPtr XMLCALL
-			htmlSAXParseDoc	(const xmlChar *cur,
+			htmlSAXParseDoc	(const xmlChar *cur, 
 					 const char *encoding,
 					 htmlSAXHandlerPtr sax,
 					 void *userData);
 XMLPUBFUN htmlDocPtr XMLCALL
-			htmlParseDoc	(const xmlChar *cur,
+			htmlParseDoc	(const xmlChar *cur, 
 					 const char *encoding);
 XMLPUBFUN htmlDocPtr XMLCALL
 			htmlSAXParseFile(const char *filename,
diff --git a/contrib/libs/libxml/include/libxml/c14n.h b/contrib/libs/libxml/include/libxml/c14n.h
index 1237d6c366..4b961be8de 100644
--- a/contrib/libs/libxml/include/libxml/c14n.h
+++ b/contrib/libs/libxml/include/libxml/c14n.h
@@ -28,17 +28,17 @@ extern "C" {
 #include "xpath.h"
 
 /*
- * XML Canonicalization
+ * XML Canonicalization 
  * http://www.w3.org/TR/xml-c14n
  *
- * Exclusive XML Canonicalization
+ * Exclusive XML Canonicalization 
  * http://www.w3.org/TR/xml-exc-c14n
  *
  * Canonical form of an XML document could be created if and only if
  *  a) default attributes (if any) are added to all nodes
  *  b) all character and parsed entity references are resolved
- * In order to achieve this in libxml2 the document MUST be loaded with
- * following global settings:
+ * In order to achieve this in libxml2 the document MUST be loaded with 
+ * following global settings: 
  *
  *    xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS;
  *    xmlSubstituteEntitiesDefault(1);
@@ -59,7 +59,7 @@ extern "C" {
  *
  */
 typedef enum {
-    XML_C14N_1_0            = 0,    /* Original C14N 1.0 spec */
+    XML_C14N_1_0            = 0,    /* Original C14N 1.0 spec */ 
     XML_C14N_EXCLUSIVE_1_0  = 1,    /* Exclusive C14N 1.0 spec */
     XML_C14N_1_1            = 2     /* C14N 1.1 spec */
 } xmlC14NMode;
@@ -96,7 +96,7 @@ XMLPUBFUN int XMLCALL
 /**
  * xmlC14NIsVisibleCallback:
  * @user_data: user data
- * @node: the current node
+ * @node: the current node 
  * @parent: the parent node
  *
  * Signature for a C14N callback on visible nodes
diff --git a/contrib/libs/libxml/include/libxml/catalog.h b/contrib/libs/libxml/include/libxml/catalog.h
index 88cce3b855..04aaf8f332 100644
--- a/contrib/libs/libxml/include/libxml/catalog.h
+++ b/contrib/libs/libxml/include/libxml/catalog.h
@@ -39,7 +39,7 @@ extern "C" {
 /**
  * XML_CATALOG_PI:
  *
- * The specific XML Catalog Processing Instruction name.
+ * The specific XML Catalog Processing Instruction name. 
  */
 #define XML_CATALOG_PI						\
     (const xmlChar *) "oasis-xml-catalog"
diff --git a/contrib/libs/libxml/include/libxml/dict.h b/contrib/libs/libxml/include/libxml/dict.h
index 4b0686b4ff..4ba8fe2727 100644
--- a/contrib/libs/libxml/include/libxml/dict.h
+++ b/contrib/libs/libxml/include/libxml/dict.h
@@ -1,5 +1,5 @@
 /*
- * Summary: string dictionary
+ * Summary: string dictionary 
  * Description: dictionary of reusable strings, just used to avoid allocation
  *         and freeing operations.
  *
@@ -11,7 +11,7 @@
 #ifndef __XML_DICT_H__
 #define __XML_DICT_H__
 
-#include <stddef.h>
+#include <stddef.h> 
 #include "xmlversion.h"
 
 #ifdef __cplusplus
@@ -19,7 +19,7 @@ extern "C" {
 #endif
 
 /*
- * The dictionary.
+ * The dictionary. 
  */
 typedef struct _xmlDict xmlDict;
 typedef xmlDict *xmlDictPtr;
@@ -47,7 +47,7 @@ XMLPUBFUN void XMLCALL
 			xmlDictFree	(xmlDictPtr dict);
 
 /*
- * Lookup of entry in the dictionary.
+ * Lookup of entry in the dictionary. 
  */
 XMLPUBFUN const xmlChar * XMLCALL
 			xmlDictLookup	(xmlDictPtr dict,
diff --git a/contrib/libs/libxml/include/libxml/encoding.h b/contrib/libs/libxml/include/libxml/encoding.h
index e3582bf149..52865c6067 100644
--- a/contrib/libs/libxml/include/libxml/encoding.h
+++ b/contrib/libs/libxml/include/libxml/encoding.h
@@ -129,14 +129,14 @@ typedef int (* xmlCharEncodingOutputFunc)(unsigned char *out, int *outlen,
  * If iconv is supported, there are two extra fields.
  */
 #ifdef LIBXML_ICU_ENABLED
-/* Size of pivot buffer, same as icu/source/common/ucnv.cpp CHUNK_SIZE */
-#define ICU_PIVOT_BUF_SIZE 1024
+/* Size of pivot buffer, same as icu/source/common/ucnv.cpp CHUNK_SIZE */ 
+#define ICU_PIVOT_BUF_SIZE 1024 
 struct _uconv_t {
   UConverter *uconv; /* for conversion between an encoding and UTF-16 */
   UConverter *utf8; /* for conversion between UTF-8 and UTF-16 */
-  UChar      pivot_buf[ICU_PIVOT_BUF_SIZE];
-  UChar      *pivot_source;
-  UChar      *pivot_target;
+  UChar      pivot_buf[ICU_PIVOT_BUF_SIZE]; 
+  UChar      *pivot_source; 
+  UChar      *pivot_target; 
 };
 typedef struct _uconv_t uconv_t;
 #endif
diff --git a/contrib/libs/libxml/include/libxml/hash.h b/contrib/libs/libxml/include/libxml/hash.h
index 2b0701c4b4..15fdb39b28 100644
--- a/contrib/libs/libxml/include/libxml/hash.h
+++ b/contrib/libs/libxml/include/libxml/hash.h
@@ -66,7 +66,7 @@ extern "C" {
  *
  * Callback to free data from a hash.
  */
-typedef void (*xmlHashDeallocator)(void *payload, const xmlChar *name);
+typedef void (*xmlHashDeallocator)(void *payload, const xmlChar *name); 
 /**
  * xmlHashCopier:
  * @payload:  the data in the hash
@@ -76,20 +76,20 @@ typedef void (*xmlHashDeallocator)(void *payload, const xmlChar *name);
  *
  * Returns a copy of the data or NULL in case of error.
  */
-typedef void *(*xmlHashCopier)(void *payload, const xmlChar *name);
+typedef void *(*xmlHashCopier)(void *payload, const xmlChar *name); 
 /**
  * xmlHashScanner:
  * @payload:  the data in the hash
- * @data:  extra scanner data
+ * @data:  extra scanner data 
  * @name:  the name associated
  *
  * Callback when scanning data in a hash with the simple scanner.
  */
-typedef void (*xmlHashScanner)(void *payload, void *data, const xmlChar *name);
+typedef void (*xmlHashScanner)(void *payload, void *data, const xmlChar *name); 
 /**
  * xmlHashScannerFull:
  * @payload:  the data in the hash
- * @data:  extra scanner data
+ * @data:  extra scanner data 
  * @name:  the name associated
  * @name2:  the second name associated
  * @name3:  the third name associated
@@ -111,9 +111,9 @@ XMLPUBFUN xmlHashTablePtr XMLCALL
 XMLPUBFUN void XMLCALL
 			xmlHashFree	(xmlHashTablePtr table,
 					 xmlHashDeallocator f);
-XMLPUBFUN void XMLCALL
-			xmlHashDefaultDeallocator(void *entry,
-					 const xmlChar *name);
+XMLPUBFUN void XMLCALL 
+			xmlHashDefaultDeallocator(void *entry, 
+					 const xmlChar *name); 
 
 /*
  * Add a new entry to the hash table.
diff --git a/contrib/libs/libxml/include/libxml/list.h b/contrib/libs/libxml/include/libxml/list.h
index 526b9e718f..02438fe595 100644
--- a/contrib/libs/libxml/include/libxml/list.h
+++ b/contrib/libs/libxml/include/libxml/list.h
@@ -49,7 +49,7 @@ typedef int  (*xmlListDataCompare) (const void *data0, const void *data1);
  *
  * Returns 0 to stop walking the list, 1 otherwise.
  */
-typedef int (*xmlListWalker) (const void *data, void *user);
+typedef int (*xmlListWalker) (const void *data, void *user); 
 
 /* Creation/Deletion */
 XMLPUBFUN xmlListPtr XMLCALL
@@ -110,11 +110,11 @@ XMLPUBFUN void XMLCALL
 XMLPUBFUN void XMLCALL
 		xmlListWalk		(xmlListPtr l,
 					 xmlListWalker walker,
-					 void *user);
+					 void *user); 
 XMLPUBFUN void XMLCALL
 		xmlListReverseWalk	(xmlListPtr l,
 					 xmlListWalker walker,
-					 void *user);
+					 void *user); 
 XMLPUBFUN void XMLCALL
 		xmlListMerge		(xmlListPtr l1,
 					 xmlListPtr l2);
diff --git a/contrib/libs/libxml/include/libxml/nanoftp.h b/contrib/libs/libxml/include/libxml/nanoftp.h
index 4af658de2e..c7b17aa874 100644
--- a/contrib/libs/libxml/include/libxml/nanoftp.h
+++ b/contrib/libs/libxml/include/libxml/nanoftp.h
@@ -16,7 +16,7 @@
 #ifdef LIBXML_FTP_ENABLED
 
 /* Needed for portability to Windows 64 bits */
-#if defined(_WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__) 
 #include <winsock2.h>
 #else
 /**
diff --git a/contrib/libs/libxml/include/libxml/parser.h b/contrib/libs/libxml/include/libxml/parser.h
index a4e97caee8..a18e5bbb7c 100644
--- a/contrib/libs/libxml/include/libxml/parser.h
+++ b/contrib/libs/libxml/include/libxml/parser.h
@@ -260,7 +260,7 @@ struct _xmlParserCtxt {
     void              *catalogs;      /* document's own catalog */
     int                recovery;      /* run in recovery mode */
     int                progressive;   /* is this a progressive parsing */
-    xmlDictPtr         dict;          /* dictionary for the parser */
+    xmlDictPtr         dict;          /* dictionary for the parser */ 
     const xmlChar *   *atts;          /* array for the attributes callbacks */
     int                maxatts;       /* the size of the array */
     int                docdict;       /* use strings from dict to build tree */
@@ -283,11 +283,11 @@ struct _xmlParserCtxt {
     void *            *pushTab;       /* array of data for push */
     xmlHashTablePtr    attsDefault;   /* defaulted attributes if any */
     xmlHashTablePtr    attsSpecial;   /* non-CDATA attributes if any */
-    int                nsWellFormed;  /* is the document XML Namespace okay */
+    int                nsWellFormed;  /* is the document XML Namespace okay */ 
     int                options;       /* Extra options */
 
     /*
-     * Those fields are needed only for streaming parsing so far
+     * Those fields are needed only for streaming parsing so far 
      */
     int               dictNames;    /* Use dictionary names for the tree */
     int               freeElemsNr;  /* number of freed element nodes */
@@ -1097,9 +1097,9 @@ typedef enum {
     XML_PARSE_PEDANTIC	= 1<<7,	/* pedantic error reporting */
     XML_PARSE_NOBLANKS	= 1<<8,	/* remove blank nodes */
     XML_PARSE_SAX1	= 1<<9,	/* use the SAX1 interface internally */
-    XML_PARSE_XINCLUDE	= 1<<10,/* Implement XInclude substitution  */
+    XML_PARSE_XINCLUDE	= 1<<10,/* Implement XInclude substitution  */ 
     XML_PARSE_NONET	= 1<<11,/* Forbid network access */
-    XML_PARSE_NODICT	= 1<<12,/* Do not reuse the context dictionary */
+    XML_PARSE_NODICT	= 1<<12,/* Do not reuse the context dictionary */ 
     XML_PARSE_NSCLEAN	= 1<<13,/* remove redundant namespaces declarations */
     XML_PARSE_NOCDATA	= 1<<14,/* merge CDATA as text nodes */
     XML_PARSE_NOXINCNODE= 1<<15,/* do not generate XINCLUDE START/END nodes */
@@ -1191,7 +1191,7 @@ XMLPUBFUN xmlDocPtr XMLCALL
 /**
  * xmlFeature:
  *
- * Used to examine the existence of features that can be enabled
+ * Used to examine the existence of features that can be enabled 
  * or disabled at compile-time.
  * They used to be called XML_FEATURE_xxx but this clashed with Expat
  */
diff --git a/contrib/libs/libxml/include/libxml/parserInternals.h b/contrib/libs/libxml/include/libxml/parserInternals.h
index 31d0e4c6b8..989a8d819a 100644
--- a/contrib/libs/libxml/include/libxml/parserInternals.h
+++ b/contrib/libs/libxml/include/libxml/parserInternals.h
@@ -43,7 +43,7 @@ XMLPUBVAR unsigned int xmlParserMaxDepth;
 /**
  * XML_MAX_NAME_LENGTH:
  *
- * Maximum size allowed for a markup identifier.
+ * Maximum size allowed for a markup identifier. 
  * This is not a limitation of the parser but a safety boundary feature,
  * use XML_PARSE_HUGE option to override it.
  * Note that with the use of parsing dictionaries overriding the limit
@@ -351,7 +351,7 @@ XMLPUBFUN void XMLCALL
 						 xmlParserErrors xmlerr,
 						 const char *msg,
 						 const xmlChar * str1,
-						 const xmlChar * str2) LIBXML_ATTR_FORMAT(3,0);
+						 const xmlChar * str2) LIBXML_ATTR_FORMAT(3,0); 
 #endif
 
 /**
diff --git a/contrib/libs/libxml/include/libxml/schemasInternals.h b/contrib/libs/libxml/include/libxml/schemasInternals.h
index 32d649381e..8c1638cbf8 100644
--- a/contrib/libs/libxml/include/libxml/schemasInternals.h
+++ b/contrib/libs/libxml/include/libxml/schemasInternals.h
@@ -3,7 +3,7 @@
  * Description: internal interfaces for the XML Schemas handling
  *              and schema validity checking
  *		The Schemas development is a Work In Progress.
- *              Some of those interfaces are not guaranteed to be API or ABI stable !
+ *              Some of those interfaces are not guaranteed to be API or ABI stable ! 
  *
  * Copy: See Copyright for the status of this software.
  *
@@ -28,52 +28,52 @@ extern "C" {
 
 typedef enum {
     XML_SCHEMAS_UNKNOWN = 0,
-    XML_SCHEMAS_STRING = 1,
-    XML_SCHEMAS_NORMSTRING = 2,
-    XML_SCHEMAS_DECIMAL = 3,
-    XML_SCHEMAS_TIME = 4,
-    XML_SCHEMAS_GDAY = 5,
-    XML_SCHEMAS_GMONTH = 6,
-    XML_SCHEMAS_GMONTHDAY = 7,
-    XML_SCHEMAS_GYEAR = 8,
-    XML_SCHEMAS_GYEARMONTH = 9,
-    XML_SCHEMAS_DATE = 10,
-    XML_SCHEMAS_DATETIME = 11,
-    XML_SCHEMAS_DURATION = 12,
-    XML_SCHEMAS_FLOAT = 13,
-    XML_SCHEMAS_DOUBLE = 14,
-    XML_SCHEMAS_BOOLEAN = 15,
-    XML_SCHEMAS_TOKEN = 16,
-    XML_SCHEMAS_LANGUAGE = 17,
-    XML_SCHEMAS_NMTOKEN = 18,
-    XML_SCHEMAS_NMTOKENS = 19,
-    XML_SCHEMAS_NAME = 20,
-    XML_SCHEMAS_QNAME = 21,
-    XML_SCHEMAS_NCNAME = 22,
-    XML_SCHEMAS_ID = 23,
-    XML_SCHEMAS_IDREF = 24,
-    XML_SCHEMAS_IDREFS = 25,
-    XML_SCHEMAS_ENTITY = 26,
-    XML_SCHEMAS_ENTITIES = 27,
-    XML_SCHEMAS_NOTATION = 28,
-    XML_SCHEMAS_ANYURI = 29,
-    XML_SCHEMAS_INTEGER = 30,
-    XML_SCHEMAS_NPINTEGER = 31,
-    XML_SCHEMAS_NINTEGER = 32,
-    XML_SCHEMAS_NNINTEGER = 33,
-    XML_SCHEMAS_PINTEGER = 34,
-    XML_SCHEMAS_INT = 35,
-    XML_SCHEMAS_UINT = 36,
-    XML_SCHEMAS_LONG = 37,
-    XML_SCHEMAS_ULONG = 38,
-    XML_SCHEMAS_SHORT = 39,
-    XML_SCHEMAS_USHORT = 40,
-    XML_SCHEMAS_BYTE = 41,
-    XML_SCHEMAS_UBYTE = 42,
-    XML_SCHEMAS_HEXBINARY = 43,
-    XML_SCHEMAS_BASE64BINARY = 44,
-    XML_SCHEMAS_ANYTYPE = 45,
-    XML_SCHEMAS_ANYSIMPLETYPE = 46
+    XML_SCHEMAS_STRING = 1, 
+    XML_SCHEMAS_NORMSTRING = 2, 
+    XML_SCHEMAS_DECIMAL = 3, 
+    XML_SCHEMAS_TIME = 4, 
+    XML_SCHEMAS_GDAY = 5, 
+    XML_SCHEMAS_GMONTH = 6, 
+    XML_SCHEMAS_GMONTHDAY = 7, 
+    XML_SCHEMAS_GYEAR = 8, 
+    XML_SCHEMAS_GYEARMONTH = 9, 
+    XML_SCHEMAS_DATE = 10, 
+    XML_SCHEMAS_DATETIME = 11, 
+    XML_SCHEMAS_DURATION = 12, 
+    XML_SCHEMAS_FLOAT = 13, 
+    XML_SCHEMAS_DOUBLE = 14, 
+    XML_SCHEMAS_BOOLEAN = 15, 
+    XML_SCHEMAS_TOKEN = 16, 
+    XML_SCHEMAS_LANGUAGE = 17, 
+    XML_SCHEMAS_NMTOKEN = 18, 
+    XML_SCHEMAS_NMTOKENS = 19, 
+    XML_SCHEMAS_NAME = 20, 
+    XML_SCHEMAS_QNAME = 21, 
+    XML_SCHEMAS_NCNAME = 22, 
+    XML_SCHEMAS_ID = 23, 
+    XML_SCHEMAS_IDREF = 24, 
+    XML_SCHEMAS_IDREFS = 25, 
+    XML_SCHEMAS_ENTITY = 26, 
+    XML_SCHEMAS_ENTITIES = 27, 
+    XML_SCHEMAS_NOTATION = 28, 
+    XML_SCHEMAS_ANYURI = 29, 
+    XML_SCHEMAS_INTEGER = 30, 
+    XML_SCHEMAS_NPINTEGER = 31, 
+    XML_SCHEMAS_NINTEGER = 32, 
+    XML_SCHEMAS_NNINTEGER = 33, 
+    XML_SCHEMAS_PINTEGER = 34, 
+    XML_SCHEMAS_INT = 35, 
+    XML_SCHEMAS_UINT = 36, 
+    XML_SCHEMAS_LONG = 37, 
+    XML_SCHEMAS_ULONG = 38, 
+    XML_SCHEMAS_SHORT = 39, 
+    XML_SCHEMAS_USHORT = 40, 
+    XML_SCHEMAS_BYTE = 41, 
+    XML_SCHEMAS_UBYTE = 42, 
+    XML_SCHEMAS_HEXBINARY = 43, 
+    XML_SCHEMAS_BASE64BINARY = 44, 
+    XML_SCHEMAS_ANYTYPE = 45, 
+    XML_SCHEMAS_ANYSIMPLETYPE = 46 
 } xmlSchemaValType;
 
 /*
@@ -321,13 +321,13 @@ struct _xmlSchemaWildcard {
 /**
  * XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED:
  *
- * The attribute wildcard has been built.
+ * The attribute wildcard has been built. 
  */
 #define XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED 1 << 0
 /**
  * XML_SCHEMAS_ATTRGROUP_GLOBAL:
  *
- * The attribute group has been defined.
+ * The attribute group has been defined. 
  */
 #define XML_SCHEMAS_ATTRGROUP_GLOBAL 1 << 1
 /**
@@ -725,7 +725,7 @@ struct _xmlSchemaType {
 /**
  * XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION:
  *
- * disallowed substitutions: "substitution"
+ * disallowed substitutions: "substitution" 
  */
 #define XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION        1 << 13
 /**
@@ -789,7 +789,7 @@ struct _xmlSchemaElement {
     xmlRegexpPtr contModel; /* Obsolete for WXS, maybe used for RelaxNG */
     xmlSchemaContentType contentType;
     const xmlChar *refPrefix; /* Deprecated; not used */
-    xmlSchemaValPtr defVal; /* The compiled value constraint. */
+    xmlSchemaValPtr defVal; /* The compiled value constraint. */ 
     void *idcs; /* The identity-constraint defs */
 };
 
@@ -881,7 +881,7 @@ struct _xmlSchemaNotation {
 /**
  * XML_SCHEMAS_FINAL_DEFAULT_LIST:
  *
- * the schema has "list" in the set of finalDefault.
+ * the schema has "list" in the set of finalDefault. 
  */
 #define XML_SCHEMAS_FINAL_DEFAULT_LIST            1 << 4
 /**
@@ -942,7 +942,7 @@ struct _xmlSchema {
     xmlDictPtr      dict;
     void *includes;     /* the includes, this is opaque for now */
     int preserve;        /* whether to free the document */
-    int counter; /* used to give anonymous components unique names */
+    int counter; /* used to give anonymous components unique names */ 
     xmlHashTablePtr idcDef; /* All identity-constraint defs. */
     void *volatiles; /* Obsolete */
 };
diff --git a/contrib/libs/libxml/include/libxml/threads.h b/contrib/libs/libxml/include/libxml/threads.h
index b0a99b2b01..2ffccebf10 100644
--- a/contrib/libs/libxml/include/libxml/threads.h
+++ b/contrib/libs/libxml/include/libxml/threads.h
@@ -72,14 +72,14 @@ XMLPUBFUN void XMLCALL
 XMLPUBFUN xmlGlobalStatePtr XMLCALL
 			xmlGetGlobalState(void);
 
-#ifdef HAVE_PTHREAD_H
-#elif defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL))
-#if defined(LIBXML_STATIC_FOR_DLL)
-int XMLCALL
-xmlDllMain(void *hinstDLL, unsigned long fdwReason,
-           void *lpvReserved);
-#endif
+#ifdef HAVE_PTHREAD_H 
+#elif defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL)) 
+#if defined(LIBXML_STATIC_FOR_DLL) 
+int XMLCALL 
+xmlDllMain(void *hinstDLL, unsigned long fdwReason, 
+           void *lpvReserved); 
 #endif
+#endif 
 
 #ifdef __cplusplus
 }
diff --git a/contrib/libs/libxml/include/libxml/tree.h b/contrib/libs/libxml/include/libxml/tree.h
index f257fb6a9d..cdaa723df6 100644
--- a/contrib/libs/libxml/include/libxml/tree.h
+++ b/contrib/libs/libxml/include/libxml/tree.h
@@ -76,8 +76,8 @@ typedef enum {
     XML_BUFFER_ALLOC_EXACT,	/* grow only to the minimal size */
     XML_BUFFER_ALLOC_IMMUTABLE, /* immutable buffer */
     XML_BUFFER_ALLOC_IO,	/* special allocation scheme used for I/O */
-    XML_BUFFER_ALLOC_HYBRID,	/* exact up to a threshold, and doubleit thereafter */
-    XML_BUFFER_ALLOC_BOUNDED	/* limit the upper size of the buffer */
+    XML_BUFFER_ALLOC_HYBRID,	/* exact up to a threshold, and doubleit thereafter */ 
+    XML_BUFFER_ALLOC_BOUNDED	/* limit the upper size of the buffer */ 
 } xmlBufferAllocationScheme;
 
 /**
@@ -527,7 +527,7 @@ struct _xmlNode {
  * xmlDocProperty
  *
  * Set of properties of the document as found by the parser
- * Some of them are linked to similarly named xmlParserOption
+ * Some of them are linked to similarly named xmlParserOption 
  */
 typedef enum {
     XML_DOC_WELLFORMED		= 1<<0, /* document is XML well formed */
@@ -575,7 +575,7 @@ struct _xmlDoc {
     void           *ids;        /* Hash table for ID attributes if any */
     void           *refs;       /* Hash table for IDREFs attributes if any */
     const xmlChar  *URL;	/* The URI for that document */
-    int             charset;    /* Internal flag for charset handling,
+    int             charset;    /* Internal flag for charset handling, 
 				   actually an xmlCharEncoding */
     struct _xmlDict *dict;      /* dict used to allocate names or NULL */
     void           *psvi;	/* for type/PSVI informations */
diff --git a/contrib/libs/libxml/include/libxml/xlink.h b/contrib/libs/libxml/include/libxml/xlink.h
index edae487b3e..0bbb36c23d 100644
--- a/contrib/libs/libxml/include/libxml/xlink.h
+++ b/contrib/libs/libxml/include/libxml/xlink.h
@@ -26,7 +26,7 @@ extern "C" {
  *       of namespaces. If "foo" is the prefix for "http://foo.com/"
  *       then the link detection layer will expand role="foo:myrole"
  *       to "http://foo.com/:myrole".
- * NOTE: the link detection layer will expand URI-References found on
+ * NOTE: the link detection layer will expand URI-References found on 
  *       href attributes by using the base mechanism if found.
  */
 typedef xmlChar *xlinkHRef;
diff --git a/contrib/libs/libxml/include/libxml/xmlIO.h b/contrib/libs/libxml/include/libxml/xmlIO.h
index a2da495f5f..712ff231fc 100644
--- a/contrib/libs/libxml/include/libxml/xmlIO.h
+++ b/contrib/libs/libxml/include/libxml/xmlIO.h
@@ -27,7 +27,7 @@ extern "C" {
  * @filename: the filename or URI
  *
  * Callback used in the I/O Input API to detect if the current handler
- * can provide input functionality for this resource.
+ * can provide input functionality for this resource. 
  *
  * Returns 1 if yes and 0 if another Input module should be used
  */
@@ -73,7 +73,7 @@ typedef int (XMLCALL *xmlInputCloseCallback) (void * context);
  * @filename: the filename or URI
  *
  * Callback used in the I/O Output API to detect if the current handler
- * can provide output functionality for this resource.
+ * can provide output functionality for this resource. 
  *
  * Returns 1 if yes and 0 if another Output module should be used
  */
diff --git a/contrib/libs/libxml/include/libxml/xmlerror.h b/contrib/libs/libxml/include/libxml/xmlerror.h
index d47d726d5a..34cf206c74 100644
--- a/contrib/libs/libxml/include/libxml/xmlerror.h
+++ b/contrib/libs/libxml/include/libxml/xmlerror.h
@@ -837,7 +837,7 @@ typedef enum {
  * xmlGenericErrorFunc:
  * @ctx:  a parsing context
  * @msg:  the message
- * @...:  the extra arguments of the varargs to format the message
+ * @...:  the extra arguments of the varargs to format the message 
  *
  * Signature of the function to use when there is an error and
  * no parsing or validity context available .
@@ -937,7 +937,7 @@ XMLPUBFUN void XMLCALL
 				 int code,
 				 xmlNodePtr node,
 				 const char *msg,
-				 const char *extra) LIBXML_ATTR_FORMAT(4,0);
+				 const char *extra) LIBXML_ATTR_FORMAT(4,0); 
 #endif
 #ifdef __cplusplus
 }
diff --git a/contrib/libs/libxml/include/libxml/xmlexports.h b/contrib/libs/libxml/include/libxml/xmlexports.h
index f03af0d03a..a9fc0abb7a 100644
--- a/contrib/libs/libxml/include/libxml/xmlexports.h
+++ b/contrib/libs/libxml/include/libxml/xmlexports.h
@@ -122,8 +122,8 @@
   #define XMLCDECL __cdecl
 #endif
 
-/* Cygwin platform (does not define _WIN32), GNU compiler */
-#if defined(__CYGWIN__)
+/* Cygwin platform (does not define _WIN32), GNU compiler */ 
+#if defined(__CYGWIN__) 
   #undef XMLPUBFUN
   #undef XMLPUBVAR
   #undef XMLCALL
@@ -136,7 +136,7 @@
     #if !defined(LIBXML_STATIC)
       #define XMLPUBVAR __declspec(dllimport) extern
     #else
-      #define XMLPUBVAR extern
+      #define XMLPUBVAR extern 
     #endif
   #endif
   #define XMLCALL __cdecl
diff --git a/contrib/libs/libxml/include/libxml/xmlreader.h b/contrib/libs/libxml/include/libxml/xmlreader.h
index 8eb24a13f1..70ca548651 100644
--- a/contrib/libs/libxml/include/libxml/xmlreader.h
+++ b/contrib/libs/libxml/include/libxml/xmlreader.h
@@ -393,7 +393,7 @@ typedef void *  xmlTextReaderLocatorPtr;
  * @arg: the user argument
  * @msg: the message
  * @severity: the severity of the error
- * @locator: a locator indicating where the error occurred
+ * @locator: a locator indicating where the error occurred 
  *
  * Signature of an error callback from a reader parser
  */
diff --git a/contrib/libs/libxml/include/libxml/xmlstring.h b/contrib/libs/libxml/include/libxml/xmlstring.h
index 154cd48594..f286ae176b 100644
--- a/contrib/libs/libxml/include/libxml/xmlstring.h
+++ b/contrib/libs/libxml/include/libxml/xmlstring.h
@@ -97,13 +97,13 @@ XMLPUBFUN xmlChar * XMLCALL
 XMLPUBFUN int XMLCALL
                 xmlStrPrintf             (xmlChar *buf,
                                          int len,
-                                         const char *msg,
-                                         ...) LIBXML_ATTR_FORMAT(3,4);
+                                         const char *msg, 
+                                         ...) LIBXML_ATTR_FORMAT(3,4); 
 XMLPUBFUN int XMLCALL
                 xmlStrVPrintf                (xmlChar *buf,
                                          int len,
-                                         const char *msg,
-                                         va_list ap) LIBXML_ATTR_FORMAT(3,0);
+                                         const char *msg, 
+                                         va_list ap) LIBXML_ATTR_FORMAT(3,0); 
 
 XMLPUBFUN int XMLCALL
         xmlGetUTF8Char                   (const unsigned char *utf,
diff --git a/contrib/libs/libxml/include/libxml/xmlversion.h b/contrib/libs/libxml/include/libxml/xmlversion.h
index 8d910e5731..5d6da6276d 100644
--- a/contrib/libs/libxml/include/libxml/xmlversion.h
+++ b/contrib/libs/libxml/include/libxml/xmlversion.h
@@ -29,28 +29,28 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  *
  * the version string like "1.2.3"
  */
-#define LIBXML_DOTTED_VERSION "2.9.10"
+#define LIBXML_DOTTED_VERSION "2.9.10" 
 
 /**
  * LIBXML_VERSION:
  *
  * the version number: 1.2.3 value is 10203
  */
-#define LIBXML_VERSION 20910
+#define LIBXML_VERSION 20910 
 
 /**
  * LIBXML_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "10203"
  */
-#define LIBXML_VERSION_STRING "20910"
+#define LIBXML_VERSION_STRING "20910" 
 
 /**
  * LIBXML_VERSION_EXTRA:
  *
  * extra version information, used to show a CVS compilation
  */
-#define LIBXML_VERSION_EXTRA ""
+#define LIBXML_VERSION_EXTRA "" 
 
 /**
  * LIBXML_TEST_VERSION:
@@ -58,7 +58,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  * Macro to check that the libxml version in use is compatible with
  * the version the software has been compiled against
  */
-#define LIBXML_TEST_VERSION xmlCheckVersion(20910);
+#define LIBXML_TEST_VERSION xmlCheckVersion(20910); 
 
 #ifndef VMS
 #if 0
@@ -288,7 +288,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  *
  * Whether ISO-8859-* support is made available in case iconv is not
  */
-#if 1
+#if 1 
 #define LIBXML_ISO8859X_ENABLED
 #endif
 
@@ -350,10 +350,10 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  * LIBXML_EXPR_ENABLED:
  *
  * Whether the formal expressions interfaces are compiled in
- *
- * This code is unused and disabled unconditionally for now.
+ * 
+ * This code is unused and disabled unconditionally for now. 
  */
-#if 0
+#if 0 
 #define LIBXML_EXPR_ENABLED
 #endif
 
@@ -387,7 +387,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  *
  * the string suffix used by dynamic modules (usually shared libraries)
  */
-#define LIBXML_MODULE_EXTENSION ".so" 
+#define LIBXML_MODULE_EXTENSION ".so"  
 #endif
 
 /**
@@ -395,7 +395,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  *
  * Whether the Zlib support is compiled in
  */
-#if 1
+#if 1 
 #define LIBXML_ZLIB_ENABLED
 #endif
 
@@ -404,7 +404,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  *
  * Whether the Lzma support is compiled in
  */
-#if 0
+#if 0 
 #define LIBXML_LZMA_ENABLED
 #endif
 
@@ -431,7 +431,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  */
 
 #ifndef LIBXML_ATTR_ALLOC_SIZE
-# if (!defined(__clang__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))))
+# if (!defined(__clang__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))) 
 #  define LIBXML_ATTR_ALLOC_SIZE(x) __attribute__((alloc_size(x)))
 # else
 #  define LIBXML_ATTR_ALLOC_SIZE(x)
diff --git a/contrib/libs/libxml/include/libxml/xpath.h b/contrib/libs/libxml/include/libxml/xpath.h
index 91c7578768..0ba30a4356 100644
--- a/contrib/libs/libxml/include/libxml/xpath.h
+++ b/contrib/libs/libxml/include/libxml/xpath.h
@@ -70,9 +70,9 @@ typedef enum {
     XPATH_INVALID_CHAR_ERROR,
     XPATH_INVALID_CTXT,
     XPATH_STACK_ERROR,
-    XPATH_FORBID_VARIABLE_ERROR,
-    XPATH_OP_LIMIT_EXCEEDED,
-    XPATH_RECURSION_LIMIT_EXCEEDED
+    XPATH_FORBID_VARIABLE_ERROR, 
+    XPATH_OP_LIMIT_EXCEEDED, 
+    XPATH_RECURSION_LIMIT_EXCEEDED 
 } xmlXPathError;
 
 /*
@@ -84,7 +84,7 @@ struct _xmlNodeSet {
     int nodeNr;			/* number of nodes in the set */
     int nodeMax;		/* size of the array as allocated */
     xmlNodePtr *nodeTab;	/* array of nodes in no particular order */
-    /* @@ with_ns to check whether namespace nodes should be looked at @@ */
+    /* @@ with_ns to check whether namespace nodes should be looked at @@ */ 
 };
 
 /*
@@ -354,13 +354,13 @@ struct _xmlXPathContext {
 
     /* Cache for reusal of XPath objects */
     void *cache;
-
-    /* Resource limits */
-    unsigned long opLimit;
-    unsigned long opCount;
-    int depth;
-    int maxDepth;
-    int maxParserDepth;
+ 
+    /* Resource limits */ 
+    unsigned long opLimit; 
+    unsigned long opCount; 
+    int depth; 
+    int maxDepth; 
+    int maxParserDepth; 
 };
 
 /*
diff --git a/contrib/libs/libxml/include/libxml/xpathInternals.h b/contrib/libs/libxml/include/libxml/xpathInternals.h
index 87f1f00990..aa851bf627 100644
--- a/contrib/libs/libxml/include/libxml/xpathInternals.h
+++ b/contrib/libs/libxml/include/libxml/xpathInternals.h
@@ -229,7 +229,7 @@ XMLPUBFUN void * XMLCALL
  * Empties a node-set.
  */
 #define xmlXPathEmptyNodeSet(ns)					\
-    { while ((ns)->nodeNr > 0) (ns)->nodeTab[--(ns)->nodeNr] = NULL; }
+    { while ((ns)->nodeNr > 0) (ns)->nodeTab[--(ns)->nodeNr] = NULL; } 
 
 /**
  * CHECK_ERROR: