From: Antonio Borneo <borneo.antonio@gmail.com>
Date: Mon, 6 May 2019 10:56:38 +0000 (+0200)
Subject: coding style: let "else" follow the close brace
X-Git-Tag: v0.11.0-rc1~293
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=1946b50dba6c9d5bd5fda2b396eeae649b47762a

coding style: let "else" follow the close brace

The statement "else" should not be on a new line when follows a
close brace '}'. Fix it!

Issue identified by checkpatch script from Linux kernel v5.1 using
the command

	find src/ -type f -exec ./tools/scripts/checkpatch.pl \
	-q --types ELSE_AFTER_BRACE -f {} \;

Change-Id: I8af247ec3f75a69713d7cb1e73881254d16c189e
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5623
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Tested-by: jenkins
---

diff --git a/src/flash/nor/stm32f1x.c b/src/flash/nor/stm32f1x.c
index 37dcafd87b..990b48aebf 100644
--- a/src/flash/nor/stm32f1x.c
+++ b/src/flash/nor/stm32f1x.c
@@ -1369,8 +1369,7 @@ COMMAND_HANDLER(stm32x_handle_options_write_command)
 			COMMAND_PARSE_NUMBER(u16, CMD_ARGV[1], useropt);
 			CMD_ARGC--;
 			CMD_ARGV++;
-		}
-		else if (stm32x_info->has_dual_banks) {
+		} else if (stm32x_info->has_dual_banks) {
 			if (strcmp("BOOT0", CMD_ARGV[0]) == 0)
 				optionbyte |= (1 << 3);
 			else if (strcmp("BOOT1", CMD_ARGV[0]) == 0)
diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index 27febd3d77..bb14bc846f 100644
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -966,8 +966,7 @@ static int cortex_m_step(struct target *target, int current,
 				/* Re-enable interrupts if appropriate */
 				cortex_m_write_debug_halt_mask(target, C_HALT, 0);
 				cortex_m_set_maskints_for_halt(target);
-			}
-			else {
+			} else {
 
 				/* Set a temporary break point */
 				if (breakpoint) {