From 2c7fc280f5824710149f5f0137ac828878420a7a Mon Sep 17 00:00:00 2001 From: Alexey Uzhva Date: Wed, 27 Aug 2008 10:12:09 +0000 Subject: fixes git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2312 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/serverdb/libkviserverdb.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'src/modules/serverdb/libkviserverdb.cpp') diff --git a/src/modules/serverdb/libkviserverdb.cpp b/src/modules/serverdb/libkviserverdb.cpp index 9cd873943..61f7e939c 100644 --- a/src/modules/serverdb/libkviserverdb.cpp +++ b/src/modules/serverdb/libkviserverdb.cpp @@ -107,7 +107,7 @@ static bool serverdb_kvs_fnc_serverExists(KviKvsModuleFunctionCall * c) if(!szNetwork.isEmpty()) { // Check in the given network - KviServerDataBaseRecord * pRecord = g_pServerDataBase->findRecord(szNetwork); + KviNetwork * pRecord = g_pServerDataBase->findNetwork(szNetwork); if(!pRecord) { c->returnValue()->setBoolean(false); @@ -124,9 +124,9 @@ static bool serverdb_kvs_fnc_serverExists(KviKvsModuleFunctionCall * c) c->returnValue()->setBoolean(true); } else { // Check through all networks - KviPointerHashTableIterator it(*(g_pServerDataBase->recordDict())); + KviPointerHashTableIterator it(*(g_pServerDataBase->recordDict())); - while(KviServerDataBaseRecord * r = it.current()) + while(KviNetwork * r = it.current()) { KviPointerList * sl = r->serverList(); @@ -688,13 +688,7 @@ static bool serverdb_kvs_cmd_addNetwork(KviKvsModuleCommandCall * c) pNetwork = new KviNetwork(szNetName); if(c->switches()->find('a',"autoconnect")) pNetwork->setAutoConnect(true); - KviServerDataBaseRecord * pRecord = g_pServerDataBase->addNetwork(pNetwork); - if(!pRecord) - { - c->error("Internal error: KVIrc author screwed up","serverdb"); - return false; - } - + g_pServerDataBase->addNetwork(pNetwork); return true; } @@ -760,7 +754,7 @@ static bool serverdb_kvs_cmd_addServer(KviKvsModuleCommandCall * c) return false; } - KviServerDataBaseRecord * pRecord = g_pServerDataBase->findRecord(szNetwork); + KviNetwork * pRecord = g_pServerDataBase->findNetwork(szNetwork); if(!pRecord) { // FIXME: default to orphan servers @@ -866,7 +860,7 @@ static bool serverdb_kvs_cmd_addServer(KviKvsModuleCommandCall * c) return false; \ } \ \ - KviServerDataBaseRecord * pRecord = g_pServerDataBase->findRecord(szNetName); \ + KviNetwork * pRecord = g_pServerDataBase->findNetwork(szNetName); \ if(!pRecord) \ { \ if(c->switches()->find('q',"quiet")) return true; \ -- cgit v1.3.1-10-gc9f91