From: Dimitri Papadopoulos <3350651+DimitriPapadopoulos@users.noreply.gitlab.com>
Date: Wed, 16 Jun 2021 11:27:25 +0000 (+0200)
Subject: Fix suspect code indent
X-Git-Tag: v8.20~118^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=789e04ed63ace8b0da95fbe1538ac6a61af5504d;p=users%2Fdwmw2%2Fopenconnect.git

Fix suspect code indent

Warnings by checkpatch.pl.
I have fixed actual errors and left actual conscious decisions.

Signed-off-by: Dimitri Papadopoulos <3350651+DimitriPapadopoulos@users.noreply.gitlab.com>
---

diff --git a/auth-common.c b/auth-common.c
index 1f3fa4dc..8d7ea39d 100644
--- a/auth-common.c
+++ b/auth-common.c
@@ -74,7 +74,7 @@ int xmlnode_match_prop(xmlNode *xml_node, const char *name, const char *match)
 		return -ENOENT;
 
 	if (strcmp(str, match))
-	    ret = -EEXIST;
+		ret = -EEXIST;
 
 	free(str);
 	return ret;
diff --git a/auth-globalprotect.c b/auth-globalprotect.c
index a698cb43..b1046911 100644
--- a/auth-globalprotect.c
+++ b/auth-globalprotect.c
@@ -431,7 +431,7 @@ static int parse_portal_xml(struct openconnect_info *vpninfo, xmlNode *xml_node,
 					if (xmlnode_is_named(x2, "external"))
 						for (x3 = x2->children; x3; x3 = x3->next)
 							if (xmlnode_is_named(x3, "list"))
-							    gateways = x3;
+								gateways = x3;
 			} else if (xmlnode_is_named(x, "hip-collection")) {
 				for (x2 = x->children; x2; x2 = x2->next) {
 					if (!xmlnode_get_val(x2, "hip-report-interval", &hip_interval)) {
@@ -656,7 +656,7 @@ static int gpst_login(struct openconnect_info *vpninfo, int portal, struct login
 					goto replay_form;
 				}
 			} else
-			  break;
+				break;
 		}
 	}
 
diff --git a/auth.c b/auth.c
index f0747830..8e40f738 100644
--- a/auth.c
+++ b/auth.c
@@ -89,7 +89,7 @@ static int parse_auth_choice(struct openconnect_info *vpninfo, struct oc_auth_fo
 
 	/* Return early when there is a <select/> tag with no children */
 	if (max_choices == 0) {
-	    return 0;
+		return 0;
 	}
 
 	opt = calloc(1, sizeof(*opt));
@@ -689,7 +689,7 @@ static int handle_auth_form(struct openconnect_info *vpninfo, struct oc_auth_for
 				 */
 				free(form->error);
 				if (!(form->error = strdup(_("Client certificate missing or incorrect (Certificate Validation Failure)"))))
-				    return -ENOMEM;
+					return -ENOMEM;
 			} else
 				vpn_progress(vpninfo, PRG_ERR, "%s\n", form->error);
 		}
@@ -935,8 +935,8 @@ static int cstp_can_gen_tokencode(struct openconnect_info *vpninfo,
 #endif
 	/* Otherwise it's an OATH token of some kind. */
 	if (!strcmp(opt->name, "secondary_password") ||
-        (form->auth_id && !strcmp(form->auth_id, "challenge")))
-	  return can_gen_tokencode(vpninfo, form, opt);
+	    (form->auth_id && !strcmp(form->auth_id, "challenge")))
+		return can_gen_tokencode(vpninfo, form, opt);
 
 	return -EINVAL;
 }
