From 44dc8c9084f9ee2f51fc8bc6e542515a7710dab0 Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Mon, 21 Dec 2009 17:53:44 +0000
Subject: [PATCH] Added parentheses to avind warning messages.

---
 ext/f2c_libs/inquire.c | 49 +++++++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 17 deletions(-)

diff --git a/ext/f2c_libs/inquire.c b/ext/f2c_libs/inquire.c
index 5936a674c..033e9c019 100644
--- a/ext/f2c_libs/inquire.c
+++ b/ext/f2c_libs/inquire.c
@@ -63,55 +63,70 @@ integer f_inqu(inlist *a)
 			p=NULL;
 		}
 	}
-	if(a->inex!=NULL)
-		if(byfile && x != -1 || !byfile && p!=NULL)
-			*a->inex=1;
-		else *a->inex=0;
-	if(a->inopen!=NULL)
+	if(a->inex!=NULL) {
+		if((byfile && x != -1) || (!byfile && p!=NULL)) {
+		  *a->inex=1;
+		} else {
+                  *a->inex=0;
+                }
+        }
+	if(a->inopen!=NULL) {
 		if(byfile) *a->inopen=(p!=NULL);
 		else *a->inopen=(p!=NULL && p->ufd!=NULL);
+        }
 	if(a->innum!=NULL) *a->innum= p-f__units;
-	if(a->innamed!=NULL)
-		if(byfile || p!=NULL && p->ufnm!=NULL)
+	if(a->innamed!=NULL) {
+		if(byfile || (p!=NULL && p->ufnm!=NULL))
 			*a->innamed=1;
 		else	*a->innamed=0;
-	if(a->inname!=NULL)
+        }
+	if(a->inname!=NULL) {
 		if(byfile)
 			b_char(buf,a->inname,a->innamlen);
 		else if(p!=NULL && p->ufnm!=NULL)
 			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)
 			b_char("DIRECT",a->inacc,a->inacclen);
 		else	b_char("SEQUENTIAL",a->inacc,a->inacclen);
-	if(a->inseq!=NULL)
+        }
+	if(a->inseq!=NULL) {
 		if(p!=NULL && p->url)
 			b_char("NO",a->inseq,a->inseqlen);
 		else	b_char("YES",a->inseq,a->inseqlen);
-	if(a->indir!=NULL)
+        }
+	if(a->indir!=NULL) {
 		if(p==NULL || p->url)
 			b_char("YES",a->indir,a->indirlen);
 		else	b_char("NO",a->indir,a->indirlen);
-	if(a->infmt!=NULL)
+        }
+	if(a->infmt!=NULL) {
 		if(p!=NULL && p->ufmt==0)
 			b_char("UNFORMATTED",a->infmt,a->infmtlen);
 		else	b_char("FORMATTED",a->infmt,a->infmtlen);
-	if(a->inform!=NULL)
+        }
+	if(a->inform!=NULL) {
 		if(p!=NULL && p->ufmt==0)
 		b_char("NO",a->inform,a->informlen);
 		else b_char("YES",a->inform,a->informlen);
-	if(a->inunf)
+        }
+	if(a->inunf) {
 		if(p!=NULL && p->ufmt==0)
 			b_char("YES",a->inunf,a->inunflen);
-		else if (p!=NULL) b_char("NO",a->inunf,a->inunflen);
-		else b_char("UNKNOWN",a->inunf,a->inunflen);
+		else {
+                   if (p!=NULL) b_char("NO",a->inunf,a->inunflen);
+	           else b_char("UNKNOWN",a->inunf,a->inunflen);
+                }
+        }
 	if(a->inrecl!=NULL && p!=NULL)
 		*a->inrecl=p->url;
 	if(a->innrec!=NULL && p!=NULL && p->url>0)
 		*a->innrec=(ftnint)(FTELL(p->ufd)/p->url+1);
-	if(a->inblank && p!=NULL && p->ufmt)
+	if(a->inblank && p!=NULL && p->ufmt) {
 		if(p->ublnk)
 			b_char("ZERO",a->inblank,a->inblanklen);
 		else	b_char("NULL",a->inblank,a->inblanklen);
+        }
 	return(0);
 }