From: SomeDude Date: Fri, 21 Mar 2008 17:04:00 +0000 (+0100) Subject: version 0.2.3 X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=a007770a843aa759763b98288c9432c3906ce5c6;p=fms.git version 0.2.3 --- diff --git a/include/global.h b/include/global.h index 5240cc7..db939a4 100644 --- a/include/global.h +++ b/include/global.h @@ -2,10 +2,9 @@ #define _global_ #include -//#include #include "pthreadwrapper/thread.h" -#define FMS_VERSION "0.2.2" +#define FMS_VERSION "0.2.3" // opens database and creates tables and initial inserts if necessary void SetupDB(); @@ -26,9 +25,6 @@ void SigHandler(int signum); void MainFunction(); void Shutdown(); -//void StartThreads(std::vector &threads); -//void ShutdownThreads(std::vector &threads); - // needed for Windows to setup network void SetupNetwork(); // cleanup network on Windows diff --git a/src/freenet/trustlistxml.cpp b/src/freenet/trustlistxml.cpp index 6b0329a..ebe0b60 100644 --- a/src/freenet/trustlistxml.cpp +++ b/src/freenet/trustlistxml.cpp @@ -151,6 +151,8 @@ const bool TrustListXML::ParseXML(const std::string &xml) identity=""; messagetrust=-1; trustlisttrust=-1; + messagetrustcomment=""; + trustlisttrustcomment=""; TiXmlHandle hnd2(node); txt=hnd2.FirstChild("Identity").FirstChild().ToText(); diff --git a/src/global.cpp b/src/global.cpp index 087ce1c..251ea2a 100644 --- a/src/global.cpp +++ b/src/global.cpp @@ -741,72 +741,6 @@ void SigHandler(int signum) exit(0); } -/* -void ShutdownThreads(std::vector &threads) -{ - std::vector::iterator i; - for(i=threads.begin(); i!=threads.end(); i++) - { - (*i)->Cancel(); - } - - for(i=threads.begin(); i!=threads.end(); i++) - { - LogFile::Instance()->WriteLog(LogFile::LOGLEVEL_DEBUG,"ShutdownThreads waiting for thread to exit."); - //(*i)->wait(); - (*i)->Join(); - delete (*i); - } - - threads.clear(); - -} - -void StartThreads(std::vector &threads) -{ - std::string startfreenet; - std::string startnntp; - std::string starthttp; - - if(Option::Instance()->Get("StartFreenetUpdater",startfreenet)==false) - { - startfreenet="true"; - Option::Instance()->Set("StartFreenetUpdater","true"); - } - - if(Option::Instance()->Get("StartNNTP",startnntp)==false) - { - startnntp="true"; - Option::Instance()->Set("StartNNTP","true"); - } - - if(Option::Instance()->Get("StartHTTP",starthttp)==false) - { - starthttp="true"; - Option::Instance()->Set("StartHTTP","true"); - } - - if(startfreenet=="true") - { - PThread::Thread *t=new PThread::Thread(new FreenetMasterThread()); - threads.push_back(t); - } - - if(startnntp=="true") - { - PThread::Thread *t=new PThread::Thread(new NNTPListener()); - threads.push_back(t); - } - - if(starthttp=="true") - { - PThread::Thread *t=new PThread::Thread(new HTTPThread()); - threads.push_back(t); - } - -} -*/ - void FixCapitalBoardNames() { SQLite3DB::DB *db=SQLite3DB::DB::Instance();