From f11b1ff485a6669efb903a69f187b1c7168f1486 Mon Sep 17 00:00:00 2001 From: zwelch Date: Wed, 24 Jun 2009 09:38:08 +0000 Subject: Remove whitespace that occurs before ')'. - Replace '[ \t]*[)]' with ')'. git-svn-id: svn://svn.berlios.de/openocd/trunk@2396 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/helper/membuf.c | 70 ++++++++++++++++++++++++++--------------------------- src/helper/membuf.h | 18 +++++++------- 2 files changed, 44 insertions(+), 44 deletions(-) (limited to 'src/helper') diff --git a/src/helper/membuf.c b/src/helper/membuf.c index 0c1673fd..8d8c54da 100644 --- a/src/helper/membuf.c +++ b/src/helper/membuf.c @@ -37,32 +37,32 @@ struct membuf { }; -#define space_avail(pBuf ) (pBuf->maxlen - pBuf->curlen) -#define dataend(pBuf ) (((char *)(pBuf->buf)) + pBuf->curlen ) +#define space_avail(pBuf) (pBuf->maxlen - pBuf->curlen) +#define dataend(pBuf) (((char *)(pBuf->buf)) + pBuf->curlen) size_t -membuf_len(struct membuf *pBuf ) +membuf_len(struct membuf *pBuf) { return pBuf->curlen; } const void * -membuf_datapointer(struct membuf *pBuf ) +membuf_datapointer(struct membuf *pBuf) { return ((void *)(pBuf->buf)); } 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; *pLast = pBuf; - return strtok_r(((char *)(pBuf->buf)), sep, &(pBuf->_strtoklast) ); + return strtok_r(((char *)(pBuf->buf)), sep, &(pBuf->_strtoklast)); } else { // recover our pBuf pBuf = *((struct membuf **)(pLast)); - return strtok_r(NULL, sep, &(pBuf->_strtoklast) ); + return strtok_r(NULL, sep, &(pBuf->_strtoklast)); } } @@ -74,11 +74,11 @@ membuf_new(void) // by default - parameters are zero. struct membuf *pBuf; - pBuf = calloc(1, sizeof(*pBuf) ); - if (pBuf ){ + pBuf = calloc(1, sizeof(*pBuf)); + if (pBuf){ // we *ALWAYS* allocate +1 for null terminator. pBuf->buf = calloc(DEFAULT_BUFSIZE + 1, sizeof(char)); - if (pBuf->buf == NULL ){ + if (pBuf->buf == NULL){ free(pBuf); pBuf = NULL; } else { @@ -90,7 +90,7 @@ membuf_new(void) struct membuf * -membuf_grow(struct membuf *pBuf, int n ) +membuf_grow(struct membuf *pBuf, int n) { void *vp; signed int newsize; @@ -99,13 +99,13 @@ membuf_grow(struct membuf *pBuf, int n ) newsize = ((int)(pBuf->maxlen)) + n; // do not go negative, or too small - if (newsize < DEFAULT_BUFSIZE ){ + if (newsize < DEFAULT_BUFSIZE){ newsize = DEFAULT_BUFSIZE; } // always alloc +1 for the null terminator - vp = realloc(pBuf->buf, newsize + 1 ); - if (vp ){ + vp = realloc(pBuf->buf, newsize + 1); + if (vp){ pBuf->buf = vp; pBuf->maxlen = newsize; return pBuf; @@ -115,15 +115,15 @@ membuf_grow(struct membuf *pBuf, int n ) } -void membuf_reset(struct membuf *pBuf ) +void membuf_reset(struct membuf *pBuf) { pBuf->curlen = 0; } -void membuf_delete(struct membuf *pBuf ) +void membuf_delete(struct membuf *pBuf) { - if (pBuf ){ + if (pBuf){ if (pBuf->buf){ // wack data so it cannot be reused memset(pBuf->buf,0,pBuf->maxlen); @@ -136,18 +136,18 @@ void membuf_delete(struct membuf *pBuf ) } int -membuf_sprintf(struct membuf *pBuf , const char *fmt, ... ) +membuf_sprintf(struct membuf *pBuf , const char *fmt, ...) { int r; va_list ap; - va_start(ap, fmt ); - r = membuf_vsprintf(pBuf, fmt, ap ); + va_start(ap, fmt); + r = membuf_vsprintf(pBuf, fmt, ap); va_end(ap); return r; } int -membuf_vsprintf(struct membuf *pBuf, const char *fmt, va_list ap ) +membuf_vsprintf(struct membuf *pBuf, const char *fmt, va_list ap) { int r; size_t sa; @@ -159,11 +159,11 @@ membuf_vsprintf(struct membuf *pBuf, const char *fmt, va_list ap ) sa = space_avail(pBuf); // do work - r = vsnprintf(dataend(pBuf ), + r = vsnprintf(dataend(pBuf), sa, fmt, - ap ); - if ((r > 0) && (((size_t)(r)) < sa) ){ + ap); + if ((r > 0) && (((size_t)(r)) < sa)){ // Success! pBuf->curlen += ((size_t)(r)); // remember: We always alloc'ed +1 @@ -174,7 +174,7 @@ membuf_vsprintf(struct membuf *pBuf, const char *fmt, va_list ap ) } // failure - if (r < 0 ){ + if (r < 0){ // Option(A) format error // Option(B) glibc2.0 bug // assume (B). @@ -182,12 +182,12 @@ membuf_vsprintf(struct membuf *pBuf, const char *fmt, va_list ap ) } // don't do this again - if (grew ){ + if (grew){ r = -1; break; } grew = 1; - pBuf = membuf_grow(pBuf, r ); + pBuf = membuf_grow(pBuf, r); if (pBuf == NULL){ // grow failed r = -1; @@ -198,26 +198,26 @@ membuf_vsprintf(struct membuf *pBuf, const char *fmt, va_list ap ) } struct membuf * -membuf_strcat(struct membuf *pBuf, const char *pStr ) +membuf_strcat(struct membuf *pBuf, const char *pStr) { - return membuf_append(pBuf, pStr, strlen(pStr ) ); + return membuf_append(pBuf, pStr, strlen(pStr)); } struct membuf * -membuf_append(struct membuf *pBuf, const void *pData, size_t len ) +membuf_append(struct membuf *pBuf, const void *pData, size_t len) { size_t sa; int r; // how much room is there? - sa = space_avail(pBuf ); + sa = space_avail(pBuf); // will it fit? - if (sa < len ){ + if (sa < len){ // if not, how much do we need? r = ((int)(sa - len)); // do the grow. - pBuf = membuf_grow(pBuf, r ); + pBuf = membuf_grow(pBuf, r); // failed? if (pBuf == NULL){ return pBuf; @@ -226,7 +226,7 @@ membuf_append(struct membuf *pBuf, const void *pData, size_t len ) // append memcpy(dataend(pBuf), pData, - len ); + len); pBuf->curlen += len; return pBuf; } diff --git a/src/helper/membuf.h b/src/helper/membuf.h index 0e9d81af..554504f7 100644 --- a/src/helper/membuf.h +++ b/src/helper/membuf.h @@ -30,7 +30,7 @@ struct membuf *membuf_new(void); /** delete (destroy) the mem buffer * @param pBuf - buffer to release */ -void membuf_delete(struct membuf *pBuf ); +void membuf_delete(struct membuf *pBuf); /** grow/shrink a membuf by specified amount. @@ -39,14 +39,14 @@ void membuf_delete(struct membuf *pBuf ); * * Symantics of 'realloc()' return NULL on failure */ -struct membuf *membuf_grow(struct membuf *pBuf, int amount ); +struct membuf *membuf_grow(struct membuf *pBuf, int amount); /** how long is this buffer (memlen(), strlen()) * @param pBuf - the buffer * * @returns: length of current buffer. */ -size_t membuf_len(struct membuf *pBuf ); +size_t membuf_len(struct membuf *pBuf); /** reset an membuf to zero length. @@ -54,7 +54,7 @@ size_t membuf_len(struct membuf *pBuf ); * * Note this does not 'release' the memory buffer */ -void membuf_reset(struct membuf *pBuf ); +void membuf_reset(struct membuf *pBuf); /** sprintf() to the string buffer @@ -64,7 +64,7 @@ void membuf_reset(struct membuf *pBuf ); * Returns 0 on success * Returns non-zero on failure */ -int membuf_sprintf(struct membuf *pBuf , const char *fmt, ... ); +int membuf_sprintf(struct membuf *pBuf , const char *fmt, ...); /** vsprintf() to the string buffer * @param pBuf - buffer to capture sprintf() data into @@ -84,14 +84,14 @@ int membuf_vsprintf(struct membuf *pBuf , const char *fmt, va_list ap); * * NOTE: This call is destructive to the buffer. */ -const char *membuf_strtok(struct membuf *pBuf, const char *delim, void **pSave ); +const char *membuf_strtok(struct membuf *pBuf, const char *delim, void **pSave); /** Return pointer to the memory in the buffer * @param pBuf - buffer * * NOTE: Thou shall not modify this pointer, it is CONST */ -const void *membuf_datapointer(struct membuf *pBuf ); +const void *membuf_datapointer(struct membuf *pBuf); /** Append data to the buffer @@ -102,7 +102,7 @@ const void *membuf_datapointer(struct membuf *pBuf ); * Modified symantics of "memcpy()". On memory allocation failure * returns NULL. On success, returns pointer to orginal membuf. */ -struct membuf *membuf_append(struct membuf *pBuf, const void *pData, size_t len ); +struct membuf *membuf_append(struct membuf *pBuf, const void *pData, size_t len); /** Append string to the buffer @@ -112,7 +112,7 @@ struct membuf *membuf_append(struct membuf *pBuf, const void *pData, size_t len * Modified symantics of "strcat()". On memory allocation failure * returns NULL. On success, returns pointer to orginal membuf. */ -struct membuf *membuf_strcat(struct membuf *pBuf, const char *s ); +struct membuf *membuf_strcat(struct membuf *pBuf, const char *s); #endif -- cgit v1.2.3