Commit 03489df3 by Kaveh R. Ghazi Committed by Kaveh Ghazi

inquire.c (f_inqu): Avoid ambiguous else clauses.

	* libI77/inquire.c (f_inqu): Avoid ambiguous else clauses.
	* libI77/lread.c (l_C, l_L): Likewise.
	* libI77/open.c (f_open): Likewise.
	* libI77/rsne.c (x_rsne): Likewise.
	* libI77/wref.c (wrt_F): Likewise.

From-SVN: r54167
parent 1d7ed5d3
Sun Jun 2 08:55:20 2002 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* libI77/inquire.c (f_inqu): Avoid ambiguous else clauses.
* libI77/lread.c (l_C, l_L): Likewise.
* libI77/open.c (f_open): Likewise.
* libI77/rsne.c (x_rsne): Likewise.
* libI77/wref.c (wrt_F): Likewise.
Sun Jun 2 08:53:15 2002 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> Sun Jun 2 08:53:15 2002 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* libF77/getenv_.c (G77_getenv_0): Avoid signed/unsigned warning. * libF77/getenv_.c (G77_getenv_0): Avoid signed/unsigned warning.
......
...@@ -55,67 +55,89 @@ f_inqu (inlist * a) ...@@ -55,67 +55,89 @@ f_inqu (inlist * a)
} }
} }
if (a->inex != NULL) if (a->inex != NULL)
{
if (byfile && x != -1 || !byfile && p != NULL) if (byfile && x != -1 || !byfile && p != NULL)
*a->inex = 1; *a->inex = 1;
else else
*a->inex = 0; *a->inex = 0;
}
if (a->inopen != NULL) if (a->inopen != NULL)
{
if (byfile) if (byfile)
*a->inopen = (p != NULL); *a->inopen = (p != NULL);
else else
*a->inopen = (p != NULL && p->ufd != NULL); *a->inopen = (p != NULL && p->ufd != NULL);
}
if (a->innum != NULL) if (a->innum != NULL)
*a->innum = p - f__units; *a->innum = p - f__units;
if (a->innamed != NULL) if (a->innamed != NULL)
{
if (byfile || p != NULL && p->ufnm != NULL) if (byfile || p != NULL && p->ufnm != NULL)
*a->innamed = 1; *a->innamed = 1;
else else
*a->innamed = 0; *a->innamed = 0;
}
if (a->inname != NULL) if (a->inname != NULL)
{
if (byfile) if (byfile)
b_char (buf, a->inname, a->innamlen); b_char (buf, a->inname, a->innamlen);
else if (p != NULL && p->ufnm != NULL) else if (p != NULL && p->ufnm != NULL)
b_char (p->ufnm, a->inname, a->innamlen); b_char (p->ufnm, a->inname, a->innamlen);
}
if (a->inacc != NULL && p != NULL && p->ufd != NULL) if (a->inacc != NULL && p != NULL && p->ufd != NULL)
{
if (p->url) if (p->url)
b_char ("DIRECT", a->inacc, a->inacclen); b_char ("DIRECT", a->inacc, a->inacclen);
else else
b_char ("SEQUENTIAL", a->inacc, a->inacclen); b_char ("SEQUENTIAL", a->inacc, a->inacclen);
}
if (a->inseq != NULL) if (a->inseq != NULL)
{
if (p != NULL && p->url) if (p != NULL && p->url)
b_char ("NO", a->inseq, a->inseqlen); b_char ("NO", a->inseq, a->inseqlen);
else else
b_char ("YES", a->inseq, a->inseqlen); b_char ("YES", a->inseq, a->inseqlen);
}
if (a->indir != NULL) if (a->indir != NULL)
{
if (p == NULL || p->url) if (p == NULL || p->url)
b_char ("YES", a->indir, a->indirlen); b_char ("YES", a->indir, a->indirlen);
else else
b_char ("NO", a->indir, a->indirlen); b_char ("NO", a->indir, a->indirlen);
}
if (a->infmt != NULL) if (a->infmt != NULL)
{
if (p != NULL && p->ufmt == 0) if (p != NULL && p->ufmt == 0)
b_char ("UNFORMATTED", a->infmt, a->infmtlen); b_char ("UNFORMATTED", a->infmt, a->infmtlen);
else else
b_char ("FORMATTED", a->infmt, a->infmtlen); b_char ("FORMATTED", a->infmt, a->infmtlen);
}
if (a->inform != NULL) if (a->inform != NULL)
{
if (p != NULL && p->ufmt == 0) if (p != NULL && p->ufmt == 0)
b_char ("NO", a->inform, a->informlen); b_char ("NO", a->inform, a->informlen);
else else
b_char ("YES", a->inform, a->informlen); b_char ("YES", a->inform, a->informlen);
}
if (a->inunf) if (a->inunf)
{
if (p != NULL && p->ufmt == 0) if (p != NULL && p->ufmt == 0)
b_char ("YES", a->inunf, a->inunflen); b_char ("YES", a->inunf, a->inunflen);
else if (p != NULL) else if (p != NULL)
b_char ("NO", a->inunf, a->inunflen); b_char ("NO", a->inunf, a->inunflen);
else else
b_char ("UNKNOWN", a->inunf, a->inunflen); b_char ("UNKNOWN", a->inunf, a->inunflen);
}
if (a->inrecl != NULL && p != NULL) if (a->inrecl != NULL && p != NULL)
*a->inrecl = p->url; *a->inrecl = p->url;
if (a->innrec != NULL && p != NULL && p->url > 0) if (a->innrec != NULL && p != NULL && p->url > 0)
*a->innrec = FTELL (p->ufd) / p->url + 1; *a->innrec = FTELL (p->ufd) / p->url + 1;
if (a->inblank && p != NULL && p->ufmt) if (a->inblank && p != NULL && p->ufmt)
{
if (p->ublnk) if (p->ublnk)
b_char ("ZERO", a->inblank, a->inblanklen); b_char ("ZERO", a->inblank, a->inblanklen);
else else
b_char ("NULL", a->inblank, a->inblanklen); b_char ("NULL", a->inblank, a->inblanklen);
}
return (0); return (0);
} }
...@@ -304,10 +304,12 @@ l_C (void) ...@@ -304,10 +304,12 @@ l_C (void)
return 0; return 0;
} }
if (rd_count (ch)) if (rd_count (ch))
{
if (!f__cf || !feof (f__cf)) if (!f__cf || !feof (f__cf))
errfl (f__elist->cierr, 112, "complex format"); errfl (f__elist->cierr, 112, "complex format");
else else
err (f__elist->cierr, (EOF), "lread"); err (f__elist->cierr, (EOF), "lread");
}
if (GETC (ch) != '*') if (GETC (ch) != '*')
{ {
if (!f__cf || !feof (f__cf)) if (!f__cf || !feof (f__cf))
...@@ -441,10 +443,12 @@ l_L (void) ...@@ -441,10 +443,12 @@ l_L (void)
{ {
rd_count (ch); rd_count (ch);
if (GETC (ch) != '*') if (GETC (ch) != '*')
{
if (!f__cf || !feof (f__cf)) if (!f__cf || !feof (f__cf))
errfl (f__elist->cierr, 112, "no star"); errfl (f__elist->cierr, 112, "no star");
else else
err (f__elist->cierr, (EOF), "lread"); err (f__elist->cierr, (EOF), "lread");
}
GETC (ch); GETC (ch);
} }
sawdot = 0; sawdot = 0;
......
...@@ -267,11 +267,13 @@ f_open (olist * a) ...@@ -267,11 +267,13 @@ f_open (olist * a)
opnerr (a->oerr, 108, "open"); opnerr (a->oerr, 108, "open");
#endif #endif
if (b->useek) if (b->useek)
{
if (a->orl) if (a->orl)
FSEEK (b->ufd, 0, SEEK_SET); FSEEK (b->ufd, 0, SEEK_SET);
else if ((s = a->oacc) && (*s == 'a' || *s == 'A') else if ((s = a->oacc) && (*s == 'a' || *s == 'A')
&& FSEEK (b->ufd, 0, SEEK_END)) && FSEEK (b->ufd, 0, SEEK_END))
opnerr (a->oerr, 129, "open"); opnerr (a->oerr, 129, "open");
}
return (0); return (0);
} }
......
...@@ -525,6 +525,7 @@ have_amp: ...@@ -525,6 +525,7 @@ have_amp:
mustend: mustend:
GETC (ch); GETC (ch);
if (readall) if (readall)
{
if (iva >= ivae) if (iva >= ivae)
readall = 0; readall = 0;
else else
...@@ -540,6 +541,7 @@ have_amp: ...@@ -540,6 +541,7 @@ have_amp:
} }
break; break;
} }
}
if (ch == '/' || ch == '$' || ch == '&') if (ch == '/' || ch == '$' || ch == '&')
{ {
f__lquit = 1; f__lquit = 1;
......
...@@ -232,6 +232,7 @@ wrt_F (ufloat * p, int w, int d, ftnlen len) ...@@ -232,6 +232,7 @@ wrt_F (ufloat * p, int w, int d, ftnlen len)
} }
if (n = f__scale) if (n = f__scale)
{
if (n > 0) if (n > 0)
do do
x *= 10.; x *= 10.;
...@@ -240,6 +241,7 @@ wrt_F (ufloat * p, int w, int d, ftnlen len) ...@@ -240,6 +241,7 @@ wrt_F (ufloat * p, int w, int d, ftnlen len)
do do
x *= 0.1; x *= 0.1;
while (++n < 0); while (++n < 0);
}
#ifdef USE_STRLEN #ifdef USE_STRLEN
sprintf (b = buf, "%#.*f", d, x); sprintf (b = buf, "%#.*f", d, x);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment