maryjane/syncevolution
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

EDS contacts: better check SYNCEVOLUTION_EDS_ACCESS_MODE in constructor

Browse source 
That way we can initialize m_accessMode immediately in the constructor,
which keeps cppcheck happy and avoids uninitalized data in the instance
between creation and open(), which is better than before.
This commit is contained in:
Patrick Ohly 2014-01-07 01:17:27 -08:00
parent e407d71410
commit ba7e3543f0
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/backends/evolution/EvolutionContactSource.cpp
View file

@ -79,6 +79,10 @@ EvolutionContactSource::EvolutionContactSource(const SyncSourceParams &params,
m_contactsFromDB =
m_contactQueries = 0;
m_readAheadOrder = READ_NONE;
const char *mode = getEnv("SYNCEVOLUTION_EDS_ACCESS_MODE", "");
m_accessMode = boost::iequals(mode, "synchronous") ? SYNCHRONOUS :
boost::iequals(mode, "batched") ? BATCHED :
DEFAULT;
#endif
SyncSourceLogging::init(InitList<std::string>("N_FIRST") + "N_MIDDLE" + "N_LAST",
" ",
@ -191,10 +195,6 @@ void EvolutionContactSource::open()
m_addressbook.reset(E_BOOK_CLIENT(openESource(E_SOURCE_EXTENSION_ADDRESS_BOOK,
e_source_registry_ref_builtin_address_book,
newEBookClient).get()));
const char *mode = getEnv("SYNCEVOLUTION_EDS_ACCESS_MODE", "");
m_accessMode = boost::iequals(mode, "synchronous") ? SYNCHRONOUS :
boost::iequals(mode, "batched") ? BATCHED :
DEFAULT;
#else
GErrorCXX gerror;
bool created = false;