From 349b3eb10856f7d32e32fe8d0e2f7dbc561062d3 Mon Sep 17 00:00:00 2001 From: curt mayer Date: Fri, 21 Feb 2020 10:10:46 -0800 Subject: [PATCH] make compile shut up about conditionals --- Tools/unix/cpmtools/cpmfs.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Tools/unix/cpmtools/cpmfs.c b/Tools/unix/cpmtools/cpmfs.c index dfd43b92..11e7d2e6 100644 --- a/Tools/unix/cpmtools/cpmfs.c +++ b/Tools/unix/cpmtools/cpmfs.c @@ -673,13 +673,17 @@ FILE *open_diskdefs() FILE *fp; char *ddenv = getenv("DISKDEFS"); - if (fp=fopen("diskdefs","r")) + if ((fp=fopen("diskdefs","r")) != 0) { return fp; - if (fp=fopen(DISKDEFS,"r")) + } + if ((fp=fopen(DISKDEFS,"r")) != 0) { return fp; - if (ddenv) - if (fp=fopen(ddenv,"r")) + } + if (ddenv) { + if ((fp=fopen(ddenv,"r")) != 0) { return fp; + } + } fprintf(stderr,"%s: Neither diskdefs%s%s%s nor %s could be opened.\n", cmd, ddenv ? ", ": "", ddenv ? ddenv : "", ddenv ? "," : "" , DISKDEFS);