Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 15:46:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

[BTRFS]

Browse source 
- Fix warnings

svn path=/trunk/; revision=71298
This commit is contained in:
Thomas Faber 2016-05-09 09:10:13 +00:00
parent c2cc2ba3be
commit 9f70db7773
5 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
reactos/drivers/filesystems/btrfs/CMakeLists.txt
View file

@ -25,12 +25,6 @@ list(APPEND SOURCE
add_library(btrfs SHARED ${SOURCE} btrfs.rc) 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__) add_definitions(-D__KERNEL__)
set_module_type(btrfs kernelmodedriver) set_module_type(btrfs kernelmodedriver)
target_link_libraries(btrfs ntoskrnl_vista ${PSEH_LIB}) target_link_libraries(btrfs ntoskrnl_vista ${PSEH_LIB})

2
reactos/drivers/filesystems/btrfs/create.c
View file

@ -15,7 +15,9 @@
* You should have received a copy of the GNU Lesser General Public Licence * You should have received a copy of the GNU Lesser General Public Licence
* along with WinBtrfs. If not, see <http://www.gnu.org/licenses/>. */ * along with WinBtrfs. If not, see <http://www.gnu.org/licenses/>. */
#ifndef __REACTOS__
#include <sys/stat.h> #include <sys/stat.h>
#endif /* __REACTOS__ */
#include "btrfs_drv.h" #include "btrfs_drv.h"
extern PDEVICE_OBJECT devobj; extern PDEVICE_OBJECT devobj;

4
reactos/drivers/filesystems/btrfs/fileinfo.c
View file

@ -2984,6 +2984,7 @@ end:
return Status; 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) { static NTSTATUS STDCALL fill_in_file_standard_link_information(FILE_STANDARD_LINK_INFORMATION* fsli, fcb* fcb, file_ref* fileref, LONG* length) {
TRACE("FileStandardLinkInformation\n"); TRACE("FileStandardLinkInformation\n");
@ -2998,6 +2999,7 @@ static NTSTATUS STDCALL fill_in_file_standard_link_information(FILE_STANDARD_LIN
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
#endif /* __REACTOS__ */
typedef struct { typedef struct {
UNICODE_STRING name; UNICODE_STRING name;
@ -3280,6 +3282,7 @@ end:
return Status; return Status;
} }
#ifndef __REACTOS__
static NTSTATUS STDCALL fill_in_hard_link_information(FILE_LINKS_INFORMATION* fli, fcb* fcb, LONG* length) { static NTSTATUS STDCALL fill_in_hard_link_information(FILE_LINKS_INFORMATION* fli, fcb* fcb, LONG* length) {
KEY searchkey; KEY searchkey;
traverse_ptr tp, next_tp; traverse_ptr tp, next_tp;
@ -3465,6 +3468,7 @@ end:
} }
return Status; return Status;
} }
#endif /* __REACTOS__ */
static NTSTATUS STDCALL query_info(device_extension* Vcb, PFILE_OBJECT FileObject, PIRP Irp) { static NTSTATUS STDCALL query_info(device_extension* Vcb, PFILE_OBJECT FileObject, PIRP Irp) {
PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp);

8
reactos/drivers/filesystems/btrfs/read.c
View file

@ -602,7 +602,7 @@ NTSTATUS STDCALL drv_read(PDEVICE_OBJECT DeviceObject, PIRP Irp) {
Status = STATUS_SUCCESS; Status = STATUS_SUCCESS;
try { _SEH2_TRY {
if (!FileObject->PrivateCacheMap) { if (!FileObject->PrivateCacheMap) {
CC_FILE_SIZES ccfs; CC_FILE_SIZES ccfs;
@ -635,9 +635,9 @@ NTSTATUS STDCALL drv_read(PDEVICE_OBJECT DeviceObject, PIRP Irp) {
} }
TRACE("CcCopyRead finished\n"); TRACE("CcCopyRead finished\n");
} }
} except (EXCEPTION_EXECUTE_HANDLER) { } _SEH2_EXCEPT (EXCEPTION_EXECUTE_HANDLER) {
Status = GetExceptionCode(); Status = _SEH2_GetExceptionCode();
} } _SEH2_END;
if (NT_SUCCESS(Status)) { if (NT_SUCCESS(Status)) {
Status = Irp->IoStatus.Status; Status = Irp->IoStatus.Status;

3
reactos/drivers/filesystems/btrfs/write.c
View file

@ -3086,6 +3086,9 @@ static NTSTATUS STDCALL do_splits(device_extension* Vcb, LIST_ENTRY* rollback) {
if (t->parent) { if (t->parent) {
LIST_ENTRY* le2; LIST_ENTRY* le2;
KEY firstitem = {0xcccccccccccccccc,0xcc,0xcccccccccccccccc}; KEY firstitem = {0xcccccccccccccccc,0xcc,0xcccccccccccccccc};
#ifdef __REACTOS__
(void)firstitem;
#endif
done_deletions = TRUE; done_deletions = TRUE;