From 5555f6185cfb5d5e64f0441ec52e9e14a920b63c Mon Sep 17 00:00:00 2001
From: ahodgkinson <ahodgkinson@0109f412-320b-0410-ab79-c3e0c5ffbbe6>
Date: Thu, 20 Jul 2006 22:27:19 +0000
Subject: [PATCH] Changed FLM_IO_MISALIGNED_OK to be FLM_IO_NO_MISALIGNED.

git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@689 0109f412-320b-0410-ab79-c3e0c5ffbbe6
---
 flaim/src/rfl.cpp       | 8 +++-----
 ftk/src/ftk.h           | 2 +-
 ftk/src/ftknlm.cpp      | 2 +-
 ftk/src/ftkunix.cpp     | 2 +-
 ftk/src/ftkwin.cpp      | 2 +-
 xflaim/src/fsysdata.cpp | 2 +-
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/flaim/src/rfl.cpp b/flaim/src/rfl.cpp
index f2beac0..090a0f3 100644
--- a/flaim/src/rfl.cpp
+++ b/flaim/src/rfl.cpp
@@ -285,11 +285,10 @@ Exit:
 Desc:		Positions to the offset specified in the RFL file.
 *********************************************************************/
 RCODE F_Rfl::positionTo(
-	FLMUINT	uiFileOffset)
+	FLMUINT			uiFileOffset)
 {
-	RCODE		rc = FERR_OK;
-	FLMUINT	uiBytesToRead;
-	FLMUINT	uiBytesRead;
+	RCODE				rc = FERR_OK;
+	FLMUINT			uiBytesRead;
 
 	// Should never be attempting to position to something less than 512 -
 	// the header is stored in the first 512 bytes.
@@ -317,7 +316,6 @@ RCODE F_Rfl::positionTo(
 		// Populate the buffer from the 512 byte boundary that is just
 		// before the offset we are trying to position to.
 
-		uiBytesToRead = MOD_512( uiFileOffset);
 		m_pCurrentBuf->uiRflFileOffset = ROUND_DOWN_TO_NEAREST_512( uiFileOffset);
 		m_pCurrentBuf->uiRflBufBytes = MOD_512( uiFileOffset);
 
diff --git a/ftk/src/ftk.h b/ftk/src/ftk.h
index 9578064..56bb14e 100644
--- a/ftk/src/ftk.h
+++ b/ftk/src/ftk.h
@@ -655,7 +655,7 @@
 	#define FLM_IO_SH_DENYNONE						0x0040
 	#define FLM_IO_DIRECT							0x0080
 	#define FLM_IO_DELETE_ON_RELEASE				0x0100
-	#define FLM_IO_MISALIGNED_OK					0x0200
+	#define FLM_IO_NO_MISALIGNED					0x0200
 
 	// File Positioning Definitions
 
diff --git a/ftk/src/ftknlm.cpp b/ftk/src/ftknlm.cpp
index 961b3c1..b617490 100644
--- a/ftk/src/ftknlm.cpp
+++ b/ftk/src/ftknlm.cpp
@@ -1474,7 +1474,7 @@ Retry_Create:
 	
 	if( bDoDirectIO)
 	{
-		if( (uiIoFlags & FLM_IO_MISALIGNED_OK) == 0)
+		if( uiIoFlags & FLM_IO_NO_MISALIGNED)
 		{
 			m_bRequireAlignedIO = TRUE;
 		}
diff --git a/ftk/src/ftkunix.cpp b/ftk/src/ftkunix.cpp
index c980d51..1e394fd 100644
--- a/ftk/src/ftkunix.cpp
+++ b/ftk/src/ftkunix.cpp
@@ -302,7 +302,7 @@ Retry_Create:
 	
 	if( bDoDirectIO)
 	{
-		if( (uiIoFlags & FLM_IO_MISALIGNED_OK) == 0)
+		if( uiIoFlags & FLM_IO_NO_MISALIGNED)
 		{
 			m_bRequireAlignedIO = TRUE;
 		}
diff --git a/ftk/src/ftkwin.cpp b/ftk/src/ftkwin.cpp
index 8a5379d..dab404f 100644
--- a/ftk/src/ftkwin.cpp
+++ b/ftk/src/ftkwin.cpp
@@ -235,7 +235,7 @@ Retry_Create:
 	
 	if( bDoDirectIO)
 	{
-		if( (uiIoFlags & FLM_IO_MISALIGNED_OK) == 0)
+		if( uiIoFlags & FLM_IO_NO_MISALIGNED)
 		{
 			m_bRequireAlignedIO = TRUE;
 		}
diff --git a/xflaim/src/fsysdata.cpp b/xflaim/src/fsysdata.cpp
index e2366bc..e1c711b 100644
--- a/xflaim/src/fsysdata.cpp
+++ b/xflaim/src/fsysdata.cpp
@@ -1283,7 +1283,7 @@ RCODE F_DbSystem::init( void)
 	}
 
 	gv_XFlmSysData.uiFileOpenFlags = 
-		FLM_IO_RDWR | FLM_IO_SH_DENYNONE | FLM_IO_DIRECT | FLM_IO_MISALIGNED_OK;
+		FLM_IO_RDWR | FLM_IO_SH_DENYNONE | FLM_IO_DIRECT;
 
 	gv_XFlmSysData.uiFileCreateFlags = 
 		gv_XFlmSysData.uiFileOpenFlags | FLM_IO_EXCL | FLM_IO_CREATE_DIR;