[PATCH 4/8] wsdapi: code refactor and possible variable inner scope micro-optimization

[Semenov Herman (Семенов Герман)]

From: Semenov Herman (Семенов Герман)

---
 dlls/wsdapi/soap.c |  8 +++-----
 dlls/wsdapi/xml.c  | 10 +++-------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c
index a2753c943a7..f114d290976 100644
--- a/dlls/wsdapi/soap.c
+++ b/dlls/wsdapi/soap.c
@@ -361,7 +361,7 @@ static LPWSTR ulonglong_to_string(void *parent, ULONGLONG value)

static WSDXML_ATTRIBUTE *add_attribute(IWSDXMLContext *xml_context, WSDXML_ELEMENT *parent, LPCWSTR ns_uri, LPCWSTR name)
 {
-    WSDXML_ATTRIBUTE *attribute, *cur_attrib;
+    WSDXML_ATTRIBUTE *attribute;
     WSDXML_NAME *name_obj = NULL;

if (ns_uri == NULL)
@@ -400,7 +400,7 @@ static WSDXML_ATTRIBUTE *add_attribute(IWSDXMLContext *xml_context, WSDXML_ELEME
     else
     {
         /* Find the last attribute and add this as the next one */
-        cur_attrib = parent->FirstAttribute;
+        WSDXML_ATTRIBUTE *cur_attrib = parent->FirstAttribute;

while (cur_attrib->Next != NULL)
         {
@@ -1497,8 +1497,6 @@ static WSDXML_ELEMENT *find_element(WSDXML_ELEMENT *parent, LPCWSTR name, LPCWST

static void remove_element(WSDXML_ELEMENT *element)
 {
-    WSDXML_NODE *cur;
-
     if (element == NULL)
         return;

@@ -1506,7 +1504,7 @@ static void remove_element(WSDXML_ELEMENT *element)
         element->Node.Parent->FirstChild = element->Node.Next;
     else
     {
-        cur = element->Node.Parent->FirstChild;
+        WSDXML_NODE *cur = element->Node.Parent->FirstChild;

while (cur != NULL)
         {
diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c
index d92582718dd..56b878cf2e1 100644
--- a/dlls/wsdapi/xml.c
+++ b/dlls/wsdapi/xml.c
@@ -162,8 +162,6 @@ HRESULT WINAPI WSDXMLAddSibling(WSDXML_ELEMENT *pFirst, WSDXML_ELEMENT *pSecond)

HRESULT WINAPI WSDXMLBuildAnyForSingleElement(WSDXML_NAME *pElementName, LPCWSTR pszText, WSDXML_ELEMENT **ppAny)
 {
-    WSDXML_TEXT *child;
-
     TRACE("(%p, %s, %p)\n", pElementName, debugstr_w(pszText), ppAny);

if ((pElementName == NULL) || ((pszText != NULL) && (lstrlenW(pszText) > WSD_MAX_TEXT_LENGTH)))
@@ -195,7 +193,7 @@ HRESULT WINAPI WSDXMLBuildAnyForSingleElement(WSDXML_NAME *pElementName, LPCWSTR

if (pszText != NULL)
     {
-        child = WSDAllocateLinkedMemory(*ppAny, sizeof(WSDXML_TEXT));
+        WSDXML_TEXT *child = WSDAllocateLinkedMemory(*ppAny, sizeof(WSDXML_TEXT));

if (child == NULL)
         {
@@ -324,7 +322,6 @@ static WSDXML_NAME *add_name(WSDXML_NAMESPACE *ns, LPCWSTR name)
 {
     WSDXML_NAME *names;
     WSDXML_NAME *newName;
-    int i;

names = WSDAllocateLinkedMemory(ns, sizeof(WSDXML_NAME) * (ns->NamesCount + 1));

@@ -338,7 +335,7 @@ static WSDXML_NAME *add_name(WSDXML_NAMESPACE *ns, LPCWSTR name)
         /* Copy the existing names array over to the new allocation */
         memcpy(names, ns->Names, sizeof(WSDXML_NAME) * ns->NamesCount);

-        for (i = 0; i < ns->NamesCount; i++)
+        for (int i = 0; i < ns->NamesCount; i++)
         {
             /* Attach the local name memory to the new names allocation */
             WSDAttachLinkedMemory(names, names[i].LocalName);
@@ -380,11 +377,10 @@ static BOOL is_prefix_unique(struct list *namespaces, LPCWSTR prefix)

static LPWSTR generate_namespace_prefix(IWSDXMLContextImpl *impl, void *parentMemoryBlock, LPCWSTR uri)
 {
-    WCHAR suggestedPrefix[7];
-
     /* Find a unique prefix */
     while (impl->nextUnknownPrefix < 1000)
     {
+        WCHAR suggestedPrefix[7];
         wsprintfW(suggestedPrefix, L"un%d", impl->nextUnknownPrefix++);

/* For the unlikely event where somebody has explicitly created a prefix called 'unX', check it is unique */