Some changes in crypto.lib. Added tests.

[stg.git] / projects / stargazer / admins_impl.cpp

diff --git a/projects/stargazer/admins_impl.cpp b/projects/stargazer/admins_impl.cpp
index 7d73dde1834cde8481ddeee2fde6f3cc78d3de66..08656a49c86882d33e0b353411d68c39647127c6 100644 (file)
--- a/projects/stargazer/admins_impl.cpp
+++ b/projects/stargazer/admins_impl.cpp
@@ -57,7 +57,7 @@ Read();
 //-----------------------------------------------------------------------------
 int ADMINS_IMPL::Add(const string & login, const ADMIN * admin)
 {
 //-----------------------------------------------------------------------------
 int ADMINS_IMPL::Add(const string & login, const ADMIN * admin)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 const PRIV * priv = admin->GetPriv();
 
 if (!priv->adminChg)
 const PRIV * priv = admin->GetPriv();
 
 if (!priv->adminChg)


@@ -96,7 +96,7 @@ return -1;
 //-----------------------------------------------------------------------------
 int ADMINS_IMPL::Del(const string & login, const ADMIN * admin)
 {
 //-----------------------------------------------------------------------------
 int ADMINS_IMPL::Del(const string & login, const ADMIN * admin)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 ADMIN_IMPL adm(0, login, "");
 const PRIV * priv = admin->GetPriv();
 
 ADMIN_IMPL adm(0, login, "");
 const PRIV * priv = admin->GetPriv();
 


@@ -141,7 +141,7 @@ return 0;
 //-----------------------------------------------------------------------------
 int ADMINS_IMPL::Change(const ADMIN_CONF & ac, const ADMIN * admin)
 {
 //-----------------------------------------------------------------------------
 int ADMINS_IMPL::Change(const ADMIN_CONF & ac, const ADMIN * admin)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 const PRIV * priv = admin->GetPriv();
 
 if (!priv->adminChg)
 const PRIV * priv = admin->GetPriv();
 
 if (!priv->adminChg)


@@ -178,7 +178,7 @@ return 0;
 //-----------------------------------------------------------------------------
 int ADMINS_IMPL::Read()
 {
 //-----------------------------------------------------------------------------
 int ADMINS_IMPL::Read()
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 vector<string> adminsList;
 if (store->GetAdminsList(&adminsList) < 0)
     {
 vector<string> adminsList;
 if (store->GetAdminsList(&adminsList) < 0)
     {


@@ -201,22 +201,11 @@ for (unsigned int i = 0; i < adminsList.size(); i++)
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-void ADMINS_IMPL::PrintAdmins() const
-{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-const_admin_iter ai(data.begin());
-while (ai != data.end())
-    {
-    ai->Print();
-    ai++;
-    }
-}
-//-----------------------------------------------------------------------------

 bool ADMINS_IMPL::Find(const string & l, ADMIN ** admin)
 {
 assert(admin != NULL && "Pointer to admin is not null");
 
 bool ADMINS_IMPL::Find(const string & l, ADMIN ** admin)
 {
 assert(admin != NULL && "Pointer to admin is not null");
 

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 if (data.empty())
     {
     printfd(__FILE__, "No admin in system!\n");
 if (data.empty())
     {
     printfd(__FILE__, "No admin in system!\n");


@@ -238,7 +227,7 @@ return true;
 //-----------------------------------------------------------------------------
 bool ADMINS_IMPL::Exists(const string & login) const
 {
 //-----------------------------------------------------------------------------
 bool ADMINS_IMPL::Exists(const string & login) const
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 if (data.empty())
     {
     printfd(__FILE__, "no admin in system!\n");
 if (data.empty())
     {
     printfd(__FILE__, "no admin in system!\n");


@@ -256,7 +245,7 @@ return false;
 //-----------------------------------------------------------------------------
 bool ADMINS_IMPL::Correct(const string & login, const std::string & password, ADMIN ** admin)
 {
 //-----------------------------------------------------------------------------
 bool ADMINS_IMPL::Correct(const string & login, const std::string & password, ADMIN ** admin)
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 if (data.empty())
     {
     printfd(__FILE__, "no admin in system!\n");
 if (data.empty())
     {
     printfd(__FILE__, "no admin in system!\n");


@@ -283,7 +272,7 @@ return true;
 //-----------------------------------------------------------------------------
 int ADMINS_IMPL::OpenSearch() const
 {
 //-----------------------------------------------------------------------------
 int ADMINS_IMPL::OpenSearch() const
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 handle++;
 searchDescriptors[handle] = data.begin();
 return handle;
 handle++;
 searchDescriptors[handle] = data.begin();
 return handle;


@@ -291,7 +280,7 @@ return handle;
 //-----------------------------------------------------------------------------
 int ADMINS_IMPL::SearchNext(int h, ADMIN_CONF * ac) const
 {
 //-----------------------------------------------------------------------------
 int ADMINS_IMPL::SearchNext(int h, ADMIN_CONF * ac) const
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 if (searchDescriptors.find(h) == searchDescriptors.end())
     {
     WriteServLog("ADMINS. Incorrect search handle.");
 if (searchDescriptors.find(h) == searchDescriptors.end())
     {
     WriteServLog("ADMINS. Incorrect search handle.");


@@ -310,7 +299,7 @@ return 0;
 //-----------------------------------------------------------------------------
 int ADMINS_IMPL::CloseSearch(int h) const
 {
 //-----------------------------------------------------------------------------
 int ADMINS_IMPL::CloseSearch(int h) const
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 if (searchDescriptors.find(h) != searchDescriptors.end())
     {
     searchDescriptors.erase(searchDescriptors.find(h));
 if (searchDescriptors.find(h) != searchDescriptors.end())
     {
     searchDescriptors.erase(searchDescriptors.find(h));