Skip to content

Commit d28f414

Browse files
doxygendoxygen
committed
Fix a number of use-of-comma-operator related warnings
1 parent 7029c37 commit d28f414

File tree

7 files changed

+185
-56
lines changed

7 files changed

+185
-56
lines changed

‎src/code.l‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3369,8 +3369,16 @@ static void generateFunctionLink(yyscan_t yyscanner,OutputCodeList &ol,const QCS
33693369
// See also bug 549022.
33703370
goto exit;
33713371
}
3372-
if (i==-1) i=locFunc.findRev("."),len=1;
3373-
if (i==-1) i=locFunc.findRev("\\"),len=1; // for PHP
3372+
if (i==-1)
3373+
{
3374+
i=locFunc.findRev(".");
3375+
len=1;
3376+
}
3377+
if (i==-1)
3378+
{
3379+
i=locFunc.findRev("\\");
3380+
len=1; // for PHP
3381+
}
33743382
if (i>0)
33753383
{
33763384
funcScope=locFunc.left(i);

‎src/plantuml.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ StringVector PlantumlManager::writePlantUMLSource(const QCString &outDirArg,cons
9999
switch (state)
100100
{
101101
case InName: // looking for the name part
102-
if (isId(c) || c=='-') inpName+=c;
103-
else if (c=='.') state=InExt;
104-
else rest+=c, state=InRest;
102+
if (isId(c) || c=='-') { inpName+=c; }
103+
else if (c=='.') { state=InExt; }
104+
else { rest+=c; state=InRest; }
105105
break;
106106
case InExt: // skipping over extension part
107-
if (!isId(c) && c!='-') rest+=c, state=InRest;
107+
if (!isId(c) && c!='-') { rest+=c; state=InRest; }
108108
break;
109109
case InRest: // gather rest until new line
110110
rest+=c;

‎src/pre.l‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2590,8 +2590,15 @@ static inline void addTillEndOfString(yyscan_t yyscanner,const QCString &expr,QC
25902590
int cc;
25912591
while ((cc=getNextChar(yyscanner,expr,rest,pos))!=EOF && cc!=0)
25922592
{
2593-
if (cc=='\\') arg+=(char)cc,cc=getNextChar(yyscanner,expr,rest,pos);
2594-
else if (cc==term) return;
2593+
if (cc=='\\')
2594+
{
2595+
arg+=(char)cc;
2596+
cc=getNextChar(yyscanner,expr,rest,pos);
2597+
}
2598+
else if (cc==term)
2599+
{
2600+
return;
2601+
}
25952602
arg+=(char)cc;
25962603
}
25972604
}
@@ -3379,13 +3386,22 @@ static QCString removeMarkers(const QCString &s)
33793386
while (*p && !(pc=='*' && c=='/')) // search end of comment
33803387
{
33813388
if (*p=='@' && *(p+1)=='@')
3382-
result+=c,p++;
3389+
{
3390+
result+=c;
3391+
p++;
3392+
}
33833393
else
3394+
{
33843395
result+=c;
3396+
}
33853397
pc=c;
33863398
c=*++p;
33873399
}
3388-
if (*p) result+=c,p++;
3400+
if (*p)
3401+
{
3402+
result+=c;
3403+
p++;
3404+
}
33893405
}
33903406
}
33913407
break;

‎src/qcstring.cpp‎

Lines changed: 117 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -273,44 +273,70 @@ long QCString::toLong(bool *ok,int base) const
273273
if ( !p )
274274
goto bye;
275275
while ( l && qisspace(*p) ) // skip leading space
276-
l--,p++;
277-
if ( l && *p == '-' ) {
276+
{
277+
l--;
278+
p++;
279+
}
280+
if ( l && *p == '-' )
281+
{
278282
l--;
279283
p++;
280284
neg = 1;
281-
} else if ( *p == '+' ) {
285+
} else if ( *p == '+' )
286+
{
282287
l--;
283288
p++;
284289
}
285290

286291
// NOTE: toULong() code is similar
287292
if ( !l || !ok_in_base(*p,base) )
293+
{
288294
goto bye;
289-
while ( l && ok_in_base(*p,base) ) {
295+
}
296+
while ( l && ok_in_base(*p,base) )
297+
{
290298
l--;
291299
int dv = 0;
292-
if ( *p>='0' && *p<='9' ) {
300+
if ( *p>='0' && *p<='9' )
301+
{
293302
dv = *p-'0';
294-
} else {
303+
}
304+
else
305+
{
295306
if ( *p >= 'a' && *p <= 'z' )
307+
{
296308
dv = *p - 'a' + 10;
309+
}
297310
else
311+
{
298312
dv = *p - 'A' + 10;
313+
}
299314
}
300315
if ( val > max_mult || (val == max_mult && dv > (INT_MAX%base)+neg) )
316+
{
301317
goto bye;
318+
}
302319
val = base*val + dv;
303320
p++;
304321
}
305322
if ( neg )
323+
{
306324
val = -val;
325+
}
307326
while ( l && qisspace(*p) ) // skip trailing space
308-
l--,p++;
327+
{
328+
l--;
329+
p++;
330+
}
309331
if ( !l )
332+
{
310333
is_ok = TRUE;
334+
}
311335
bye:
312336
if ( ok )
337+
{
313338
*ok = is_ok;
339+
}
314340
return is_ok ? val : 0;
315341
}
316342

@@ -322,39 +348,66 @@ unsigned long QCString::toULong(bool *ok,int base) const
322348
const unsigned long max_mult = 429496729; // UINT_MAX/10, rounded down
323349
bool is_ok = FALSE;
324350
if ( !p )
351+
{
325352
goto bye;
353+
}
326354
while ( l && qisspace(*p) ) // skip leading space
327-
l--,p++;
355+
{
356+
l--;
357+
p++;
358+
}
328359
if ( *p == '+' )
329-
l--,p++;
360+
{
361+
l--;
362+
p++;
363+
}
330364

331365
// NOTE: toLong() code is similar
332366
if ( !l || !ok_in_base(*p,base) )
367+
{
333368
goto bye;
334-
while ( l && ok_in_base(*p,base) ) {
369+
}
370+
while ( l && ok_in_base(*p,base) )
371+
{
335372
l--;
336373
uint32_t dv = 0;
337-
if ( *p>='0' && *p<='9' ) {
374+
if ( *p>='0' && *p<='9' )
375+
{
338376
dv = *p-'0';
339-
} else {
377+
}
378+
else
379+
{
340380
if ( *p >= 'a' && *p <= 'z' )
381+
{
341382
dv = *p - 'a' + 10;
383+
}
342384
else
385+
{
343386
dv = *p - 'A' + 10;
387+
}
344388
}
345389
if ( val > max_mult || (val == max_mult && dv > (UINT_MAX%base)) )
390+
{
346391
goto bye;
392+
}
347393
val = base*val + dv;
348394
p++;
349395
}
350396

351397
while ( l && qisspace(*p) ) // skip trailing space
352-
l--,p++;
398+
{
399+
l--;
400+
p++;
401+
}
353402
if ( !l )
403+
{
354404
is_ok = TRUE;
405+
}
355406
bye:
356407
if ( ok )
408+
{
357409
*ok = is_ok;
410+
}
358411
return is_ok ? val : 0;
359412
}
360413

@@ -366,81 +419,111 @@ uint64_t QCString::toUInt64(bool *ok,int base) const
366419
const uint64_t max_mult = 1844674407370955161ULL; // ULLONG_MAX/10, rounded down
367420
bool is_ok = FALSE;
368421
if ( !p )
422+
{
369423
goto bye;
424+
}
370425
while ( l && qisspace(*p) ) // skip leading space
371-
l--,p++;
426+
{
427+
l--;
428+
p++;
429+
}
372430
if ( *p == '+' )
373-
l--,p++;
431+
{
432+
l--;
433+
p++;
434+
}
374435

375436
// NOTE: toULong() code is similar
376437
if ( !l || !ok_in_base(*p,base) )
438+
{
377439
goto bye;
378-
while ( l && ok_in_base(*p,base) ) {
440+
}
441+
while ( l && ok_in_base(*p,base) )
442+
{
379443
l--;
380444
uint32_t dv = 0;
381-
if ( *p>='0' && *p<='9' ) {
445+
if ( *p>='0' && *p<='9' )
446+
{
382447
dv = *p-'0';
383-
} else {
448+
}
449+
else
450+
{
384451
if ( *p >= 'a' && *p <= 'z' )
452+
{
385453
dv = *p - 'a' + 10;
454+
}
386455
else
456+
{
387457
dv = *p - 'A' + 10;
458+
}
388459
}
389460
if ( val > max_mult || (val == max_mult && dv > (ULLONG_MAX%base)) )
461+
{
390462
goto bye;
463+
}
391464
val = base*val + dv;
392465
p++;
393466
}
394467

395468
while ( l && qisspace(*p) ) // skip trailing space
396-
l--,p++;
469+
{
470+
l--;
471+
p++;
472+
}
397473
if ( !l )
474+
{
398475
is_ok = TRUE;
476+
}
399477
bye:
400478
if ( ok )
479+
{
401480
*ok = is_ok;
481+
}
402482
return is_ok ? val : 0;
403483
}
404484

405485
//-------------------------------------------------
406486

407487
void *qmemmove( void *dst, const void *src, size_t len )
408488
{
409-
if ( dst > src ) {
489+
if ( dst > src )
490+
{
410491
char *d = static_cast<char *>(dst) + len - 1;
411492
const char *s = static_cast<const char *>(src) + len - 1;
412493
while ( len-- )
494+
{
413495
*d-- = *s--;
496+
}
414497
}
415-
else if ( dst < src ) {
498+
else if ( dst < src )
499+
{
416500
char *d = static_cast<char *>(dst);
417501
const char *s = static_cast<const char *>(src);
418502
while ( len-- )
503+
{
419504
*d++ = *s++;
505+
}
420506
}
421507
return dst;
422508
}
423509

424510
char *qstrdup( const char *str )
425511
{
426-
if ( !str )
427-
return nullptr;
512+
if ( !str ) return nullptr;
428513
char *dst = new char[qstrlen(str)+1];
429514
return strcpy( dst, str );
430515
}
431516

432517
void qstrfree( const char *str )
433518
{
434-
delete[](str);
519+
delete [](str);
435520
}
436521

437522
char *qstrncpy( char *dst, const char *src, size_t len )
438523
{
439-
if ( !src )
440-
return nullptr;
524+
if ( !src ) return nullptr;
441525
strncpy( dst, src, len );
442-
if ( len > 0 )
443-
dst[len-1] = '\0';
526+
if ( len > 0 ) dst[len-1] = '\0';
444527
return dst;
445528
}
446529

@@ -455,7 +538,9 @@ int qstricmp( const char *s1, const char *s2 )
455538
for ( ; !(res = ((c=toLowerChar(*s1)) - toLowerChar(*s2))); s1++, s2++ )
456539
{
457540
if ( !c ) // strings are equal
541+
{
458542
break;
543+
}
459544
}
460545
return res;
461546
}
@@ -471,9 +556,13 @@ int qstrnicmp( const char *s1, const char *s2, size_t len )
471556
char c = toLowerChar(*s1);
472557
int res = c-toLowerChar(*s2);
473558
if ( res!=0 ) // strings are not equal
559+
{
474560
return res;
561+
}
475562
if ( c==0 ) // strings are equal
563+
{
476564
break;
565+
}
477566
}
478567
return 0;
479568
}

0 commit comments

Comments
 (0)