research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added parenthesis to avoid warning messages.

Browse source
This commit is contained in:
Harry Moffat 2009-12-21 17:56:40 +00:00
parent 44dc8c9084
commit ee68428951
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ext/f2c_libs/lread.c
View file

@ -107,7 +107,7 @@ flag f__lquit;
int f__lcount,f__ltype,nml_read;
char *f__lchar;
double f__lx,f__ly;
#define ERR(x) if(n=(x)) return(n)
#define ERR(x) if((n=(x))) return(n)
#define GETC(x) (x=(*l_getc)())
#define Ungetc(x,y) (*l_ungetc)(x,y)
@ -292,11 +292,12 @@ l_C(Void)
f__lquit = 2;
return 0;
}
if (rd_count(ch))
if (rd_count(ch)) {
if(!f__cf || !feof(f__cf))
errfl(f__elist->cierr,112,"complex format");
else
err(f__elist->cierr,(EOF),"lread");
}
if(GETC(ch)!='*')
{
if(!f__cf || !feof(f__cf))
@ -315,7 +316,7 @@ l_C(Void)
Ungetc(ch,f__cf);
nml_save = nml_read;
nml_read = 0;
if (ch = l_R(1,0))
if ((ch = l_R(1,0)))
return ch;
if (!f__ltype)
errfl(f__elist->cierr,112,"no real part");
@ -327,7 +328,7 @@ l_C(Void)
}
while(iswhit(GETC(ch)));
(void) Ungetc(ch,f__cf);
if (ch = l_R(1,0))
if ((ch = l_R(1,0)))
return ch;
if (!f__ltype)
errfl(f__elist->cierr,112,"no imaginary part");
@ -354,7 +355,7 @@ l_C(Void)
nmL_getc(Void)
{
int rv;
if (rv = *nmL_next++)
if ((rv = *nmL_next++))
return rv;
l_getc = nmL_getc_save;
l_ungetc = nmL_ungetc_save;
@ -436,11 +437,12 @@ l_L(Void)
if(isdigit(ch))
{
rd_count(ch);
if(GETC(ch)!='*')
if(GETC(ch)!='*') {
if(!f__cf || !feof(f__cf))
errfl(f__elist->cierr,112,"no star");
else
err(f__elist->cierr,(EOF),"lread");
}
GETC(ch);
}
sawdot = 0;
@ -788,7 +790,7 @@ integer s_rsle(cilist *a)
f__reading=1;
f__external=1;
f__formatted=1;
if(n=c_le(a)) return(n);
if((n=c_le(a))) return(n);
f__lioproc = l_read;
f__lquit = 0;
f__lcount = 0;