]> www.infradead.org Git - users/dwmw2/openconnect.git/commitdiff
Fix shadow 'ret' variable declaration in parse_xml_response()
authorDavid Woodhouse <David.Woodhouse@intel.com>
Fri, 31 May 2013 13:20:19 +0000 (14:20 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Fri, 31 May 2013 13:21:24 +0000 (14:21 +0100)
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
auth.c

diff --git a/auth.c b/auth.c
index bff7c7ffff8b5ae4298a27518b16dfc028aa7f5d..7bc614a6af39f69901342e0f35e11f4f14e2a7f5 100644 (file)
--- a/auth.c
+++ b/auth.c
@@ -493,7 +493,7 @@ int parse_xml_response(struct openconnect_info *vpninfo, char *response, struct
        struct oc_auth_form *form;
        xmlDocPtr xml_doc;
        xmlNode *xml_node;
-       int ret = -EINVAL;
+       int ret;
 
        if (*formp) {
                free_auth_form(*formp);
@@ -524,7 +524,7 @@ int parse_xml_response(struct openconnect_info *vpninfo, char *response, struct
 
        xml_node = xmlDocGetRootElement(xml_doc);
        while (xml_node) {
-               int ret = 0;
+               ret = 0;
 
                if (xml_node->type != XML_ELEMENT_NODE) {
                        xml_node = xml_node->next;
@@ -566,6 +566,7 @@ int parse_xml_response(struct openconnect_info *vpninfo, char *response, struct
        if (!form->auth_id && (!cert_rq || !*cert_rq)) {
                vpn_progress(vpninfo, PRG_ERR,
                             _("XML response has no \"auth\" node\n"));
+               ret = -EINVAL;
                goto out;
        }