diff --git a/fortinet.c b/fortinet.c
index 08ca63ce..cfb706d2 100644
--- a/fortinet.c
+++ b/fortinet.c
@@ -343,14 +343,14 @@ static int parse_fortinet_xml_config(struct openconnect_info *vpninfo, char *buf
 		} else if (xmlnode_is_named(xml_node, "fos")) {
 			char platform[80], *p = platform, *e = platform + 80;
 			if (!xmlnode_get_prop(xml_node, "platform", &s)) {
-			    p+=snprintf(p, e-p, "%s", s);
-			    if (!xmlnode_get_prop(xml_node, "major", &s))  p+=snprintf(p, e-p, " v%s", s);
-			    if (!xmlnode_get_prop(xml_node, "minor", &s))  p+=snprintf(p, e-p, ".%s", s);
-			    if (!xmlnode_get_prop(xml_node, "patch", &s))  p+=snprintf(p, e-p, ".%s", s);
-			    if (!xmlnode_get_prop(xml_node, "build", &s))  p+=snprintf(p, e-p, " build %s", s);
-			    if (!xmlnode_get_prop(xml_node, "branch", &s))    snprintf(p, e-p, " branch %s", s);
-			    vpn_progress(vpninfo, PRG_INFO,
-					 _("Reported platform is %s\n"), platform);
+				p+=snprintf(p, e-p, "%s", s);
+				if (!xmlnode_get_prop(xml_node, "major", &s))  p+=snprintf(p, e-p, " v%s", s);
+				if (!xmlnode_get_prop(xml_node, "minor", &s))  p+=snprintf(p, e-p, ".%s", s);
+				if (!xmlnode_get_prop(xml_node, "patch", &s))  p+=snprintf(p, e-p, ".%s", s);
+				if (!xmlnode_get_prop(xml_node, "build", &s))  p+=snprintf(p, e-p, " build %s", s);
+				if (!xmlnode_get_prop(xml_node, "branch", &s))    snprintf(p, e-p, " branch %s", s);
+				vpn_progress(vpninfo, PRG_INFO,
+					     _("Reported platform is %s\n"), platform);
 			}
 		} else if (xmlnode_is_named(xml_node, "ipv4")) {
 			for (x = xml_node->children; x; x=x->next) {
diff --git a/main.c b/main.c
index 48e5bbed..e7e65982 100644
--- a/main.c
+++ b/main.c
@@ -1013,7 +1013,7 @@ static inline char *__dup_config_arg(char **argv, char *config_arg)
 	char *res;
 
 	if (config_file || is_arg_utf8(config_arg))
-	    return xstrdup(config_arg);
+		return xstrdup(config_arg);
 
 	res = convert_arg_to_utf8(argv, config_arg);
 	/* Force a copy, even if conversion failed */
@@ -2330,9 +2330,9 @@ static int validate_peer_cert(void *_vpninfo, const char *reason)
 			if (!err)
 				return 0;
 			else if (err < 0) {
-				 vpn_progress(vpninfo, PRG_ERR,
-					      _("Could not check server's certificate against %s\n"),
-					      this->fingerprint);
+				vpn_progress(vpninfo, PRG_ERR,
+					     _("Could not check server's certificate against %s\n"),
+					     this->fingerprint);
 			}
 		}
 	}
@@ -2666,7 +2666,7 @@ static int lock_token(void *tokdata)
 	/* FIXME: Actually lock the file */
 	err = openconnect_read_file(vpninfo, token_filename, &file_token);
 	if (err < 0)
-	    return err;
+		return err;
 
 	err = openconnect_set_token_mode(vpninfo, vpninfo->token_mode, file_token);
 	free(file_token);
diff --git a/pulse.c b/pulse.c
index 534bed13..51a157b1 100644
--- a/pulse.c
+++ b/pulse.c
@@ -375,7 +375,7 @@ static int process_attr(struct openconnect_info *vpninfo, struct oc_vpn_option *
 		if (!attrlen)
 			goto badlen;
 		if (!data[attrlen-1])
-		    attrlen--;
+			attrlen--;
 		vpn_progress(vpninfo, PRG_DEBUG, _("Received DNS search domain %.*s\n"),
 			     attrlen, (char *)data);
 		new_ip_info->domain = add_option_dup(new_opts, "search", (char *)data, attrlen);
diff --git a/script.c b/script.c
index d6f8bb8f..6d1ec72f 100644
--- a/script.c
+++ b/script.c
@@ -347,8 +347,8 @@ void prepare_script_env(struct openconnect_info *vpninfo)
 	if (vpninfo->ip_info.netmask6 && !vpninfo->ip_info.addr6) {
 		char *slash = strchr(vpninfo->ip_info.netmask6, '/');
 		if (slash)
-                       script_setenv(vpninfo, "INTERNAL_IP6_ADDRESS", vpninfo->ip_info.netmask6,
-				     slash - vpninfo->ip_info.netmask6, 0);
+			script_setenv(vpninfo, "INTERNAL_IP6_ADDRESS", vpninfo->ip_info.netmask6,
+				      slash - vpninfo->ip_info.netmask6, 0);
 	}
 
 	if (vpninfo->ip_info.dns[0])