From 72cd2e69e6ce91c9e75ccf9b2cae293f05cd4e0c Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Mon, 10 May 1999 16:00:01 +0000 Subject: [PATCH] Add some explicit parens to avoid && within || warnings --- sys/alpha/alpha/diskslice_machdep.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/alpha/alpha/diskslice_machdep.c b/sys/alpha/alpha/diskslice_machdep.c index 426df40a32e..e9eaa75e977 100644 --- a/sys/alpha/alpha/diskslice_machdep.c +++ b/sys/alpha/alpha/diskslice_machdep.c @@ -36,7 +36,7 @@ * from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91 * from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $ * from: i386/isa Id: diskslice_machdep.c,v 1.31 1998/08/10 07:22:14 phk Exp - * $Id: diskslice_machdep.c,v 1.5 1998/10/16 10:13:09 jkh Exp $ + * $Id: diskslice_machdep.c,v 1.6 1998/12/04 22:54:42 archie Exp $ */ #include @@ -104,11 +104,11 @@ check_part(sname, dp, offset, nsectors, ntracks, mbr_offset ) * apart from the cylinder being reduced modulo 1024. Always allow * 1023/255/63. */ - if (ssector < ssector1 + if ((ssector < ssector1 && ((chs_ssect == nsectors && dp->dp_shd == ntracks - 1 && chs_scyl == 1023) || (secpercyl != 0 - && (ssector1 - ssector) % (1024 * secpercyl) == 0)) + && (ssector1 - ssector) % (1024 * secpercyl) == 0))) || (dp->dp_scyl == 255 && dp->dp_shd == 255 && dp->dp_ssect == 255)) { TRACE(("%s: C/H/S start %d/%d/%d, start %lu: allow\n", @@ -123,11 +123,11 @@ check_part(sname, dp, offset, nsectors, ntracks, mbr_offset ) esector1 = ssector1 + dp->dp_size - 1; /* Allow certain bogus C/H/S values for esector, as above. */ - if (esector < esector1 + if ((esector < esector1 && ((chs_esect == nsectors && dp->dp_ehd == ntracks - 1 && chs_ecyl == 1023) || (secpercyl != 0 - && (esector1 - esector) % (1024 * secpercyl) == 0)) + && (esector1 - esector) % (1024 * secpercyl) == 0))) || (dp->dp_ecyl == 255 && dp->dp_ehd == 255 && dp->dp_esect == 255)) { TRACE(("%s: C/H/S end %d/%d/%d, end %lu: allow\n",