auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Replace 'while(' with 'while ('.

Browse Source 
git-svn-id: svn://svn.berlios.de/openocd/trunk@2358 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
zwelch
2009-06-23 22:36:11 +00:00
parent e43979e702
commit 50c086ffb9
24 changed files with 124 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/helper/command.c
+4 -4
View File
@@ -269,11 +269,11 @@ int unregister_all_commands(command_context_t *context)
if (context == NULL)
return ERROR_OK;
while(NULL != context->commands)
while (NULL != context->commands)
{
c = context->commands;
while(NULL != c->children)
while (NULL != c->children)
{
c2 = c->children;
c->children = c->children->next;
@@ -304,7 +304,7 @@ int unregister_command(command_context_t *context, char *name)
/* find command */
c = context->commands;
while(NULL != c)
while (NULL != c)
{
if (strcmp(name, c->name) == 0)
{
@@ -320,7 +320,7 @@ int unregister_command(command_context_t *context, char *name)
}
/* unregister children */
while(NULL != c->children)
while (NULL != c->children)
{
c2 = c->children;
c->children = c->children->next;
src/helper/jim-eventloop.c
+7 -7
View File
@@ -116,7 +116,7 @@ void Jim_DeleteFileHandler(Jim_Interp *interp, void *handle)
Jim_EventLoop *eventLoop = Jim_GetAssocData(interp, "eventloop");
fe = eventLoop->fileEventHead;
while(fe) {
while (fe) {
if (fe->handle == handle) {
if (prev == NULL)
eventLoop->fileEventHead = fe->next;
@@ -194,7 +194,7 @@ jim_wide Jim_DeleteTimeHandler(Jim_Interp *interp, jim_wide id)
te = eventLoop->timeEventHead;
if (id >= eventLoop->timeEventNextId)
return -2; /* wrong event ID */
while(te) {
while (te) {
if (te->id == id) {
remain = (te->when_sec - cur_sec) * 1000;
remain += (te->when_ms - cur_ms) ;
@@ -224,7 +224,7 @@ static Jim_TimeEvent *JimSearchNearestTimer(Jim_EventLoop *eventLoop)
Jim_TimeEvent *te = eventLoop->timeEventHead;
Jim_TimeEvent *nearest = NULL;
while(te) {
while (te) {
if (!nearest || te->when_sec < nearest->when_sec ||
(te->when_sec == nearest->when_sec &&
te->when_ms < nearest->when_ms))
@@ -319,7 +319,7 @@ int Jim_ProcessEvents(Jim_Interp *interp, int flags)
}
} else if (retval > 0) {
fe = eventLoop->fileEventHead;
while(fe != NULL) {
while (fe != NULL) {
int fd = fileno((FILE*)fe->handle);
// fprintf(stderr,"fd: %d mask: %02x \n",fd,fe->mask);
@@ -361,7 +361,7 @@ int Jim_ProcessEvents(Jim_Interp *interp, int flags)
/* Check time events */
te = eventLoop->timeEventHead;
maxId = eventLoop->timeEventNextId-1;
while(te) {
while (te) {
long now_sec, now_ms;
jim_wide id;
@@ -400,7 +400,7 @@ void JimELAssocDataDeleProc(Jim_Interp *interp, void *data)
Jim_EventLoop *eventLoop = data;
fe = eventLoop->fileEventHead;
while(fe) {
while (fe) {
next = fe->next;
if (fe->finalizerProc)
fe->finalizerProc(interp, fe->clientData);
@@ -409,7 +409,7 @@ void JimELAssocDataDeleProc(Jim_Interp *interp, void *data)
}
te = eventLoop->timeEventHead;
while(te) {
while (te) {
next = te->next;
if (te->finalizerProc)
te->finalizerProc(interp, te->clientData);
src/helper/jim.c
+43 -43
View File
@@ -245,7 +245,7 @@ static jim_wide JimStrtoll(const char *nptr, char **endptr, register int base)
static int JimStringMatch(const char *pattern, int patternLen,
const char *string, int stringLen, int nocase)
{
while(patternLen) {
while (patternLen) {
switch(pattern[0]) {
case '*':
while (pattern[1] == '*') {
@@ -254,7 +254,7 @@ static int JimStringMatch(const char *pattern, int patternLen,
}
if (patternLen == 1)
return 1; /* match */
while(stringLen) {
while (stringLen) {
if (JimStringMatch(pattern+1, patternLen-1,
string, stringLen, nocase))
return 1; /* match */
@@ -281,7 +281,7 @@ static int JimStringMatch(const char *pattern, int patternLen,
patternLen--;
}
match = 0;
while(1) {
while (1) {
if (pattern[0] == '\\') {
pattern++;
patternLen--;
@@ -352,7 +352,7 @@ static int JimStringMatch(const char *pattern, int patternLen,
pattern++;
patternLen--;
if (stringLen == 0) {
while(*pattern == '*') {
while (*pattern == '*') {
pattern++;
patternLen--;
}
@@ -370,7 +370,7 @@ int JimStringCompare(const char *s1, int l1, const char *s2, int l2,
unsigned char *u1 = (unsigned char*) s1, *u2 = (unsigned char*) s2;
if (nocase == 0) {
while(l1 && l2) {
while (l1 && l2) {
if (*u1 != *u2)
return (int)*u1-*u2;
u1++; u2++; l1--; l2--;
@@ -378,7 +378,7 @@ int JimStringCompare(const char *s1, int l1, const char *s2, int l2,
if (!l1 && !l2) return 0;
return l1-l2;
} else {
while(l1 && l2) {
while (l1 && l2) {
if (tolower((int)*u1) != tolower((int)*u2))
return tolower((int)*u1)-tolower((int)*u2);
u1++; u2++; l1--; l2--;
@@ -424,7 +424,7 @@ int Jim_StringToWide(const char *str, jim_wide *widePtr, int base)
if ((str[0] == '\0') || (str == endptr) )
return JIM_ERR;
if (endptr[0] != '\0') {
while(*endptr) {
while (*endptr) {
if (!isspace((int)*endptr))
return JIM_ERR;
endptr++;
@@ -441,7 +441,7 @@ int Jim_StringToIndex(const char *str, int *intPtr)
if ( (str[0] == '\0') || (str == endptr) )
return JIM_ERR;
if (endptr[0] != '\0') {
while(*endptr) {
while (*endptr) {
if (!isspace((int)*endptr))
return JIM_ERR;
endptr++;
@@ -473,7 +473,7 @@ int Jim_DoubleToString(char *buf, double doubleValue)
len = sprintf(buf, "%.17g", doubleValue);
s = buf;
while(*s) {
while (*s) {
if (*s == '.') return len;
s++;
}
@@ -661,7 +661,7 @@ unsigned int Jim_IdentityHashFunction(unsigned int key)
unsigned int Jim_GenHashFunction(const unsigned char *buf, int len)
{
unsigned int h = 0;
while(len--)
while (len--)
h += (h<<3)+*buf++;
return h;
}
@@ -729,7 +729,7 @@ int Jim_ExpandHashTable(Jim_HashTable *ht, unsigned int size)
/* For each hash entry on this slot... */
he = ht->table[i];
while(he) {
while (he) {
unsigned int h;
nextHe = he->next;
@@ -802,7 +802,7 @@ int Jim_DeleteHashEntry(Jim_HashTable *ht, const void *key)
he = ht->table[h];
prevHe = NULL;
while(he) {
while (he) {
if (Jim_CompareHashKeys(ht, key, he->key)) {
/* Unlink the element from the list */
if (prevHe)
@@ -831,7 +831,7 @@ int Jim_FreeHashTable(Jim_HashTable *ht)
Jim_HashEntry *he, *nextHe;
if ((he = ht->table[i]) == NULL) continue;
while(he) {
while (he) {
nextHe = he->next;
Jim_FreeEntryKey(ht, he);
Jim_FreeEntryVal(ht, he);
@@ -855,7 +855,7 @@ Jim_HashEntry *Jim_FindHashEntry(Jim_HashTable *ht, const void *key)
if (ht->size == 0) return NULL;
h = Jim_HashKey(ht, key) & ht->sizemask;
he = ht->table[h];
while(he) {
while (he) {
if (Jim_CompareHashKeys(ht, key, he->key))
return he;
he = he->next;
@@ -916,7 +916,7 @@ static unsigned int JimHashTableNextPower(unsigned int size)
if (size >= 2147483648U)
return 2147483648U;
while(1) {
while (1) {
if (i >= size)
return i;
i *= 2;
@@ -938,7 +938,7 @@ static int JimInsertHashEntry(Jim_HashTable *ht, const void *key)
h = Jim_HashKey(ht, key) & ht->sizemask;
/* Search if this slot does not already contain the given key */
he = ht->table[h];
while(he) {
while (he) {
if (Jim_CompareHashKeys(ht, key, he->key))
return -1;
he = he->next;
@@ -1180,7 +1180,7 @@ void JimParserInit(struct JimParserCtx *pc, const char *prg,
int JimParseScript(struct JimParserCtx *pc)
{
while(1) { /* the while is used to reiterate with continue if needed */
while (1) { /* the while is used to reiterate with continue if needed */
if (!pc->len) {
pc->tstart = pc->p;
pc->tend = pc->p-1;
@@ -1657,7 +1657,7 @@ int Jim_ScriptIsComplete(const char *s, int len, char *stateCharPtr)
int level = 0;
int state = ' ';
while(len) {
while (len) {
switch (*s) {
case '\\':
if (len > 1)
@@ -2341,7 +2341,7 @@ static Jim_Obj *Jim_FormatString_Inner(Jim_Interp *interp, Jim_Obj *fmtObjPtr,
case '8':
case '9':
accum = 0;
while( isdigit(*fmt) && (fmtLen > 0) ){
while ( isdigit(*fmt) && (fmtLen > 0) ){
accum = (accum * 10) + (*fmt - '0');
fmt++; fmtLen--;
}
@@ -3029,7 +3029,7 @@ int SetScriptFromAny(Jim_Interp *interp, struct Jim_Obj *objPtr)
}
JimParserInit(&parser, scriptText, scriptTextLen, initialLineNumber);
while(!JimParserEof(&parser)) {
while (!JimParserEof(&parser)) {
char *token;
int len, type, linenr;
@@ -3621,7 +3621,7 @@ int Jim_SetVariableLink(Jim_Interp *interp, Jim_Obj *nameObjPtr,
Jim_Obj *objPtr = targetNameObjPtr;
Jim_Var *varPtr;
/* Cycles are only possible with 'uplevel 0' */
while(1) {
while (1) {
if (Jim_StringEqObj(objPtr, nameObjPtr, 0)) {
Jim_SetResultString(interp,
"can't upvar from variable to itself", -1);
@@ -4262,7 +4262,7 @@ int Jim_Collect(Jim_Interp *interp)
* is of a type that can contain references. */
Jim_InitHashTable(&marks, &JimRefMarkHashTableType, NULL);
objPtr = interp->liveList;
while(objPtr) {
while (objPtr) {
if (objPtr->typePtr == NULL ||
objPtr->typePtr->flags & JIM_TYPE_REFERENCES) {
const char *str, *p;
@@ -4291,7 +4291,7 @@ int Jim_Collect(Jim_Interp *interp)
continue;
}
/* Extract references from the object string repr. */
while(1) {
while (1) {
int i;
jim_wide id;
char buf[21];
@@ -4488,7 +4488,7 @@ void Jim_FreeInterp(Jim_Interp *i)
Jim_FreeHashTable(&i->packages);
Jim_Free(i->prngState);
/* Free the call frames list */
while(cf) {
while (cf) {
prevcf = cf->parentCallFrame;
JimFreeCallFrame(i, cf, JIM_FCF_NONE);
cf = prevcf;
@@ -4500,7 +4500,7 @@ void Jim_FreeInterp(Jim_Interp *i)
Jim_fprintf( i, i->cookie_stdout,JIM_NL "-------------------------------------" JIM_NL);
Jim_fprintf( i, i->cookie_stdout,"Objects still in the free list:" JIM_NL);
while(objPtr) {
while (objPtr) {
const char *type = objPtr->typePtr ?
objPtr->typePtr->name : "";
Jim_fprintf( i, i->cookie_stdout,"%p \"%-10s\": '%.20s' (refCount: %d)" JIM_NL,
@@ -4526,7 +4526,7 @@ void Jim_FreeInterp(Jim_Interp *i)
}
/* Free cached CallFrame structures */
cf = i->freeFramesList;
while(cf) {
while (cf) {
nextcf = cf->nextFramePtr;
if (cf->vars.table != NULL)
Jim_Free(cf->vars.table);
@@ -5102,7 +5102,7 @@ char *BackslashQuoteString(const char *s, int len, int *qlenPtr)
char *q = Jim_Alloc(len*2+1), *p;
p = q;
while(*s) {
while (*s) {
switch (*s) {
case ' ':
case '$':
@@ -5215,7 +5215,7 @@ int SetListFromAny(Jim_Interp *interp, struct Jim_Obj *objPtr)
/* Convert into a list */
JimParserInit(&parser, str, strLen, 1);
while(!JimParserEof(&parser)) {
while (!JimParserEof(&parser)) {
char *token;
int tokenLen, type;
Jim_Obj *elementPtr;
@@ -5794,7 +5794,7 @@ int SetDictFromAny(Jim_Interp *interp, struct Jim_Obj *objPtr)
/* Convert into a dict */
JimParserInit(&parser, str, strLen, 1);
i = 0;
while(!JimParserEof(&parser)) {
while (!JimParserEof(&parser)) {
char *token;
int tokenLen, type;
@@ -6276,7 +6276,7 @@ static struct Jim_ExprOperator Jim_ExprOperators[] = {
int JimParseExpression(struct JimParserCtx *pc)
{
/* Discard spaces and quoted newline */
while(*(pc->p) == ' ' ||
while (*(pc->p) == ' ' ||
*(pc->p) == '\t' ||
*(pc->p) == '\r' ||
*(pc->p) == '\n' ||
@@ -6623,7 +6623,7 @@ static void ExprMakeLazy(Jim_Interp *interp, ExprByteCode *expr)
/* Search for the end of the first operator */
leftindex = index-1;
arity = 1;
while(arity) {
while (arity) {
switch(expr->opcode[leftindex]) {
case JIM_EXPROP_NUMBER:
case JIM_EXPROP_COMMAND:
@@ -6697,7 +6697,7 @@ int SetExprFromAny(Jim_Interp *interp, struct Jim_Obj *objPtr)
Jim_InitStack(&stack);
JimParserInit(&parser, exprText, exprTextLen, 1);
while(!JimParserEof(&parser)) {
while (!JimParserEof(&parser)) {
char *token;
int len, type;
@@ -6731,7 +6731,7 @@ int SetExprFromAny(Jim_Interp *interp, struct Jim_Obj *objPtr)
break;
case JIM_TT_EXPR_OPERATOR:
op = JimExprOperatorInfo(token);
while(1) {
while (1) {
Jim_ExprOperator *stackTopOp;
if (Jim_StackPeek(&stack) != NULL) {
@@ -6758,7 +6758,7 @@ int SetExprFromAny(Jim_Interp *interp, struct Jim_Obj *objPtr)
case JIM_TT_SUBEXPR_END:
{
int found = 0;
while(Jim_StackLen(&stack)) {
while (Jim_StackLen(&stack)) {
char *opstr = Jim_StackPop(&stack);
if (!strcmp(opstr, "(")) {
Jim_Free(opstr);
@@ -9094,7 +9094,7 @@ int SetSubstFromAny(Jim_Interp *interp, struct Jim_Obj *objPtr, int flags)
script->fileName = NULL;
JimParserInit(&parser, scriptText, scriptTextLen, 1);
while(1) {
while (1) {
char *token;
int len, type, linenr;
@@ -11138,7 +11138,7 @@ static Jim_Obj *JimStringMap(Jim_Interp *interp, Jim_Obj *mapListObjPtr,
}
str = Jim_GetString(objPtr, &strLen);
/* Map it */
while(strLen) {
while (strLen) {
for (i = 0; i < numMaps; i++) {
if (strLen >= keyLen[i] && keyLen[i]) {
if (!JimStringCompare(str, keyLen[i], key[i], keyLen[i],
@@ -11630,7 +11630,7 @@ static int Jim_SubstCoreCommand(Jim_Interp *interp, int argc,
return JIM_ERR;
}
i = argc-2;
while(i--) {
while (i--) {
if (Jim_CompareStringImmediate(interp, argv[i+1],
"-nobackslashes"))
flags |= JIM_SUBST_NOESC;
@@ -12283,7 +12283,7 @@ void Jim_RegisterCoreCommands(Jim_Interp *interp)
{
int i = 0;
while(Jim_CoreCommandsTable[i].name != NULL) {
while (Jim_CoreCommandsTable[i].name != NULL) {
Jim_CreateCommand(interp,
Jim_CoreCommandsTable[i].name,
Jim_CoreCommandsTable[i].cmdProc,
@@ -12361,7 +12361,7 @@ int Jim_InteractivePrompt(Jim_Interp *interp)
Jim_fflush( interp, interp->cookie_stdout);
scriptObjPtr = Jim_NewStringObj(interp, "", 0);
Jim_IncrRefCount(scriptObjPtr);
while(1) {
while (1) {
const char *str;
char state;
int len;
@@ -12457,7 +12457,7 @@ char* Jim_fgets( Jim_Interp *interp, char *s, int size, void *cookie )
Jim_Nvp *
Jim_Nvp_name2value_simple( const Jim_Nvp *p, const char *name )
{
while( p->name ){
while ( p->name ){
if ( 0 == strcmp( name, p->name ) ){
break;
}
@@ -12469,7 +12469,7 @@ Jim_Nvp_name2value_simple( const Jim_Nvp *p, const char *name )
Jim_Nvp *
Jim_Nvp_name2value_nocase_simple( const Jim_Nvp *p, const char *name )
{
while( p->name ){
while ( p->name ){
if ( 0 == strcasecmp( name, p->name ) ){
break;
}
@@ -12553,7 +12553,7 @@ Jim_Nvp_value2name_obj( Jim_Interp *interp, const Jim_Nvp *p, Jim_Obj *o, Jim_Nv
Jim_Nvp *
Jim_Nvp_value2name_simple( const Jim_Nvp *p, int value )
{
while( p->name ){
while ( p->name ){
if ( value == p->value ){
break;
}
@@ -12792,7 +12792,7 @@ Jim_SetResult_NvpUnknown( Jim_Interp *interp,
"Unknown param: %s, try one of: ",
Jim_GetString( param_value, NULL ) );
}
while( nvp->name ){
while ( nvp->name ){
const char *a;
const char *b;
src/helper/jim.h
+5 -5
View File
@@ -241,7 +241,7 @@ typedef struct Jim_HashTableIterator {
entry->val = (ht)->type->valDup((ht)->privdata, _val_); \
else \
entry->val = (_val_); \
} while(0)
} while (0)
#define Jim_FreeEntryKey(ht, entry) \
if ((ht)->type->keyDestructor) \
@@ -252,7 +252,7 @@ typedef struct Jim_HashTableIterator {
entry->key = (ht)->type->keyDup((ht)->privdata, _key_); \
else \
entry->key = (_key_); \
} while(0)
} while (0)
#define Jim_CompareHashKeys(ht, key1, key2) \
(((ht)->type->keyCompare) ? \
@@ -555,7 +555,7 @@ typedef struct Jim_Interp {
Jim_IncrRefCount(_resultObjPtr_); \
Jim_DecrRefCount(i,(i)->result); \
(i)->result = _resultObjPtr_; \
} while(0)
} while (0)
/* Reference structure. The interpreter pointer is held within privdata member in HashTable */
#define JIM_REFERENCE_TAGLEN 7 /* The tag is fixed-length, because the reference
@@ -985,7 +985,7 @@ typedef struct jim_getopt {
*
* Jim_GetOpt_Setup( &goi, interp, argc, argv );
*
* while( goi.argc ){
* while ( goi.argc ){
* e = Jim_GetOpt_Nvp( &goi, nvp_options, &n );
* if ( e != JIM_OK ){
* Jim_GetOpt_NvpUnknown( &goi, nvp_options, 0 );
@@ -1102,7 +1102,7 @@ JIM_STATIC int JIM_API( Jim_GetOpt_Nvp)( Jim_GetOptInfo *goi, const Jim_Nvp *loo
* Example:
* \code
*
* while( goi.argc ){
* while ( goi.argc ){
* // Get the next option
* e = Jim_GetOpt_Nvp( &goi, cmd_options, &n );
* if ( e != JIM_OK ){