From b329beb092740812eb5a9dbfe73a691350689222 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sun, 18 Oct 2015 07:32:09 +0000 Subject: [PATCH] [EXT2FS] - Fix warnings svn path=/trunk/; revision=69586 --- reactos/drivers/filesystems/ext2/CMakeLists.txt | 1 - reactos/drivers/filesystems/ext2/inc/ext2fs.h | 4 ++++ reactos/drivers/filesystems/ext2/src/fastio.c | 4 ++++ reactos/drivers/filesystems/ext2/src/memory.c | 5 +++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/reactos/drivers/filesystems/ext2/CMakeLists.txt b/reactos/drivers/filesystems/ext2/CMakeLists.txt index f02de3cfa03..1be53f052b7 100644 --- a/reactos/drivers/filesystems/ext2/CMakeLists.txt +++ b/reactos/drivers/filesystems/ext2/CMakeLists.txt @@ -88,7 +88,6 @@ add_library(ext2fs SHARED ${SOURCE} ext2fs.rc) if(NOT MSVC) add_target_compile_flags(ext2fs "-Wno-pointer-sign -Wno-unused-function") if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") - replace_compile_flags("-Werror" " ") add_target_compile_flags(ext2fs "-Wno-unused-but-set-variable -Wno-unused-variable -Wno-missing-braces") endif() else() diff --git a/reactos/drivers/filesystems/ext2/inc/ext2fs.h b/reactos/drivers/filesystems/ext2/inc/ext2fs.h index 3bfb60d04d1..c695df22a56 100644 --- a/reactos/drivers/filesystems/ext2/inc/ext2fs.h +++ b/reactos/drivers/filesystems/ext2/inc/ext2fs.h @@ -2030,7 +2030,11 @@ Ext2FastIoUnlockAll ( BOOLEAN NTAPI Ext2FastIoUnlockAllByKey ( IN PFILE_OBJECT FileObject, +#ifdef __REACTOS__ + IN PVOID Process, +#else IN PEPROCESS Process, +#endif IN ULONG Key, OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject diff --git a/reactos/drivers/filesystems/ext2/src/fastio.c b/reactos/drivers/filesystems/ext2/src/fastio.c index b339a262243..7885b08861a 100644 --- a/reactos/drivers/filesystems/ext2/src/fastio.c +++ b/reactos/drivers/filesystems/ext2/src/fastio.c @@ -779,7 +779,11 @@ Ext2FastIoUnlockAll ( BOOLEAN NTAPI Ext2FastIoUnlockAllByKey ( IN PFILE_OBJECT FileObject, +#ifdef __REACTOS__ + IN PVOID Process, +#else IN PEPROCESS Process, +#endif IN ULONG Key, OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject diff --git a/reactos/drivers/filesystems/ext2/src/memory.c b/reactos/drivers/filesystems/ext2/src/memory.c index 3d1bc2d305f..37129c2d313 100644 --- a/reactos/drivers/filesystems/ext2/src/memory.c +++ b/reactos/drivers/filesystems/ext2/src/memory.c @@ -2077,7 +2077,12 @@ Ext2ParseRegistryVolumeParams( k < ParamPattern[i].Length && Params->Buffer[j+k] != L';' && Params->Buffer[j+k] != L',' ) { +#ifdef __REACTOS__ + ParamPattern[i].uValue[k] = Params->Buffer[j + k]; + k++; +#else ParamPattern[i].uValue[k] = Params->Buffer[j + k++]; +#endif } if (k) { NTSTATUS status; -- 2.17.1