- the internal DBContact structure extended to hold one more DWORD: contact ID;

- when called from dbchecker, mmap now refuses to check the old versions of database;
- old classes hierarchy removed, all classes were merged into one due to the death of db3x & mmap_sa;
- version bump

git-svn-id: http://svn.miranda-ng.org/main/trunk@8061 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 5 insertions, 5 deletions

diff --git a/plugins/Db3x_mmap/src/dbtool/disk.cpp b/plugins/Db3x_mmap/src/dbtool/disk.cpp
index d22afb70d9..7cd4dfd88c 100644
--- a/plugins/Db3x_mmap/src/dbtool/disk.cpp
+++ b/plugins/Db3x_mmap/src/dbtool/disk.cpp
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "..\commonheaders.h"

 

-int CDb3Base::SignatureValid(DWORD ofs, DWORD signature)

+int CDb3Mmap::SignatureValid(DWORD ofs, DWORD signature)

 {

 	if (ofs + sizeof(DWORD) >= sourceFileSize) {

 		cb->pfnAddLogMessage(STATUS_ERROR, TranslateT("Invalid offset found (database truncated?)"));

@@ -30,7 +30,7 @@ int CDb3Base::SignatureValid(DWORD ofs, DWORD signature)
 	return sig == signature;

 }

 

-int CDb3Base::PeekSegment(DWORD ofs, PVOID buf, int cbBytes)

+int CDb3Mmap::PeekSegment(DWORD ofs, PVOID buf, int cbBytes)

 {

 	if (ofs >= sourceFileSize) {

 		cb->pfnAddLogMessage(STATUS_ERROR, TranslateT("Invalid offset found"));

@@ -54,7 +54,7 @@ int CDb3Base::PeekSegment(DWORD ofs, PVOID buf, int cbBytes)
 	return ERROR_SUCCESS;

 }

 

-int CDb3Base::ReadSegment(DWORD ofs, PVOID buf, int cbBytes)

+int CDb3Mmap::ReadSegment(DWORD ofs, PVOID buf, int cbBytes)

 {

 	int ret = PeekSegment(ofs, buf, cbBytes);

 	if (ret != ERROR_SUCCESS && ret != ERROR_HANDLE_EOF) return ret;

@@ -70,7 +70,7 @@ int CDb3Base::ReadSegment(DWORD ofs, PVOID buf, int cbBytes)
 	return ERROR_SUCCESS;

 }

 

-DWORD CDb3Base::WriteSegment(DWORD ofs, PVOID buf, int cbBytes)

+DWORD CDb3Mmap::WriteSegment(DWORD ofs, PVOID buf, int cbBytes)

 {

 	DWORD bytesWritten;

 	if (cb->bCheckOnly) return 0xbfbfbfbf;

@@ -87,7 +87,7 @@ DWORD CDb3Base::WriteSegment(DWORD ofs, PVOID buf, int cbBytes)
 	return ofs;

 }

 

-int CDb3Base::ReadWrittenSegment(DWORD ofs, PVOID buf, int cbBytes)

+int CDb3Mmap::ReadWrittenSegment(DWORD ofs, PVOID buf, int cbBytes)

 {

 	DWORD bytesRead;

 	if (cb->bCheckOnly) return 0xbfbfbfbf;