Author: tfaber
Date: Mon May 9 09:10:13 2016
New Revision: 71298
URL:
http://svn.reactos.org/svn/reactos?rev=71298&view=rev
Log:
[BTRFS]
- Fix warnings
Modified:
trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt
trunk/reactos/drivers/filesystems/btrfs/create.c
trunk/reactos/drivers/filesystems/btrfs/fileinfo.c
trunk/reactos/drivers/filesystems/btrfs/read.c
trunk/reactos/drivers/filesystems/btrfs/write.c
Modified: trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/…
==============================================================================
--- trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt [iso-8859-1] Mon May 9
09:10:13 2016
@@ -25,12 +25,6 @@
add_library(btrfs SHARED ${SOURCE} btrfs.rc)
-if(NOT MSVC)
- replace_compile_flags("-Werror" " ")
-else()
- replace_compile_flags("/we\"4189\"" " ")
-endif()
-
add_definitions(-D__KERNEL__)
set_module_type(btrfs kernelmodedriver)
target_link_libraries(btrfs ntoskrnl_vista ${PSEH_LIB})
Modified: trunk/reactos/drivers/filesystems/btrfs/create.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/…
==============================================================================
--- trunk/reactos/drivers/filesystems/btrfs/create.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/btrfs/create.c [iso-8859-1] Mon May 9 09:10:13
2016
@@ -15,7 +15,9 @@
* You should have received a copy of the GNU Lesser General Public Licence
* along with WinBtrfs. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef __REACTOS__
#include <sys/stat.h>
+#endif /* __REACTOS__ */
#include "btrfs_drv.h"
extern PDEVICE_OBJECT devobj;
Modified: trunk/reactos/drivers/filesystems/btrfs/fileinfo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/…
==============================================================================
--- trunk/reactos/drivers/filesystems/btrfs/fileinfo.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/btrfs/fileinfo.c [iso-8859-1] Mon May 9 09:10:13
2016
@@ -2984,6 +2984,7 @@
return Status;
}
+#ifndef __REACTOS__
static NTSTATUS STDCALL
fill_in_file_standard_link_information(FILE_STANDARD_LINK_INFORMATION* fsli, fcb* fcb,
file_ref* fileref, LONG* length) {
TRACE("FileStandardLinkInformation\n");
@@ -2998,6 +2999,7 @@
return STATUS_SUCCESS;
}
+#endif /* __REACTOS__ */
typedef struct {
UNICODE_STRING name;
@@ -3280,6 +3282,7 @@
return Status;
}
+#ifndef __REACTOS__
static NTSTATUS STDCALL fill_in_hard_link_information(FILE_LINKS_INFORMATION* fli, fcb*
fcb, LONG* length) {
KEY searchkey;
traverse_ptr tp, next_tp;
@@ -3465,6 +3468,7 @@
}
return Status;
}
+#endif /* __REACTOS__ */
static NTSTATUS STDCALL query_info(device_extension* Vcb, PFILE_OBJECT FileObject, PIRP
Irp) {
PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp);
Modified: trunk/reactos/drivers/filesystems/btrfs/read.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/…
==============================================================================
--- trunk/reactos/drivers/filesystems/btrfs/read.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/btrfs/read.c [iso-8859-1] Mon May 9 09:10:13 2016
@@ -602,7 +602,7 @@
Status = STATUS_SUCCESS;
- try {
+ _SEH2_TRY {
if (!FileObject->PrivateCacheMap) {
CC_FILE_SIZES ccfs;
@@ -635,9 +635,9 @@
}
TRACE("CcCopyRead finished\n");
}
- } except (EXCEPTION_EXECUTE_HANDLER) {
- Status = GetExceptionCode();
- }
+ } _SEH2_EXCEPT (EXCEPTION_EXECUTE_HANDLER) {
+ Status = _SEH2_GetExceptionCode();
+ } _SEH2_END;
if (NT_SUCCESS(Status)) {
Status = Irp->IoStatus.Status;
Modified: trunk/reactos/drivers/filesystems/btrfs/write.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/…
==============================================================================
--- trunk/reactos/drivers/filesystems/btrfs/write.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/btrfs/write.c [iso-8859-1] Mon May 9 09:10:13 2016
@@ -3086,6 +3086,9 @@
if (t->parent) {
LIST_ENTRY* le2;
KEY firstitem = {0xcccccccccccccccc,0xcc,0xcccccccccccccccc};
+#ifdef __REACTOS__
+ (void)firstitem;
+#endif
done_deletions = TRUE;