From e7880c117f6e46ab690f1e51c9b8ebbd38605079 Mon Sep 17 00:00:00 2001 From: Luchezar Georgiev Date: Sun, 6 Feb 2005 19:00:33 +0000 Subject: [PATCH] Remove condition checks that are already included in other condition checks git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/branches/UNSTABLE@1112 6ac86273-5f31-0410-b378-82cca8765d1b --- kernel/initdisk.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kernel/initdisk.c b/kernel/initdisk.c index 113c535..ba92c46 100644 --- a/kernel/initdisk.c +++ b/kernel/initdisk.c @@ -840,9 +840,7 @@ int ScanForPrimaryPartitions(struct DriveParamS * driveParam, int scan_type, for (i = 0; i < 4; i++, pEntry++) { - if (pEntry->FileSystem == 0 - || partitionsToIgnore & (1 << i) - || IsExtPartition(pEntry->FileSystem) + if (partitionsToIgnore & (1 << i) || scan_type == SCAN_PRIMARYBOOT && !pEntry->Bootable || !IsFATPartition(pEntry->FileSystem)) continue;