[UDFS] Convert C++ to C and fix all ROSBE warnings and errors

drivers/filesystems/udfs/CMakeLists.txt

@@ -2,51 +2,49 @@
 include_directories(Include)
 
 list(APPEND SOURCE
-    udf_info/alloc.cpp
-    udf_info/dirtree.cpp
-    udf_info/extent.cpp
-    udf_info/mount.cpp
-    udf_info/phys_eject.cpp
-    udf_info/physical.cpp
-    udf_info/remap.cpp
-    udf_info/udf_info.cpp
-    cleanup.cpp
-    close.cpp
-    create.cpp
-    devcntrl.cpp
-    dircntrl.cpp
-    env_spec.cpp
-    fastio.cpp
-    fileinfo.cpp
-    flush.cpp
-    fscntrl.cpp
-    lockctrl.cpp
-    mem.cpp
-    misc.cpp
-    namesup.cpp
-    prefxsup.cpp
-    pnp.cpp
-    read.cpp
-    secursup.cpp
-    shutdown.cpp
-    sys_spec.cpp
-    udf_dbg.cpp
-    udfinit.cpp
-    unload.cpp
-    verfysup.cpp
-    volinfo.cpp
-    write.cpp
-    strucsup.cpp
-    filobsup.cpp
-    udfdata.cpp
+    udf_info/alloc.c
+    udf_info/dirtree.c
+    udf_info/extent.c
+    udf_info/mount.c
+    udf_info/phys_eject.c
+    udf_info/physical.c
+    udf_info/remap.c
+    udf_info/udf_info.c
+    cleanup.c
+    close.c
+    create.c
+    devcntrl.c
+    dircntrl.c
+    env_spec.c
+    fastio.c
+    fileinfo.c
+    flush.c
+    fscntrl.c
+    lockctrl.c
+    mem.c
+    misc.c
+    namesup.c
+    pnp.c
+    read.c
+    secursup.c
+    shutdown.c
+    sys_spec.c
+    udf_dbg.c
+    udfinit.c
+    unload.c
+    verfysup.c
+    volinfo.c
+    write.c
+    strucsup.c
+    filobsup.c
+    udfdata.c
     udffs.h)
 
 add_library(udfs MODULE ${SOURCE} udffs.rc)
 
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
     target_compile_options(udfs PRIVATE -Wno-unused-but-set-variable)
-    target_compile_options(udfs PRIVATE -Wno-invalid-offsetof)
-    target_compile_options(udfs PRIVATE -Wno-error -fpermissive)
+    target_compile_options(udfs PRIVATE -Wno-error)
 endif()
 
 if(CMAKE_C_COMPILER_ID STREQUAL "Clang")

drivers/filesystems/udfs/Include/Sys_spec_lib.h

@@ -104,7 +104,7 @@ __inline LARGE_INTEGER UDFMakeLargeInteger(LONGLONG value) {
 
 #define UDFGetNTFileId(Vcb, fi) \
     UDFMakeLargeInteger((((fi)->Dloc->FELoc.Mapping[0].extLocation - UDFPartStart(Vcb, -2)) + \
-                      ((LONGLONG)Vcb<<32)))
+                      ((LONGLONG)(ULONG_PTR)Vcb<<32)))
 
 #define UnicodeIsPrint(a) RtlIsValidOemCharacter(&(a))
 

drivers/filesystems/udfs/Include/mem_tools.h

@@ -46,6 +46,7 @@ extern ULONG MemTotalAllocated;
 #define MY_HEAP_MAX_FRAMES          512
 #define MY_HEAP_MAX_BLOCKS          4*1024  // blocks per frame
 
+#ifdef MY_USE_INTERNAL_MEMMANAGER
 // Mem
 BOOLEAN MyAllocInit(VOID);
 VOID MyAllocRelease(VOID);
