From a7001dfd139fbb9d5cf5434fc40370f8da0cf04c Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 28 Jul 2012 12:35:00 +0000
Subject: perversive error reporting schema in DATABASELINK removed

git-svn-id: http://svn.miranda-ng.org/main/trunk@1223 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Db3x/src/commonheaders.h |  1 +
 plugins/Db3x/src/init.cpp        | 77 +++++++++++-----------------------------
 2 files changed, 21 insertions(+), 57 deletions(-)

(limited to 'plugins/Db3x')

diff --git a/plugins/Db3x/src/commonheaders.h b/plugins/Db3x/src/commonheaders.h
index 5175ad67b9..e12db161bc 100644
--- a/plugins/Db3x/src/commonheaders.h
+++ b/plugins/Db3x/src/commonheaders.h
@@ -39,6 +39,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <io.h>
 #include <string.h>
 #include <direct.h>
+#include <memory>
 
 #include <newpluginapi.h>
 #include <win2k.h>
diff --git a/plugins/Db3x/src/init.cpp b/plugins/Db3x/src/init.cpp
index 6f021aa283..513731b824 100644
--- a/plugins/Db3x/src/init.cpp
+++ b/plugins/Db3x/src/init.cpp
@@ -46,56 +46,23 @@ LIST<CDb3x> g_Dbs(1, (LIST<CDb3x>::FTSortFunc)HandleKeySort);
 /////////////////////////////////////////////////////////////////////////////////////////
 
 // returns 0 if the profile is created, EMKPRF*
-static int makeDatabase(const TCHAR *profile, int *error)
+static int makeDatabase(const TCHAR *profile)
 {
-	CDb3x *tmp = new CDb3x(profile);
-	if (tmp->Create() == ERROR_SUCCESS) {
-		tmp->CreateDbHeaders();
-		delete tmp;
-		return 0;
-	}
-	delete tmp;
-	if (error != NULL) *error = EMKPRF_CREATEFAILED;
-	return 1;
+	std::auto_ptr<CDb3x> db(new CDb3x(profile));
+	if (db->Create() != ERROR_SUCCESS)
+		return EMKPRF_CREATEFAILED;
+	
+	return db->CreateDbHeaders();
 }
 
 // returns 0 if the given profile has a valid header
-static int grokHeader(const TCHAR *profile, int *error)
+static int grokHeader(const TCHAR *profile)
 {
-	CDb3x *tmp = new CDb3x(profile);
-	if (tmp->Load(true) != ERROR_SUCCESS) {
-		delete tmp;
-		if (error != NULL) *error = EGROKPRF_CANTREAD;
-		return 1;
-	}
+	std::auto_ptr<CDb3x> db(new CDb3x(profile));
+	if (db->Load(true) != ERROR_SUCCESS)
+		return EGROKPRF_CANTREAD;
 
-	int chk = tmp->CheckDbHeaders();
-	delete tmp;
-	if ( chk == 0 ) {
-		// all the internal tests passed, hurrah
-		if (error != NULL) *error = 0;
-		return 0;
-	}
-	
-	// didn't pass at all, or some did.
-	switch ( chk ) {
-	case 1:
-		// "Miranda ICQ DB" wasn't present
-		if (error != NULL) *error = EGROKPRF_UNKHEADER;
-		break;
-
-	case 2:
-		// header was present, but version information newer
-		if (error != NULL) *error =  EGROKPRF_VERNEWER;
-		break;
-
-	case 3:
-		// header/version OK, internal data missing
-		if (error != NULL) *error = EGROKPRF_DAMAGED;
-		break;
-	}
-
-	return 1;
+	return db->CheckDbHeaders();
 }
 
 // returns 0 if all the APIs are injected otherwise, 1
@@ -104,14 +71,12 @@ static MIDatabase* LoadDatabase(const TCHAR *profile)
 	// set the memory, lists & UTF8 manager
 	mir_getLP( &pluginInfo );
 
-	CDb3x* db = new CDb3x(profile);
-	if (db->Load(false) != ERROR_SUCCESS) {
-		delete db;
+	std::auto_ptr<CDb3x> db(new CDb3x(profile));
+	if (db->Load(false) != ERROR_SUCCESS)
 		return NULL;
-	}
 
-	g_Dbs.insert(db);
-	return db;
+	g_Dbs.insert(db.get());
+	return db.release();
 }
 
 static int UnloadDatabase(MIDatabase* db)
@@ -121,24 +86,22 @@ static int UnloadDatabase(MIDatabase* db)
 	return 0;
 }
 
-MIDatabaseChecker* CheckDb(const TCHAR* ptszFileName, int *error)
+MIDatabaseChecker* CheckDb(const TCHAR* profile, int *error)
 {
-	CDb3x *tmp = new CDb3x(ptszFileName);
-	if (tmp->Load(true) != ERROR_SUCCESS) {
-		delete tmp;
+	std::auto_ptr<CDb3x> db(new CDb3x(profile));
+	if (db->Load(true) != ERROR_SUCCESS) {
 		if (error != NULL) *error = EGROKPRF_CANTREAD;
 		return NULL;
 	}
 
-	int chk = tmp->CheckDbHeaders();
+	int chk = db->CheckDbHeaders();
 	if (chk != ERROR_SUCCESS) {
-		delete tmp;
 		*error = chk;
 		return NULL;
 	}
 
 	*error = 0;
-	return tmp;
+	return db.release();
 }
 
 static DATABASELINK dblink =
-- 
cgit v1.2.3