Browse Source

- Replace '){' with ') {'.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2397 b42882b7-edfa-0310-969c-e2dbd0fdcd60
tags/v0.2.0
zwelch 15 years ago
parent
commit
2428bc2a5c
2 changed files with 156 additions and 156 deletions
  1. +143
    -143
      src/flash/at91sam3.c
  2. +13
    -13
      src/helper/membuf.c

+ 143
- 143
src/flash/at91sam3.c
File diff suppressed because it is too large
View File


+ 13
- 13
src/helper/membuf.c View File

@@ -55,7 +55,7 @@ membuf_datapointer(struct membuf *pBuf)
const char * const char *
membuf_strtok(struct membuf *pBuf, const char *sep, void **pLast) membuf_strtok(struct membuf *pBuf, const char *sep, void **pLast)
{ {
if (pBuf){
if (pBuf) {
pBuf->_strtoklast = NULL; pBuf->_strtoklast = NULL;
*pLast = pBuf; *pLast = pBuf;
return strtok_r(((char *)(pBuf->buf)), sep, &(pBuf->_strtoklast)); return strtok_r(((char *)(pBuf->buf)), sep, &(pBuf->_strtoklast));
@@ -75,10 +75,10 @@ membuf_new(void)
struct membuf *pBuf; struct membuf *pBuf;


pBuf = calloc(1, sizeof(*pBuf)); pBuf = calloc(1, sizeof(*pBuf));
if (pBuf){
if (pBuf) {
// we *ALWAYS* allocate +1 for null terminator. // 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){
if (pBuf->buf == NULL) {
free(pBuf); free(pBuf);
pBuf = NULL; pBuf = NULL;
} else { } else {
@@ -99,13 +99,13 @@ membuf_grow(struct membuf *pBuf, int n)
newsize = ((int)(pBuf->maxlen)) + n; newsize = ((int)(pBuf->maxlen)) + n;


// do not go negative, or too small // do not go negative, or too small
if (newsize < DEFAULT_BUFSIZE){
if (newsize < DEFAULT_BUFSIZE) {
newsize = DEFAULT_BUFSIZE; newsize = DEFAULT_BUFSIZE;
} }


// always alloc +1 for the null terminator // always alloc +1 for the null terminator
vp = realloc(pBuf->buf, newsize + 1); vp = realloc(pBuf->buf, newsize + 1);
if (vp){
if (vp) {
pBuf->buf = vp; pBuf->buf = vp;
pBuf->maxlen = newsize; pBuf->maxlen = newsize;
return pBuf; return pBuf;
@@ -123,8 +123,8 @@ void membuf_reset(struct membuf *pBuf)


void membuf_delete(struct membuf *pBuf) void membuf_delete(struct membuf *pBuf)
{ {
if (pBuf){
if (pBuf->buf){
if (pBuf) {
if (pBuf->buf) {
// wack data so it cannot be reused // wack data so it cannot be reused
memset(pBuf->buf,0,pBuf->maxlen); memset(pBuf->buf,0,pBuf->maxlen);
free(pBuf->buf); free(pBuf->buf);
@@ -163,7 +163,7 @@ membuf_vsprintf(struct membuf *pBuf, const char *fmt, va_list ap)
sa, sa,
fmt, fmt,
ap); ap);
if ((r > 0) && (((size_t)(r)) < sa)){
if ((r > 0) && (((size_t)(r)) < sa)) {
// Success! // Success!
pBuf->curlen += ((size_t)(r)); pBuf->curlen += ((size_t)(r));
// remember: We always alloc'ed +1 // remember: We always alloc'ed +1
@@ -174,7 +174,7 @@ membuf_vsprintf(struct membuf *pBuf, const char *fmt, va_list ap)
} }


// failure // failure
if (r < 0){
if (r < 0) {
// Option(A) format error // Option(A) format error
// Option(B) glibc2.0 bug // Option(B) glibc2.0 bug
// assume (B). // assume (B).
@@ -182,13 +182,13 @@ membuf_vsprintf(struct membuf *pBuf, const char *fmt, va_list ap)
} }


// don't do this again // don't do this again
if (grew){
if (grew) {
r = -1; r = -1;
break; break;
} }
grew = 1; grew = 1;
pBuf = membuf_grow(pBuf, r); pBuf = membuf_grow(pBuf, r);
if (pBuf == NULL){
if (pBuf == NULL) {
// grow failed // grow failed
r = -1; r = -1;
break; break;
@@ -213,13 +213,13 @@ membuf_append(struct membuf *pBuf, const void *pData, size_t len)
sa = space_avail(pBuf); sa = space_avail(pBuf);


// will it fit? // will it fit?
if (sa < len){
if (sa < len) {
// if not, how much do we need? // if not, how much do we need?
r = ((int)(sa - len)); r = ((int)(sa - len));
// do the grow. // do the grow.
pBuf = membuf_grow(pBuf, r); pBuf = membuf_grow(pBuf, r);
// failed? // failed?
if (pBuf == NULL){
if (pBuf == NULL) {
return pBuf; return pBuf;
} }
} }


Loading…
Cancel
Save