Piotr Caban : setupapi: Remove unused end parameter from next_xml_attr internal function.

Alexandre Julliard julliard at winehq.org
Thu Sep 24 15:49:05 CDT 2020


Module: wine
Branch: master
Commit: 9fb0d9fe39d0d629c982f0f873aee627aa3f65e9
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=9fb0d9fe39d0d629c982f0f873aee627aa3f65e9

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Tue Sep 22 16:12:15 2020 +0200

setupapi: Remove unused end parameter from next_xml_attr internal function.

Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/setupapi/fakedll.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c
index e83bbb2512..7b4b14fa2c 100644
--- a/dlls/setupapi/fakedll.c
+++ b/dlls/setupapi/fakedll.c
@@ -554,8 +554,7 @@ static BOOL next_xml_elem( xmlbuf_t *xmlbuf, xmlstr_t *elem )
     return xmlbuf->ptr != xmlbuf->end;
 }
 
-static BOOL next_xml_attr(xmlbuf_t* xmlbuf, xmlstr_t* name, xmlstr_t* value,
-                          BOOL* error, BOOL* end)
+static BOOL next_xml_attr(xmlbuf_t* xmlbuf, xmlstr_t* name, xmlstr_t* value, BOOL* error)
 {
     const char *ptr;
 
@@ -573,7 +572,6 @@ static BOOL next_xml_attr(xmlbuf_t* xmlbuf, xmlstr_t* name, xmlstr_t* value,
             return FALSE;
 
         xmlbuf->ptr++;
-        *end = TRUE;
         *error = FALSE;
         return FALSE;
     }
@@ -727,7 +725,7 @@ static BOOL CALLBACK register_manifest( HMODULE module, const WCHAR *type, WCHAR
     xmlbuf_t buffer;
     xmlstr_t elem, attr_name, attr_value;
     xmlstr_t name, version, arch, key, lang;
-    BOOL end = FALSE, error;
+    BOOL error;
     const char *manifest;
     SIZE_T len;
     HRSRC rsrc;
@@ -746,7 +744,7 @@ static BOOL CALLBACK register_manifest( HMODULE module, const WCHAR *type, WCHAR
     while (next_xml_elem( &buffer, &elem ))
     {
         if (!xmlstr_cmp( &elem, "assemblyIdentity" )) continue;
-        while (next_xml_attr( &buffer, &attr_name, &attr_value, &error, &end ))
+        while (next_xml_attr( &buffer, &attr_name, &attr_value, &error ))
         {
             if (xmlstr_cmp(&attr_name, "name")) name = attr_value;
             else if (xmlstr_cmp(&attr_name, "version")) version = attr_value;




More information about the wine-cvs mailing list