Browse Source

Remove whitespace at end of lines, step 2.

- Replace '\s*$' with ''.


git-svn-id: svn://svn.berlios.de/openocd/trunk@2398 b42882b7-edfa-0310-969c-e2dbd0fdcd60
tags/v0.2.0
zwelch 15 years ago
parent
commit
fddbc58091
3 changed files with 183 additions and 183 deletions
  1. +172
    -172
      src/flash/at91sam3.c
  2. +4
    -4
      src/helper/membuf.c
  3. +7
    -7
      src/helper/membuf.h

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


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

@@ -29,7 +29,7 @@ struct membuf {
// buflen is alway "+1" bigger then
// what is shown here, the +1 is for
// the NULL string terminator
#define DEFAULT_BUFSIZE 100
#define DEFAULT_BUFSIZE 100
size_t maxlen; // allocated size
size_t curlen; // where we are inserting at
char *_strtoklast;
@@ -40,7 +40,7 @@ struct membuf {
#define space_avail(pBuf) (pBuf->maxlen - pBuf->curlen)
#define dataend(pBuf) (((char *)(pBuf->buf)) + pBuf->curlen)

size_t
size_t
membuf_len(struct membuf *pBuf)
{
return pBuf->curlen;
@@ -65,7 +65,7 @@ membuf_strtok(struct membuf *pBuf, const char *sep, void **pLast)
return strtok_r(NULL, sep, &(pBuf->_strtoklast));
}
}


struct membuf *
@@ -161,7 +161,7 @@ membuf_vsprintf(struct membuf *pBuf, const char *fmt, va_list ap)
// do work
r = vsnprintf(dataend(pBuf),
sa,
fmt,
fmt,
ap);
if ((r > 0) && (((size_t)(r)) < sa)) {
// Success!


+ 7
- 7
src/helper/membuf.h View File

@@ -12,14 +12,14 @@
* This is a simple 'string buffer' that auto-grows.
*
* More correctly put, this is a "memory buffer"
* it may contain binary data
*
* it may contain binary data
*
* Note: Internally the buffer always has a 'null terminator'
*/

/* contents of this structure are 'opaque' */
struct membuf;

/** Create a new membuf
* By default the memory buffer has "some non-zero-size"
@@ -34,7 +34,7 @@ void membuf_delete(struct membuf *pBuf);


/** grow/shrink a membuf by specified amount.
* @param pBuf - the buffer
* @param pBuf - the buffer
* @param amount - the amount to grow or shrink by.
*
* Symantics of 'realloc()' return NULL on failure
@@ -43,7 +43,7 @@ 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);
@@ -76,10 +76,10 @@ int membuf_sprintf(struct membuf *pBuf , const char *fmt, ...);
*/
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 delim - delimiter parameter for strtok_r()
*
*
* Identical to "strtok()" - pass "pBuff = NULL" on second call
*
* NOTE: This call is <b > destructive</b> to the buffer.


Loading…
Cancel
Save