silence -Wparentheses and -Wparentheses-equality

This commit is contained in:
Viktor Szakats 2024-04-01 11:59:36 +00:00 committed by Daniel Stenberg
parent 24c1067ba6
commit 042f6d3a18
7 changed files with 13 additions and 13 deletions

4
cpp1.c
View File

@ -288,7 +288,7 @@ ReturnCode cppmain(struct Global *global)
unget(global); /* Reread the char. */
for (;;) { /* For the whole line, */
do { /* Token concat. loop */
for (global->chpos = counter = 0; (type[(c = get(global))] == SPA);) {
for (global->chpos = counter = 0; type[(c = get(global))] == SPA;) {
#if COMMENT_INVISIBLE
if (c != COM_SEP)
counter++;
@ -309,7 +309,7 @@ ReturnCode cppmain(struct Global *global)
Putstring(global, global->spacebuf); /* Output all whitespaces */
}
}
if(ret=macroid(global, &c)) /* Grab the token */
if((ret=macroid(global, &c))!=0) /* Grab the token */
return(ret);
} while (type[c] == LET && catenate(global, &ret) && !ret);
if(ret)

8
cpp2.c
View File

@ -205,7 +205,7 @@ ReturnCode control( struct Global *global,
while( c != '\n' && c != EOF_CHAR )
{
if( ret = save( global, c ) )
if( ( ret = save( global, c ) ) != 0 )
return(ret);
c = get( global );
@ -213,7 +213,7 @@ ReturnCode control( struct Global *global,
unget( global );
if( ret = save( global, EOS ) )
if( ( ret = save( global, EOS ) ) != 0 )
return(ret);
/*
@ -559,7 +559,7 @@ ReturnCode doinclude( struct Global *global )
delim = skipws( global );
if( ret = macroid( global, &delim ) )
if( ( ret = macroid( global, &delim ) ) != 0 )
return(ret);
if( delim != '<' && delim != '"' )
@ -575,7 +575,7 @@ ReturnCode doinclude( struct Global *global )
global->workp = global->work;
while( (c = get(global)) != '\n' && c != EOF_CHAR )
if( ret = save( global, c ) ) /* Put it away. */
if( ( ret = save( global, c ) ) != 0 ) /* Put it away. */
return( ret );
unget( global ); /* Force nl after include */

2
cpp3.c
View File

@ -198,7 +198,7 @@ int dooptions(struct Global *global, struct fppTag *tags)
char *text=(char *)tags->data;
sizp = size_table;
if (isdatum = (*text != '*')) /* If it's just -S, */
if ((isdatum = (*text != '*'))!=0) /* If it's just -S, */
endtest = T_FPTR; /* Stop here */
else { /* But if it's -S* */
text++; /* Step over '*' */

2
cpp4.c
View File

@ -143,7 +143,7 @@ ReturnCode dodefine(struct Global *global)
}
while (global->workp > global->work && type[global->workp[-1]] == SPA)
--global->workp; /* Erase leading spaces */
if(ret=save(global, TOK_SEP)) /* Stuff a delimiter */
if((ret=save(global, TOK_SEP))!=0) /* Stuff a delimiter */
return(ret);
c = skipws(global); /* Eat whitespace */
continue;

4
cpp5.c
View File

@ -394,7 +394,7 @@ ReturnCode evallex(struct Global *global,
loop=FALSE;
do { /* Collect the token */
c = skipws(global);
if(ret=macroid(global, &c))
if((ret=macroid(global, &c))!=0)
return(ret);
if (c == EOF_CHAR || c == '\n') {
unget(global);
@ -535,7 +535,7 @@ ReturnCode dosizeof(struct Global *global, int *result)
*/
typecode = 0;
while ((c = skipws(global))) {
if(ret=macroid(global, &c))
if((ret=macroid(global, &c))!=0)
return(ret);
/* (I) return on fail! */
if (c == EOF_CHAR || c == '\n') {

2
cpp6.c
View File

@ -193,7 +193,7 @@ ReturnCode macroid(struct Global *global, int *c)
if (global->infile != NULL && global->infile->fp != NULL)
global->recursion = 0;
while (type[*c] == LET && (dp = lookid(global, *c)) != NULL) {
if(ret=expand(global, dp))
if((ret=expand(global, dp))!=0)
return(ret);
*c = get(global);
}

View File

@ -288,7 +288,7 @@ char GetPrefs(struct fppTag **tagptr, char **string)
Length_U = ftell(PrefsFile_PF);
fseek(PrefsFile_PF, 0, SEEK_SET);
if (*string = (char *)malloc(Length_U+1)) {
if ((*string = (char *)malloc(Length_U+1))!=NULL) {
fread(*string, 1, Length_U, PrefsFile_PF);
(*string)[Length_U] = '\0';
@ -301,7 +301,7 @@ char GetPrefs(struct fppTag **tagptr, char **string)
}
}
if(environ = getenv("CPP_PREFS")) {
if((environ = getenv("CPP_PREFS"))!=NULL) {
ret= !DoString(tagptr, environ);
if(ret && *string)
free( *string );