Author: akhaldi Date: Tue Jan 28 21:21:04 2014 New Revision: 61869
URL: http://svn.reactos.org/svn/reactos?rev=61869&view=rev Log: [NTFS] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716
Modified: trunk/reactos/drivers/filesystems/ntfs/attrib.c trunk/reactos/drivers/filesystems/ntfs/blockdev.c trunk/reactos/drivers/filesystems/ntfs/close.c trunk/reactos/drivers/filesystems/ntfs/create.c trunk/reactos/drivers/filesystems/ntfs/dirctl.c trunk/reactos/drivers/filesystems/ntfs/dispatch.c trunk/reactos/drivers/filesystems/ntfs/fastio.c trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/finfo.c trunk/reactos/drivers/filesystems/ntfs/fsctl.c trunk/reactos/drivers/filesystems/ntfs/mft.c trunk/reactos/drivers/filesystems/ntfs/misc.c trunk/reactos/drivers/filesystems/ntfs/ntfs.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h trunk/reactos/drivers/filesystems/ntfs/rw.c
Modified: trunk/reactos/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/at... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Tue Jan 28 21:21:04 2014 @@ -31,9 +31,6 @@ #define NDEBUG #include <debug.h>
-/* GLOBALS *****************************************************************/ - - /* FUNCTIONS ****************************************************************/
static
Modified: trunk/reactos/drivers/filesystems/ntfs/blockdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/bl... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/blockdev.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/blockdev.c [iso-8859-1] Tue Jan 28 21:21:04 2014 @@ -29,9 +29,6 @@
#define NDEBUG #include <debug.h> - -/* GLOBALS *****************************************************************/ -
/* FUNCTIONS ****************************************************************/
Modified: trunk/reactos/drivers/filesystems/ntfs/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/cl... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/close.c [iso-8859-1] Tue Jan 28 21:21:04 2014 @@ -30,9 +30,6 @@
#define NDEBUG #include <debug.h> - -/* GLOBALS *****************************************************************/ -
/* FUNCTIONS ****************************************************************/
Modified: trunk/reactos/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/cr... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] Tue Jan 28 21:21:04 2014 @@ -29,9 +29,6 @@
#define NDEBUG #include <debug.h> - -/* GLOBALS *****************************************************************/ -
/* FUNCTIONS ****************************************************************/
Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/di... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Tue Jan 28 21:21:04 2014 @@ -29,9 +29,6 @@
#define NDEBUG #include <debug.h> - -/* GLOBALS *****************************************************************/ -
/* FUNCTIONS ****************************************************************/
Modified: trunk/reactos/drivers/filesystems/ntfs/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/di... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] Tue Jan 28 21:21:04 2014 @@ -30,9 +30,6 @@
#define NDEBUG #include <debug.h> - -/* GLOBALS *****************************************************************/ -
/* FUNCTIONS ****************************************************************/
Modified: trunk/reactos/drivers/filesystems/ntfs/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/fa... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fastio.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fastio.c [iso-8859-1] Tue Jan 28 21:21:04 2014 @@ -31,7 +31,6 @@ #include <debug.h>
#include "ntfs.h" -
/* FUNCTIONS ****************************************************************/
Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/fc... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Tue Jan 28 21:21:04 2014 @@ -30,15 +30,9 @@ #define NDEBUG #include <debug.h>
-/* GLOBALS *****************************************************************/ - - - /* MACROS *******************************************************************/
#define TAG_FCB 'BCFI' - -
/* FUNCTIONS ****************************************************************/
Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/fi... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Tue Jan 28 21:21:04 2014 @@ -29,9 +29,6 @@
#define NDEBUG #include <debug.h> - -/* GLOBALS *****************************************************************/ -
/* FUNCTIONS ****************************************************************/
Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/fs... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Tue Jan 28 21:21:04 2014 @@ -29,10 +29,10 @@
#include "ntfs.h"
+#include <ntdddisk.h> + #define NDEBUG #include <debug.h> - -/* GLOBALS *****************************************************************/
/* FUNCTIONS ****************************************************************/
Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/mf... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Tue Jan 28 21:21:04 2014 @@ -31,11 +31,7 @@ #define NDEBUG #include <debug.h>
-/* GLOBALS *****************************************************************/ - - /* FUNCTIONS ****************************************************************/ -
NTSTATUS NtfsOpenMft(PDEVICE_EXTENSION Vcb)
Modified: trunk/reactos/drivers/filesystems/ntfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/mi... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/misc.c [iso-8859-1] Tue Jan 28 21:21:04 2014 @@ -30,9 +30,6 @@
#define NDEBUG #include <debug.h> - -/* GLOBALS *****************************************************************/ -
/* FUNCTIONS ****************************************************************/
Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/nt... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.c [iso-8859-1] Tue Jan 28 21:21:04 2014 @@ -34,7 +34,6 @@ /* GLOBALS *****************************************************************/
PNTFS_GLOBAL_DATA NtfsGlobalData = NULL; -
/* FUNCTIONS ****************************************************************/
Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/nt... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Tue Jan 28 21:21:04 2014 @@ -2,8 +2,6 @@ #define NTFS_H
#include <ntifs.h> -#include <ntddk.h> -#include <ntdddisk.h>
#define CACHEPAGESIZE(pDeviceExt) \ ((pDeviceExt)->NtfsInfo.UCHARsPerCluster > PAGE_SIZE ? \
Modified: trunk/reactos/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/rw... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] Tue Jan 28 21:21:04 2014 @@ -32,12 +32,10 @@ #define NDEBUG #include <debug.h>
- /* GLOBALS *******************************************************************/
#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) #define ROUND_DOWN(N, S) ((N) - ((N) % (S))) -
/* FUNCTIONS ****************************************************************/