diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-07-28 18:29:52 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-07-28 18:29:52 +0000 |
| commit | be3185a374d39a8ee0f12a4e985ecca279633fff (patch) | |
| tree | 14ba64a79d7dd62d95797db402950702a24667fe /plugins/Dbx_tree | |
| parent | 61be34f18c2d61c075a7e268aa9aab89b78ec17a (diff) | |
- MS_DB_CHECKPROFILE - service for checking databases
- added menu item "Check" to a context menu in profile manager
git-svn-id: http://svn.miranda-ng.org/main/trunk@1228 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Dbx_tree')
| -rw-r--r-- | plugins/Dbx_tree/DataBase.cpp | 38 | ||||
| -rw-r--r-- | plugins/Dbx_tree/DatabaseLink.cpp | 4 |
2 files changed, 21 insertions, 21 deletions
diff --git a/plugins/Dbx_tree/DataBase.cpp b/plugins/Dbx_tree/DataBase.cpp index b685981037..033e472c9d 100644 --- a/plugins/Dbx_tree/DataBase.cpp +++ b/plugins/Dbx_tree/DataBase.cpp @@ -106,25 +106,25 @@ int CDataBase::CheckFile(TDBFileType Index) HANDLE htmp = CreateFile(m_FileName[Index], GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, NULL);
if (htmp != INVALID_HANDLE_VALUE)
{
- SetFilePointer(htmp, 0, NULL, FILE_BEGIN);
- if (ReadFile(htmp, &h, sizeof(h), &r, NULL))
- {
- if (0 != memcmp(h.Gen.Signature, cFileSignature[Index], sizeof(cFileSignature[Index])))
- {
- CloseHandle(htmp);
- return EGROKPRF_UNKHEADER;
- }
-
- if (cDBVersion < h.Gen.Version)
- {
- CloseHandle(htmp);
- return EGROKPRF_VERNEWER;
- }
-
- CloseHandle(htmp);
- return EGROKPRF_NOERROR;
- }
- CloseHandle(htmp);
+ SetFilePointer(htmp, 0, NULL, FILE_BEGIN);
+ if (ReadFile(htmp, &h, sizeof(h), &r, NULL))
+ {
+ if (0 != memcmp(h.Gen.Signature, cFileSignature[Index], sizeof(cFileSignature[Index])))
+ {
+ CloseHandle(htmp);
+ return EGROKPRF_UNKHEADER;
+ }
+
+ if (cDBVersion < h.Gen.Version)
+ {
+ CloseHandle(htmp);
+ return EGROKPRF_VERNEWER;
+ }
+
+ CloseHandle(htmp);
+ return EGROKPRF_NOERROR;
+ }
+ CloseHandle(htmp);
}
return EGROKPRF_CANTREAD;
diff --git a/plugins/Dbx_tree/DatabaseLink.cpp b/plugins/Dbx_tree/DatabaseLink.cpp index 579076613d..79c1758fca 100644 --- a/plugins/Dbx_tree/DatabaseLink.cpp +++ b/plugins/Dbx_tree/DatabaseLink.cpp @@ -38,7 +38,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. static int makeDatabase(const TCHAR *profile)
{
std::auto_ptr<CDataBase> db( new CDataBase(profile));
- return gDataBase->CreateDB();
+ return db->CreateDB();
}
/*
@@ -54,7 +54,7 @@ static int makeDatabase(const TCHAR *profile) static int grokHeader(const TCHAR *profile)
{
std::auto_ptr<CDataBase> db( new CDataBase(profile));
- return gDataBase->CheckDB();
+ return db->CheckDB();
}
/*
|