@@ -65,6 +66,7 @@ PCHAR __fastcall MyAllocatePool(ULONG Type, ULONG size
 ULONG __fastcall MyReallocPool( PCHAR addr, ULONG OldLength, PCHAR* NewBuff, ULONG NewLength);
 #endif
 VOID __fastcall MyFreePool(PCHAR addr);
+#endif // MY_USE_INTERNAL_MEMMANAGER
 
 #ifdef MY_HEAP_CHECK_BOUNDS
   #define MY_HEAP_ALIGN             63
@@ -130,7 +132,7 @@ MyFindMemBaseByAddr(
 #define MyAlignSize__(size) (size)
 #endif
 
-BOOLEAN inline MyAllocInit(VOID) {return TRUE;}
+static inline BOOLEAN MyAllocInit(VOID) {return TRUE;}
 #define MyAllocRelease()
 
 #ifndef MY_MEM_BOUNDS_CHECK
@@ -176,7 +178,7 @@ PVOID inline MyAllocatePool__(ULONG type, ULONG len) {
 }
 */
 
-PVOID inline MyAllocatePoolTag__(ULONG type, ULONG len, /*PCHAR*/ULONG tag) {
+static inline PVOID MyAllocatePoolTag__(ULONG type, ULONG len, /*PCHAR*/ULONG tag) {
     PCHAR newaddr;
     ULONG i;
 //    newaddr = (PCHAR)MyAllocatePoolTag_(type, len+MY_HEAP_ALIGN+1, tag);
@@ -193,7 +195,7 @@ PVOID inline MyAllocatePoolTag__(ULONG type, ULONG len, /*PCHAR*/ULONG tag) {
     return newaddr;
 }
 
-VOID inline MyFreePool__(PVOID addr) {
+static inline VOID MyFreePool__(PVOID addr) {
     PCHAR newaddr;
 //    ULONG i;
     newaddr = (PCHAR)addr;
@@ -220,7 +222,7 @@ VOID inline MyFreePool__(PVOID addr) {
 #pragma GCC diagnostic ignored "-Wstringop-overflow"
 #endif
 
-ULONG inline MyReallocPool__(PCHAR addr, ULONG len, PCHAR *pnewaddr, ULONG newlen) {
+static inline ULONG MyReallocPool__(PCHAR addr, ULONG len, PCHAR *pnewaddr, ULONG newlen) {
     ULONG _len, _newlen;
     _newlen = MyAlignSize__(newlen);
     _len = MyAlignSize__(len);

drivers/filesystems/udfs/Include/phys_lib.cpp → drivers/filesystems/udfs/Include/phys_lib.c

@@ -796,14 +796,14 @@ UDFGetBlockSize(
     if (UDFGetDevType(DeviceObject) == FILE_DEVICE_DISK) {
         UDFPrint(("UDFGetBlockSize: HDD\n"));
         RC = UDFPhSendIOCTL(IOCTL_DISK_GET_DRIVE_GEOMETRY_EX,DeviceObject,
-            0,NULL,
+            NULL,0,
             &DiskGeometryEx,sizeof(DISK_GEOMETRY_EX),
             TRUE,NULL );
 
         if (!NT_SUCCESS(RC))
             try_return(RC);
         RC = UDFPhSendIOCTL(IOCTL_DISK_GET_PARTITION_INFO,DeviceObject,
-            0,NULL,
+            NULL,0,
             &PartitionInfo,sizeof(PARTITION_INFORMATION),
             TRUE,NULL );
         if (!NT_SUCCESS(RC)) {
@@ -1002,7 +1002,6 @@ UDFPrepareForReadOperation(
         Vcb->VcbState &= ~UDF_VCB_LAST_WRITE;
         return STATUS_SUCCESS;
     }
-    uint32 i = Vcb->LastReadTrack;
 
 #ifdef _UDF_STRUCTURES_H_
     if (Vcb->BSBM_Bitmap) {
@@ -1036,7 +1035,7 @@ UDFReadSectors(
     OUT PULONG ReadBytes
     )
 {
-    return UDFTRead(IrpContext, Vcb, Buffer, BCount*Vcb->SectorSize, Lba, ReadBytes);
+    return UDFTRead(IrpContext, Vcb, Buffer, BCount*Vcb->SectorSize, Lba, ReadBytes, 0);
 } // end UDFReadSectors()
 
 /*
@@ -1167,7 +1166,7 @@ UDFWriteSectors(
             Vcb->LastLBA = Lba+BCount-1;
     }
 
-    status = UDFTWrite(IrpContext, Vcb, Buffer, BCount<<Vcb->SectorShift, Lba, WrittenBytes);
+    status = UDFTWrite(IrpContext, Vcb, Buffer, BCount<<Vcb->SectorShift, Lba, WrittenBytes, 0);
     ASSERT(NT_SUCCESS(status));
 
     return status;

drivers/filesystems/udfs/Include/phys_lib.h

@@ -15,7 +15,7 @@ UDFTRead(
     SIZE_T Length,
     ULONG LBA,
     PULONG ReadBytes,
-    ULONG Flags = 0
+    ULONG Flags
     );
 
 NTSTATUS
@@ -26,7 +26,7 @@ UDFTWrite(
     IN SIZE_T Length,
     IN ULONG LBA,
     OUT PSIZE_T WrittenBytes,
-    IN ULONG Flags = 0
+    IN ULONG Flags
     );
 
 #define PH_TMP_BUFFER          1

drivers/filesystems/udfs/Include/string_lib.cpp → drivers/filesystems/udfs/Include/string_lib.c

@@ -4,7 +4,6 @@
 // This file was released under the GPLv2 on June 2015.
 ////////////////////////////////////////////////////////////////////
 
-extern "C"
 ULONG
 MyRtlCompareMemory(
     PVOID s1,
@@ -26,7 +25,6 @@ MyRtlCompareMemory(
 
 #ifndef NT_NATIVE_MODE
 
-extern "C"
 ULONG
 RtlCompareUnicodeString(
     PUNICODE_STRING s1,
@@ -41,7 +39,6 @@ RtlCompareUnicodeString(
     return i;
 }
 
-extern "C"
 NTSTATUS
 RtlUpcaseUnicodeString(
     PUNICODE_STRING dst,
@@ -57,7 +54,6 @@ RtlUpcaseUnicodeString(
     return STATUS_SUCCESS;
 }
 
-extern "C"
 NTSTATUS
 RtlAppendUnicodeToString(
     IN PUNICODE_STRING Str1,