From 7b8b7fa685ea5de62002d5637b4c34e19dfedeee Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 7 Feb 2014 14:08:15 +0000 Subject: - 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 --- plugins/Db3x_mmap/src/dbheaders.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/Db3x_mmap/src/dbheaders.cpp') diff --git a/plugins/Db3x_mmap/src/dbheaders.cpp b/plugins/Db3x_mmap/src/dbheaders.cpp index 97e7b915fe..de8ce57bac 100644 --- a/plugins/Db3x_mmap/src/dbheaders.cpp +++ b/plugins/Db3x_mmap/src/dbheaders.cpp @@ -25,13 +25,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. //the cache has not been loaded when these functions are used -int CDb3Base::CreateDbHeaders(const DBSignature& _sign) +int CDb3Mmap::CreateDbHeaders(const DBSignature& _sign) { DWORD bytesWritten; CopyMemory(m_dbHeader.signature, &_sign, sizeof(m_dbHeader.signature)); - m_dbHeader.version = DB_THIS_VERSION; + m_dbHeader.version = DB_095_VERSION; m_dbHeader.ofsFileEnd = sizeof(struct DBHeader); m_dbHeader.slackSpace = 0; m_dbHeader.contactCount = 0; @@ -52,14 +52,14 @@ int CDb3Base::CreateDbHeaders(const DBSignature& _sign) return 0; } -int CDb3Base::CheckDbHeaders() +int CDb3Mmap::CheckDbHeaders() { if (memcmp(m_dbHeader.signature, &dbSignatureU, sizeof(m_dbHeader.signature)) && memcmp(m_dbHeader.signature, &dbSignatureE, sizeof(m_dbHeader.signature)) && memcmp(m_dbHeader.signature, &dbSignatureIM, sizeof(m_dbHeader.signature))) return EGROKPRF_UNKHEADER; - if (m_dbHeader.version != DB_THIS_VERSION && m_dbHeader.version != DB_OLD_VERSION) + if (m_dbHeader.version != DB_095_VERSION && m_dbHeader.version != DB_094_VERSION && m_dbHeader.version != DB_OLD_VERSION) return EGROKPRF_VERNEWER; if (m_dbHeader.ofsUser == 0) @@ -68,7 +68,7 @@ int CDb3Base::CheckDbHeaders() return 0; } -void CDb3Base::WriteSignature(DBSignature &sign) +void CDb3Mmap::WriteSignature(DBSignature &sign) { memcpy(&m_dbHeader.signature, &sign, sizeof(DBSignature)); DBWrite(0, &sign, sizeof(DBSignature)); -- cgit v1.2.3