zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove whitespace that occurs after '('. 

- Replace '([ \t]*' with '('.


git-svn-id: svn://svn.berlios.de/openocd/trunk@2395 b42882b7-edfa-0310-969c-e2dbd0fdcd60
__archive__
zwelch 2009-06-24 09:38:01 +00:00
parent dbb0f31abb
commit 1793150091
3 changed files with 367 additions and 367 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

642
src/flash/at91sam3.c
View File

File diff suppressed because it is too large Load Diff

72
src/helper/membuf.c
View File

@ -37,32 +37,32 @@ struct membuf {
}; };
#define space_avail( pBuf ) (pBuf->maxlen - pBuf->curlen) #define space_avail(pBuf ) (pBuf->maxlen - pBuf->curlen)
#define dataend( pBuf ) ( ((char *)(pBuf->buf)) + pBuf->curlen ) #define dataend(pBuf ) (((char *)(pBuf->buf)) + pBuf->curlen )
size_t size_t
membuf_len( struct membuf *pBuf ) membuf_len(struct membuf *pBuf )
{ {
return pBuf->curlen; return pBuf->curlen;
} }
const void * const void *
membuf_datapointer( struct membuf *pBuf ) membuf_datapointer(struct membuf *pBuf )
{ {
return ((void *)(pBuf->buf)); return ((void *)(pBuf->buf));
} }
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) );
} else { } else {
// recover our pBuf // recover our pBuf
pBuf = *((struct membuf **)(pLast)); 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. // by default - parameters are zero.
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 {
@ -90,7 +90,7 @@ membuf_new(void)
struct membuf * struct membuf *
membuf_grow( struct membuf *pBuf, int n ) membuf_grow(struct membuf *pBuf, int n )
{ {
void *vp; void *vp;
signed int newsize; signed int newsize;
@ -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;
@ -115,16 +115,16 @@ membuf_grow( struct membuf *pBuf, int n )
} }
void membuf_reset( struct membuf *pBuf ) void membuf_reset(struct membuf *pBuf )
{ {
pBuf->curlen = 0; pBuf->curlen = 0;
} }
void membuf_delete( struct membuf *pBuf ) void membuf_delete(struct membuf *pBuf )
{ {
if ( pBuf ){ if (pBuf ){
if ( pBuf->buf){ 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);
@ -136,18 +136,18 @@ void membuf_delete( struct membuf *pBuf )
} }
int int
membuf_sprintf( struct membuf *pBuf , const char *fmt, ... ) membuf_sprintf(struct membuf *pBuf , const char *fmt, ... )
{ {
int r; int r;
va_list ap; va_list ap;
va_start( ap, fmt ); va_start(ap, fmt );
r = membuf_vsprintf( pBuf, fmt, ap ); r = membuf_vsprintf(pBuf, fmt, ap );
va_end(ap); va_end(ap);
return r; return r;
} }
int 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; int r;
size_t sa; size_t sa;
@ -159,11 +159,11 @@ membuf_vsprintf( struct membuf *pBuf, const char *fmt, va_list ap )
sa = space_avail(pBuf); sa = space_avail(pBuf);
// do work // do work
r = vsnprintf( dataend( pBuf ), r = vsnprintf(dataend(pBuf ),
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,12 +182,12 @@ 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;
@ -198,33 +198,33 @@ membuf_vsprintf( struct membuf *pBuf, const char *fmt, va_list ap )
} }
struct membuf * 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 * 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; size_t sa;
int r; int r;
// how much room is there? // how much room is there?
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;
} }
} }
// append // append
memcpy( dataend(pBuf), memcpy(dataend(pBuf),
pData, pData,
len ); len );
pBuf->curlen += len; pBuf->curlen += len;

20
src/helper/membuf.h
View File

@ -30,7 +30,7 @@ struct membuf *membuf_new(void);
/** delete (destroy) the mem buffer /** delete (destroy) the mem buffer
* @param pBuf - buffer to release * @param pBuf - buffer to release
*/ */
void membuf_delete( struct membuf *pBuf ); void membuf_delete(struct membuf *pBuf );
/** grow/shrink a membuf by specified amount. /** grow/shrink a membuf by specified amount.
@ -39,14 +39,14 @@ void membuf_delete( struct membuf *pBuf );
* *
* Symantics of 'realloc()' return NULL on failure * 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()) /** how long is this buffer (memlen(), strlen())
* @param pBuf - the buffer * @param pBuf - the buffer
* *
* @returns: length of current 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. /** 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 * 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 /** sprintf() to the string buffer
@ -64,7 +64,7 @@ void membuf_reset( struct membuf *pBuf );
* Returns 0 on success * Returns 0 on success
* Returns non-zero on failure * 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 /** vsprintf() to the string buffer
* @param pBuf - buffer to capture sprintf() data into * @param pBuf - buffer to capture sprintf() data into
@ -74,7 +74,7 @@ int membuf_sprintf( struct membuf *pBuf , const char *fmt, ... );
* Returns 0 on success * Returns 0 on success
* Returns non-zero on failure * Returns non-zero on failure
*/ */
int membuf_vsprintf( struct membuf *pBuf , const char *fmt, va_list ap); int membuf_vsprintf(struct membuf *pBuf , const char *fmt, va_list ap);
/** Tokenize lines using strtok() /** Tokenize lines using strtok()
* @param pBuf - buffer to tokenize * @param pBuf - buffer to tokenize
@ -84,14 +84,14 @@ int membuf_vsprintf( struct membuf *pBuf , const char *fmt, va_list ap);
* *
* NOTE: This call is <b > destructive</b> to the buffer. * NOTE: This call is <b > destructive</b> 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 /** Return pointer to the memory in the buffer
* @param pBuf - buffer * @param pBuf - buffer
* *
* NOTE: Thou shall not modify this pointer, it is <b > CONST</b> * NOTE: Thou shall not modify this pointer, it is <b > CONST</b>
*/ */
const void *membuf_datapointer( struct membuf *pBuf ); const void *membuf_datapointer(struct membuf *pBuf );
/** Append data to the buffer /** Append data to the buffer
@ -102,7 +102,7 @@ const void *membuf_datapointer( struct membuf *pBuf );
* Modified symantics of "memcpy()". On memory allocation failure * Modified symantics of "memcpy()". On memory allocation failure
* returns NULL. On success, returns pointer to orginal membuf. * 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 /** 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 * Modified symantics of "strcat()". On memory allocation failure
* returns NULL. On success, returns pointer to orginal membuf. * 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 #endif