- Fixes '&&' whitespace

- Replace ')\(&&\)(' with ') \1 ('.
- Replace '\(\w\)\(&&\)(' with '\1 \2 ('.
- Replace '\(\w\)\(&&\)\(\w\)' with '\1 \2 \3'.


git-svn-id: svn://svn.berlios.de/openocd/trunk@2366 b42882b7-edfa-0310-969c-e2dbd0fdcd60

4 files changed, 6 insertions, 6 deletions

diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index 474f9467..79b1bc74 100644
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -1022,7 +1022,7 @@ int arm7_9_assert_reset(target_t *target)
 
 	armv4_5_invalidate_core_regs(target);
 
-	if ((target->reset_halt)&&((jtag_reset_config & RESET_SRST_PULLS_TRST)==0))
+	if ((target->reset_halt) && ((jtag_reset_config & RESET_SRST_PULLS_TRST)==0))
 	{
 		/* debug entry was already prepared in arm7_9_assert_reset() */
 		target->debug_reason = DBG_REASON_DBGRQ;
@@ -1050,7 +1050,7 @@ int arm7_9_deassert_reset(target_t *target)
 	jtag_add_reset(0, 0);
 
 	enum reset_types jtag_reset_config = jtag_get_reset_config();
-	if (target->reset_halt&&(jtag_reset_config & RESET_SRST_PULLS_TRST) != 0)
+	if (target->reset_halt && (jtag_reset_config & RESET_SRST_PULLS_TRST) != 0)
 	{
 		LOG_WARNING("srst pulls trst - can not reset into halted mode. Issuing halt after reset.");
 		/* set up embedded ice registers again */
diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index 2584dbc6..ea3b2792 100644
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -1027,7 +1027,7 @@ int dap_info_command(struct command_context_s *cmd_ctx, swjdp_common_t *swjdp, i
 	dap_ap_read_reg_u32(swjdp, 0xFC, &apid);
 	swjdp_transaction_endcheck(swjdp);
 	/* Now we read ROM table ID registers, ref. ARM IHI 0029B sec  */
-	mem_ap = ((apid&0x10000)&&((apid&0x0F) != 0));
+	mem_ap = ((apid&0x10000) && ((apid&0x0F) != 0));
 	command_print(cmd_ctx, "ap identification register 0x%8.8" PRIx32 "", apid);
 	if (apid)
 	{
@@ -1053,7 +1053,7 @@ int dap_info_command(struct command_context_s *cmd_ctx, swjdp_common_t *swjdp, i
 		command_print(cmd_ctx, "No AP found at this apsel 0x%x", apsel);
 	}
 
-	romtable_present = ((mem_ap)&&(dbgbase != 0xFFFFFFFF));
+	romtable_present = ((mem_ap) && (dbgbase != 0xFFFFFFFF));
 	if (romtable_present)
 	{
 		uint32_t cid0,cid1,cid2,cid3,memtype,romentry;
diff --git a/src/target/image.c b/src/target/image.c
index 45107b48..2ce03b82 100644
--- a/src/target/image.c
+++ b/src/target/image.c
@@ -81,7 +81,7 @@ static int autodetect_image_type(image_t *image, char *url)
 		&&(isxdigit(buffer[5]))
 		&&(isxdigit(buffer[6]))
 		&&(buffer[7]=='0') /* record type : 00 -> 05 */
-		&&(buffer[8]>='0')&&(buffer[8]<'6'))
+		&&(buffer[8]>='0') && (buffer[8]<'6'))
 	{
 		LOG_DEBUG("IHEX image detected.");
 		image->type = IMAGE_IHEX;
diff --git a/src/target/target.c b/src/target/target.c
index 56bcdf05..781847fc 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -1014,7 +1014,7 @@ int target_free_working_area_restore(struct target_s *target, working_area_t *ar
 	if (area->free)
 		return ERROR_OK;
 
-	if (restore&&target->backup_working_area)
+	if (restore && target->backup_working_area)
 	{
 		int retval;
 		if ((retval = target_write_memory(target, area->address, 4, area->size / 4, area->backup)) != ERROR_OK)