From 9cd160608c905db31961d9aaf8d4920fcde7c819 Mon Sep 17 00:00:00 2001
From: zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Wed, 24 Jun 2009 09:37:44 +0000
Subject: [PATCH] - Fixes '+' whitespace - Replace '\(\w\)\(+\)\(\w\)' with '\1
\2 \3'.
git-svn-id: svn://svn.berlios.de/openocd/trunk@2392 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
src/flash/at91sam3.c | 6 +++---
src/helper/membuf.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/flash/at91sam3.c b/src/flash/at91sam3.c
index 5a878f1e1..d66bb09ef 100644
--- a/src/flash/at91sam3.c
+++ b/src/flash/at91sam3.c
@@ -1276,7 +1276,7 @@ sam3_explain_ckgr_plla( struct sam3_chip *pChip )
} else if ( diva == 0 ){
sam3_sprintf(pChip,"\tPLLA Freq: (Disabled,diva = 0)\n");
} else if ( diva == 1 ){
- pChip->cfg.plla_freq = (pChip->cfg.mainosc_freq * (mula+1));
+ pChip->cfg.plla_freq = (pChip->cfg.mainosc_freq * (mula + 1));
sam3_sprintf(pChip,"\tPLLA Freq: %3.03f MHz\n",
_tomhz( pChip->cfg.plla_freq ));
}
@@ -1828,7 +1828,7 @@ _sam3_probe(struct flash_bank_s *bank, int noise)
LOG_DEBUG("Bank = %d, nbanks = %d",
pPrivate->bank_number , pPrivate->pChip->details.n_banks);
- if ( (pPrivate->bank_number+1) == pPrivate->pChip->details.n_banks ){
+ if ( (pPrivate->bank_number + 1) == pPrivate->pChip->details.n_banks ){
// read unique id,
// it appears to be associated with the *last* flash bank.
FLASHD_ReadUniqueID(pPrivate);
@@ -1874,7 +1874,7 @@ sam3_erase(struct flash_bank_s *bank, int first, int last)
return ERROR_FLASH_BANK_NOT_PROBED;
}
- if ( (first == 0) && ((last+1)== ((int)(pPrivate->nsectors))) ){
+ if ( (first == 0) && ((last + 1)== ((int)(pPrivate->nsectors))) ){
// whole chip
LOG_DEBUG("Here");
return FLASHD_EraseEntireBank( pPrivate );
diff --git a/src/helper/membuf.c b/src/helper/membuf.c
index 5b24034dd..e4280f9e0 100644
--- a/src/helper/membuf.c
+++ b/src/helper/membuf.c
@@ -77,7 +77,7 @@ membuf_new(void)
pBuf = calloc( 1, sizeof(*pBuf) );
if ( pBuf ){
// we *ALWAYS* allocate +1 for null terminator.
- pBuf->buf = calloc( DEFAULT_BUFSIZE+1, sizeof(char));
+ pBuf->buf = calloc( DEFAULT_BUFSIZE + 1, sizeof(char));
if ( pBuf->buf == NULL ){
free(pBuf);
pBuf = NULL;
@@ -104,7 +104,7 @@ membuf_grow( struct membuf *pBuf, int n )
}
// always alloc +1 for the null terminator
- vp = realloc( pBuf->buf, newsize+1 );
+ vp = realloc( pBuf->buf, newsize + 1 );
if ( vp ){
pBuf->buf = vp;
pBuf->maxlen = newsize;
--
GitLab