From a80fb2bcea726e168a4a55faed032d4e7bd458cd Mon Sep 17 00:00:00 2001
From: Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru>
Date: Tue, 8 Sep 2020 18:12:58 +0300
Subject: [PATCH] [expat] Review fixes.

---
 coding/internal/xmlparser.hpp | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/coding/internal/xmlparser.hpp b/coding/internal/xmlparser.hpp
index 3f7b5626c2..cd589db56f 100644
--- a/coding/internal/xmlparser.hpp
+++ b/coding/internal/xmlparser.hpp
@@ -35,26 +35,26 @@ public:
     OnPostCreate();
   }
 
-  static void StartElementHandler(void * pUserData, const XML_Char * pszName,
-                                  const XML_Char ** papszAttrs)
+  static void StartElementHandler(void * userData, XML_Char const * name,
+                                  XML_Char const ** attrs)
   {
-    CHECK(pUserData, (pszName));
-    auto * pThis = static_cast<XmlParser *>(pUserData);
-    pThis->OnStartElement(pszName, papszAttrs);
+    CHECK(userData, (name));
+    auto * xmlParser = static_cast<XmlParser *>(userData);
+    xmlParser->OnStartElement(name, attrs);
   }
 
-  static void EndElementHandler(void * pUserData, const XML_Char * pszName)
+  static void EndElementHandler(void * userData, XML_Char const * name)
   {
-    CHECK(pUserData, (pszName));
-    auto * pThis = static_cast<XmlParser *>(pUserData);
-    pThis->OnEndElement(pszName);
+    CHECK(userData, (name));
+    auto * xmlParser = static_cast<XmlParser *>(userData);
+    xmlParser->OnEndElement(name);
   }
 
-  static void CharacterDataHandler(void * pUserData, const XML_Char * pszData, int nLength)
+  static void CharacterDataHandler(void * userData, XML_Char const * data, int length)
   {
-    CHECK(pUserData, (pszData));
-    auto * pThis = static_cast<XmlParser *>(pUserData);
-    pThis->OnCharacterData(pszData, nLength);
+    CHECK(userData, (data));
+    auto * xmlParser = static_cast<XmlParser *>(userData);
+    xmlParser->OnCharacterData(data, length);
   }
 
   void * GetBuffer(int len)
@@ -69,7 +69,6 @@ public:
     return XML_ParseBuffer(m_parser.get(), len, isFinal);
   }
 
-  // Invoked by CExpatImpl after the parser is created
   void OnPostCreate()
   {
     CHECK(m_parser, ());