From 0562a8528e465d22b81fde700b63699f35fcf5a7 Mon Sep 17 00:00:00 2001
From: Kirill Volinsky <mataes2007@gmail.com>
Date: Fri, 6 Sep 2013 07:00:04 +0000
Subject: db names standartization

git-svn-id: http://svn.miranda-ng.org/main/trunk@5960 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Db3x/src/init.cpp                      | 4 ++--
 plugins/Db3x_mmap/src/dbtool/initialchecks.cpp | 2 --
 plugins/Db3x_mmap/src/init.cpp                 | 4 ++--
 plugins/Dbx_mmap_SA/src/init.cpp               | 4 ++--
 plugins/Dbx_tree/src/DatabaseLink.cpp          | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/plugins/Db3x/src/init.cpp b/plugins/Db3x/src/init.cpp
index 629f39d4c6..9b0e5d81be 100644
--- a/plugins/Db3x/src/init.cpp
+++ b/plugins/Db3x/src/init.cpp
@@ -108,8 +108,8 @@ MIDatabaseChecker* CheckDb(const TCHAR* profile, int *error)
 static DATABASELINK dblink =
 {
 	sizeof(DATABASELINK),
-	"db3x driver",
-	_T("db3x database support"),
+	"db3x",
+	_T("db3x driver"),
 	makeDatabase,
 	grokHeader,
 	LoadDatabase,
diff --git a/plugins/Db3x_mmap/src/dbtool/initialchecks.cpp b/plugins/Db3x_mmap/src/dbtool/initialchecks.cpp
index 5769eff84d..ee3c1fe729 100644
--- a/plugins/Db3x_mmap/src/dbtool/initialchecks.cpp
+++ b/plugins/Db3x_mmap/src/dbtool/initialchecks.cpp
@@ -18,8 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 #include "..\commonheaders.h"
 
-extern DBSignature dbSignature;
-
 int CDb3Base::WorkInitialCheckHeaders()
 {
 	if (memcmp(m_dbHeader.signature, &dbSignature, sizeof(m_dbHeader.signature))) {
diff --git a/plugins/Db3x_mmap/src/init.cpp b/plugins/Db3x_mmap/src/init.cpp
index a0c0324183..c596b72755 100644
--- a/plugins/Db3x_mmap/src/init.cpp
+++ b/plugins/Db3x_mmap/src/init.cpp
@@ -108,8 +108,8 @@ MIDatabaseChecker* CheckDb(const TCHAR* profile, int *error)
 static DATABASELINK dblink =
 {
 	sizeof(DATABASELINK),
-	"db3x mmap driver",
-	_T("db3x mmap database support"),
+	"dbx_mmap",
+	_T("dbx mmap driver"),
 	makeDatabase,
 	grokHeader,
 	LoadDatabase,
diff --git a/plugins/Dbx_mmap_SA/src/init.cpp b/plugins/Dbx_mmap_SA/src/init.cpp
index 81b20e3a7e..6b673fde1f 100644
--- a/plugins/Dbx_mmap_SA/src/init.cpp
+++ b/plugins/Dbx_mmap_SA/src/init.cpp
@@ -112,8 +112,8 @@ MIDatabaseChecker* CheckDb(const TCHAR* profile, int *error)
 static DATABASELINK dblink =
 {
 	sizeof(DATABASELINK),
-	"db3x secure mmap driver",
-	_T("db3x secure mmap database support"),
+	"dbx_mmap_sa",
+	_T("dbx secure mmap driver"),
 	makeDatabase,
 	grokHeader,
 	LoadDatabase,
diff --git a/plugins/Dbx_tree/src/DatabaseLink.cpp b/plugins/Dbx_tree/src/DatabaseLink.cpp
index 8d3d489341..13dc4848f0 100644
--- a/plugins/Dbx_tree/src/DatabaseLink.cpp
+++ b/plugins/Dbx_tree/src/DatabaseLink.cpp
@@ -86,7 +86,7 @@ static int UnloadDatabase(MIDatabase* db)
 DATABASELINK gDBLink = {
 	sizeof(DATABASELINK),
 	__INTERNAL_NAME,
-	_T(__PLUGIN_NAME),
+	_T("dbx tree driver"),
 	makeDatabase,
 	grokHeader,
 	LoadDatabase,
-- 
cgit v1.2.3