https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1ceed5ad5ad8904731a11f...
commit 1ceed5ad5ad8904731a11f87719e396a6bc33335 Author: Serge Gautherie reactos-git_serge_171003@gautherie.fr AuthorDate: Mon Jun 15 06:57:04 2020 +0200 Commit: Victor Perevertkin victor@perevertkin.ru CommitDate: Sun Jun 21 09:27:44 2020 +0300
[FASTFAT_NEW] Remove obsolete compiler workarounds
following upgrade to GCC 8.4 and MSVC 2015. --- drivers/filesystems/fastfat_new/create.c | 40 ------------------------------ drivers/filesystems/fastfat_new/dirsup.c | 8 ------ drivers/filesystems/fastfat_new/fileinfo.c | 16 ------------ drivers/filesystems/fastfat_new/fsctrl.c | 8 ------ drivers/filesystems/fastfat_new/read.c | 4 --- drivers/filesystems/fastfat_new/strucsup.c | 8 ------ drivers/filesystems/fastfat_new/write.c | 4 --- 7 files changed, 88 deletions(-)
diff --git a/drivers/filesystems/fastfat_new/create.c b/drivers/filesystems/fastfat_new/create.c index 7210d362c0f..97b0c8b120c 100644 --- a/drivers/filesystems/fastfat_new/create.c +++ b/drivers/filesystems/fastfat_new/create.c @@ -573,11 +573,7 @@ Return Value:
{ NTSTATUS Status; -#ifndef __REACTOS__ IO_STATUS_BLOCK Iosb = {0}; -#else - IO_STATUS_BLOCK Iosb = {{0}}; -#endif PIO_STACK_LOCATION IrpSp;
PFILE_OBJECT FileObject; @@ -2624,11 +2620,7 @@ Arguments:
{ PDCB RootDcb; -#ifndef __REACTOS__ IO_STATUS_BLOCK Iosb = {0}; -#else - IO_STATUS_BLOCK Iosb = {{0}}; -#endif
// // The following variables are for abnormal termination @@ -2814,11 +2806,7 @@ Return Value: --*/
{ -#ifndef __REACTOS__ IO_STATUS_BLOCK Iosb = {0}; -#else - IO_STATUS_BLOCK Iosb = {{0}}; -#endif PBCB DirentBcb = NULL; PDIRENT Dirent;
@@ -3261,11 +3249,7 @@ Return Value: --*/
{ -#ifndef __REACTOS__ IO_STATUS_BLOCK Iosb = {0}; -#else - IO_STATUS_BLOCK Iosb = {{0}}; -#endif
PBCB DirentBcb = NULL; PDIRENT Dirent; @@ -3974,11 +3958,7 @@ Return Value: --*/
{ -#ifndef __REACTOS__ IO_STATUS_BLOCK Iosb = {0}; -#else - IO_STATUS_BLOCK Iosb = {{0}}; -#endif
// // The following variables are for abnormal termination @@ -4222,11 +4202,7 @@ Return Value: --*/
{ -#ifndef __REACTOS__ IO_STATUS_BLOCK Iosb = {0}; -#else - IO_STATUS_BLOCK Iosb = {{0}}; -#endif
// // The following variables are for abnormal termination @@ -4522,11 +4498,7 @@ Return Value: --*/
{ -#ifndef __REACTOS__ IO_STATUS_BLOCK Iosb = {0}; -#else - IO_STATUS_BLOCK Iosb = {{0}}; -#endif
ACCESS_MASK AddedAccess = 0;
@@ -5711,11 +5683,7 @@ Return Value: --*/
{ -#ifndef __REACTOS__ IO_STATUS_BLOCK Iosb = {0}; -#else - IO_STATUS_BLOCK Iosb = {{0}}; -#endif
PFCB Fcb = NULL;
@@ -6428,11 +6396,7 @@ Return Value: --*/
{ -#ifndef __REACTOS__ IO_STATUS_BLOCK Iosb = {0}; -#else - IO_STATUS_BLOCK Iosb = {{0}}; -#endif
PDIRENT Dirent; PBCB DirentBcb; @@ -6445,11 +6409,7 @@ Return Value:
ULONG NotifyFilter; ULONG HeaderSize = 0; -#ifndef __REACTOS__ LARGE_INTEGER AllocSize = {0}; -#else - LARGE_INTEGER AllocSize = {{0}}; -#endif
// // The following variables are for abnormal termination diff --git a/drivers/filesystems/fastfat_new/dirsup.c b/drivers/filesystems/fastfat_new/dirsup.c index b94f2c2fc28..8c3bccdb9fd 100644 --- a/drivers/filesystems/fastfat_new/dirsup.c +++ b/drivers/filesystems/fastfat_new/dirsup.c @@ -2633,18 +2633,10 @@ Return Value: PDIRENT Dirent; PBCB DirentBcb = NULL; ULONG NotifyFilter = 0; -#ifndef __REACTOS__ FAT_TIME_STAMP CurrentFatTime = {0}; -#else - FAT_TIME_STAMP CurrentFatTime = {{0}}; -#endif
LARGE_INTEGER CurrentTime; -#ifndef __REACTOS__ LARGE_INTEGER CurrentDay = {0}; -#else - LARGE_INTEGER CurrentDay = {{0}}; -#endif LARGE_INTEGER LastAccessDay;
PAGED_CODE(); diff --git a/drivers/filesystems/fastfat_new/fileinfo.c b/drivers/filesystems/fastfat_new/fileinfo.c index f2a06205ef8..fc37f7cf25e 100644 --- a/drivers/filesystems/fastfat_new/fileinfo.c +++ b/drivers/filesystems/fastfat_new/fileinfo.c @@ -1949,21 +1949,11 @@ Return Value: PDIRENT Dirent; PBCB DirentBcb;
-#ifndef __REACTOS__ FAT_TIME_STAMP CreationTime = {0}; -#else - FAT_TIME_STAMP CreationTime = {{0}}; -#endif UCHAR CreationMSec = 0; -#ifndef __REACTOS__ FAT_TIME_STAMP LastWriteTime = {0}; FAT_TIME_STAMP LastAccessTime = {0}; FAT_DATE LastAccessDate = {0}; -#else - FAT_TIME_STAMP LastWriteTime = {{0}}; - FAT_TIME_STAMP LastAccessTime = {{0}}; - FAT_DATE LastAccessDate = {0, 0, 0}; -#endif UCHAR Attributes;
BOOLEAN ModifyCreation = FALSE; @@ -1974,15 +1964,9 @@ Return Value: BOOLEAN ModifiedAttributes = FALSE; #endif
-#ifndef __REACTOS__ LARGE_INTEGER LargeCreationTime = {0}; LARGE_INTEGER LargeLastWriteTime = {0}; LARGE_INTEGER LargeLastAccessTime = {0}; -#else - LARGE_INTEGER LargeCreationTime = {{0}}; - LARGE_INTEGER LargeLastWriteTime = {{0}}; - LARGE_INTEGER LargeLastAccessTime = {{0}}; -#endif
ULONG NotifyFilter = 0;
diff --git a/drivers/filesystems/fastfat_new/fsctrl.c b/drivers/filesystems/fastfat_new/fsctrl.c index c3559cf8e35..ef78449b5d5 100644 --- a/drivers/filesystems/fastfat_new/fsctrl.c +++ b/drivers/filesystems/fastfat_new/fsctrl.c @@ -916,11 +916,7 @@ Return Value:
PLIST_ENTRY Links;
-#ifndef __REACTOS__ IO_STATUS_BLOCK Iosb = {0}; -#else - IO_STATUS_BLOCK Iosb = {{0}}; -#endif ULONG ChangeCount = 0;
DISK_GEOMETRY Geometry; @@ -1907,11 +1903,7 @@ Return Value: BOOLEAN LabelFound;
ULONG ChangeCount = 0; -#ifndef __REACTOS__ IO_STATUS_BLOCK Iosb = {0}; -#else - IO_STATUS_BLOCK Iosb = {{0}}; -#endif
PAGED_CODE();
diff --git a/drivers/filesystems/fastfat_new/read.c b/drivers/filesystems/fastfat_new/read.c index f9d6e761f1d..95770aac934 100644 --- a/drivers/filesystems/fastfat_new/read.c +++ b/drivers/filesystems/fastfat_new/read.c @@ -972,11 +972,7 @@ Return Value:
(FileObject->SectionObjectPointer->DataSectionObject != NULL)) {
-#ifndef __REACTOS__ IO_STATUS_BLOCK IoStatus = {0}; -#else - IO_STATUS_BLOCK IoStatus = {{0}}; -#endif
#ifndef REDUCE_SYNCHRONIZATION if (!FatAcquireExclusiveFcb( IrpContext, FcbOrDcb )) { diff --git a/drivers/filesystems/fastfat_new/strucsup.c b/drivers/filesystems/fastfat_new/strucsup.c index 38cad350c05..5cd50fe3348 100644 --- a/drivers/filesystems/fastfat_new/strucsup.c +++ b/drivers/filesystems/fastfat_new/strucsup.c @@ -1458,11 +1458,7 @@ Return Value:
if (FatData.ChicagoMode) {
-#ifndef __REACTOS__ LARGE_INTEGER FatSystemJanOne1980 = {0}; -#else - LARGE_INTEGER FatSystemJanOne1980 = {{0}}; -#endif
// // If either date is possibly zero, get the system @@ -1796,11 +1792,7 @@ Return Value:
if (FatData.ChicagoMode) {
-#ifndef __REACTOS__ LARGE_INTEGER FatSystemJanOne1980 = {0}; -#else - LARGE_INTEGER FatSystemJanOne1980 = {{0}}; -#endif
// // If either date is possibly zero, get the system diff --git a/drivers/filesystems/fastfat_new/write.c b/drivers/filesystems/fastfat_new/write.c index 937568535d3..cf75c213958 100644 --- a/drivers/filesystems/fastfat_new/write.c +++ b/drivers/filesystems/fastfat_new/write.c @@ -1175,11 +1175,7 @@ Return Value: if (NonCachedIo && !PagingIo && (FileObject->SectionObjectPointer->DataSectionObject != NULL)) {
-#ifndef __REACTOS__ IO_STATUS_BLOCK IoStatus = {0}; -#else - IO_STATUS_BLOCK IoStatus = {{0}}; -#endif
// // We need the Fcb exclsuive to do the CcPurgeCache
-
Serge Gautherie