From dfda3eceff84995d0e608ec26f84ea3719478928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Fri, 15 Sep 2006 17:04:18 +0000 Subject: [PATCH] Fix "normal" formatting, by removing differences between quick and normal formatting. Normal formatting is quick formatting + fill sectors with 0 (not done yet) svn path=/trunk/; revision=24136 --- reactos/lib/fslib/vfatlib/fat12.c | 11 ++--------- reactos/lib/fslib/vfatlib/fat16.c | 11 ++--------- reactos/lib/fslib/vfatlib/fat32.c | 11 ++--------- 3 files changed, 6 insertions(+), 27 deletions(-) diff --git a/reactos/lib/fslib/vfatlib/fat12.c b/reactos/lib/fslib/vfatlib/fat12.c index a86a4621b3a..1d4f01afd55 100644 --- a/reactos/lib/fslib/vfatlib/fat12.c +++ b/reactos/lib/fslib/vfatlib/fat12.c @@ -338,15 +338,8 @@ Fat12Format (HANDLE FileHandle, DPRINT("BootSector.FATSectors = %hx\n", BootSector.FATSectors); /* Init context data */ - if (QuickFormat) - { - Context->TotalSectorCount = - 1 + (BootSector.FATSectors * 2) + RootDirSectors; - } - else - { - Context->TotalSectorCount = SectorCount; - } + Context->TotalSectorCount = + 1 + (BootSector.FATSectors * 2) + RootDirSectors; Status = Fat12WriteBootSector (FileHandle, &BootSector, diff --git a/reactos/lib/fslib/vfatlib/fat16.c b/reactos/lib/fslib/vfatlib/fat16.c index de41a2ac6e9..d59b47edcff 100644 --- a/reactos/lib/fslib/vfatlib/fat16.c +++ b/reactos/lib/fslib/vfatlib/fat16.c @@ -356,15 +356,8 @@ Fat16Format (HANDLE FileHandle, DPRINT("BootSector.FATSectors = %hu\n", BootSector.FATSectors); /* Init context data */ - if (QuickFormat) - { - Context->TotalSectorCount = - 1 + (BootSector.FATSectors * 2) + RootDirSectors; - } - else - { - Context->TotalSectorCount = SectorCount; - } + Context->TotalSectorCount = + 1 + (BootSector.FATSectors * 2) + RootDirSectors; Status = Fat16WriteBootSector (FileHandle, &BootSector, diff --git a/reactos/lib/fslib/vfatlib/fat32.c b/reactos/lib/fslib/vfatlib/fat32.c index c2b87665c36..13c2a2e06bb 100644 --- a/reactos/lib/fslib/vfatlib/fat32.c +++ b/reactos/lib/fslib/vfatlib/fat32.c @@ -429,15 +429,8 @@ Fat32Format (HANDLE FileHandle, DPRINT("FATSectors32 = %lu\n", BootSector.FATSectors32); /* Init context data */ - if (QuickFormat) - { - Context->TotalSectorCount = - 2 + (BootSector.FATSectors32 * BootSector.FATCount) + BootSector.SectorsPerCluster; - } - else - { - Context->TotalSectorCount = BootSector.SectorsHuge; - } + Context->TotalSectorCount = + 2 + (BootSector.FATSectors32 * BootSector.FATCount) + BootSector.SectorsPerCluster; Status = Fat32WriteBootSector (FileHandle, &BootSector,