diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-12-30 13:10:17 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-12-30 13:10:17 +0000 |
| commit | bb4dacc84d5edf29afb4352af1b1ad742949c0b3 (patch) | |
| tree | 5c5346fdb54f8504020139abdbc5de24d713af53 /plugins/Dbx_mmap_SA | |
| parent | 60d2f4aefe8ec6e16d2aa64f585895ea95d7dda9 (diff) | |
faster conversion implementation
git-svn-id: http://svn.miranda-ng.org/main/trunk@7426 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Dbx_mmap_SA')
| -rw-r--r-- | plugins/Dbx_mmap_SA/src/dbintf_sa.cpp | 6 | ||||
| -rw-r--r-- | plugins/Dbx_mmap_SA/src/security.cpp | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/plugins/Dbx_mmap_SA/src/dbintf_sa.cpp b/plugins/Dbx_mmap_SA/src/dbintf_sa.cpp index f4a91c7f70..f3d9a7549d 100644 --- a/plugins/Dbx_mmap_SA/src/dbintf_sa.cpp +++ b/plugins/Dbx_mmap_SA/src/dbintf_sa.cpp @@ -23,11 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "commonheaders.h"
-extern "C"
-{
- MIR_CORE_DLL(void) db_setCurrent(MIDatabase* _db);
-};
-
#define NeedBytes(n) if(bytesRemaining<(n)) pBlob=(PBYTE)DBRead(ofsBlobPtr,(n),&bytesRemaining)
#define MoveAlong(n) {int x=n; pBlob+=(x); ofsBlobPtr+=(x); bytesRemaining-=(x);}
#define VLT(n) ((n==DBVT_UTF8)?DBVT_ASCIIZ:n)
@@ -58,7 +53,6 @@ int CDbxMmapSA::Load(bool bSkipInit) return 1;
// password validated ok? decrypt database
- db_setCurrent(this);
DecodeAll();
m_bEncoding = false;
WritePlainHeader();
diff --git a/plugins/Dbx_mmap_SA/src/security.cpp b/plugins/Dbx_mmap_SA/src/security.cpp index eb997e1eb8..7b53a88187 100644 --- a/plugins/Dbx_mmap_SA/src/security.cpp +++ b/plugins/Dbx_mmap_SA/src/security.cpp @@ -176,7 +176,7 @@ int SelectEncoder() void CDbxMmapSA::EncodeAll()
{
- for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
+ for (HANDLE hContact = FindFirstContact(); hContact; hContact = FindNextContact(hContact)) {
EncodeContactEvents(hContact);
EncodeContactSettings(hContact);
}
@@ -187,7 +187,7 @@ void CDbxMmapSA::EncodeAll() void CDbxMmapSA::DecodeAll()
{
- for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
+ for (HANDLE hContact = FindFirstContact(); hContact; hContact = FindNextContact(hContact)) {
DecodeContactEvents(hContact);
DecodeContactSettings(hContact);
}
|