Code cleanup

diff --git a/projects/stargazer/users_impl.cpp b/projects/stargazer/users_impl.cpp
index 6b87b5a96ae6dba91a24fe90e8e2918d58836d0d..19be5a4108ea134dd01185dcf31b5acfde5aa6bf 100644 (file)
--- a/projects/stargazer/users_impl.cpp
+++ b/projects/stargazer/users_impl.cpp
@@ -180,7 +180,6 @@ u.OnAdd();
 users.push_front(u);
 
 AddUserIntoIndexes(users.begin());
 users.push_front(u);
 
 AddUserIntoIndexes(users.begin());

-SetUserNotifiers(users.begin());

 
     {
     // Fire all "on add" notifiers
 
     {
     // Fire all "on add" notifiers


@@ -260,7 +259,6 @@ if (!priv->userAddDel)
     utd.delTime = stgTime;
     usersToDelete.push_back(utd);
 
     utd.delTime = stgTime;
     usersToDelete.push_back(utd);
 

-    UnSetUserNotifiers(u);

     DelUserFromIndexes(u);
 
     WriteServLog("%s User \'%s\' deleted.",
     DelUserFromIndexes(u);
 
     WriteServLog("%s User \'%s\' deleted.",


@@ -342,7 +340,6 @@ for (unsigned int i = 0; i < usersList.size(); i++)
     ui = users.begin();
 
     AddUserIntoIndexes(ui);
     ui = users.begin();
 
     AddUserIntoIndexes(ui);

-    SetUserNotifiers(ui);

 
     if (ui->ReadConf() < 0)
         return -1;
 
     if (ui->ReadConf() < 0)
         return -1;


@@ -413,7 +410,6 @@ while (us->nonstop)
 user_iter ui = us->users.begin();
 while (ui != us->users.end())
     {
 user_iter ui = us->users.begin();
 while (ui != us->users.end())
     {

-    us->UnSetUserNotifiers(ui);

     us->DelUserFromIndexes(ui);
     ++ui;
     }
     us->DelUserFromIndexes(ui);
     ++ui;
     }


@@ -803,54 +799,6 @@ WriteServLog("USERS. Incorrect search handle.");
 return -1;
 }
 //-----------------------------------------------------------------------------
 return -1;
 }
 //-----------------------------------------------------------------------------

-void USERS_IMPL::SetUserNotifiers(user_iter user)
-{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-
-/*PROPERTY_NOTIFER_IP_BEFORE nb(*this, user);
-PROPERTY_NOTIFER_IP_AFTER  na(*this, user);
-
-userIPNotifiersBefore.push_front(nb);
-userIPNotifiersAfter.push_front(na);
-
-user->AddCurrIPBeforeNotifier(&(*userIPNotifiersBefore.begin()));
-user->AddCurrIPAfterNotifier(&(*userIPNotifiersAfter.begin()));*/
-}
-//-----------------------------------------------------------------------------
-void USERS_IMPL::UnSetUserNotifiers(user_iter user)
-{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-
-/*list<PROPERTY_NOTIFER_IP_BEFORE>::iterator  bi;
-list<PROPERTY_NOTIFER_IP_AFTER>::iterator   ai;
-
-bi = userIPNotifiersBefore.begin();
-while (bi != userIPNotifiersBefore.end())
-    {
-    if (bi->GetUser() == user)
-        {
-        bi->GetUser()->DelCurrIPBeforeNotifier(&(*bi));
-        userIPNotifiersBefore.erase(bi);
-        //printfd(__FILE__, "Notifier Before removed. User %s\n", bi->GetUser()->GetLogin().c_str());
-        break;
-        }
-    ++bi;
-    }
-
-ai = userIPNotifiersAfter.begin();
-while (ai != userIPNotifiersAfter.end())
-    {
-    if (ai->GetUser() == user)
-        {
-        ai->GetUser()->DelCurrIPAfterNotifier(&(*ai));
-        userIPNotifiersAfter.erase(ai);
-        //printfd(__FILE__, "Notifier After removed. User %s\n", ai->GetUser()->GetLogin().c_str());
-        break;
-        }
-    ++ai;
-    }*/
-}
-//-----------------------------------------------------------------------------

 void USERS_IMPL::AddUserIntoIndexes(user_iter user)
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 void USERS_IMPL::AddUserIntoIndexes(user_iter user)
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);

diff --git a/projects/stargazer/users_impl.h b/projects/stargazer/users_impl.h
index de1a2d4081e5b3fc934ae26c6ca6a58d871e2182..a7af2989bac63961bfb0f4265a20f2a09ace4dbe 100644 (file)
--- a/projects/stargazer/users_impl.h
+++ b/projects/stargazer/users_impl.h
@@ -142,9 +142,6 @@ private:
     void            RealDelUser();
     void            ProcessActions();
 
     void            RealDelUser();
     void            ProcessActions();
 

-    void            SetUserNotifiers(user_iter user);
-    void            UnSetUserNotifiers(user_iter user);
-

     void            AddUserIntoIndexes(user_iter user);
     void            DelUserFromIndexes(user_iter user);
 
     void            AddUserIntoIndexes(user_iter user);
     void            DelUserFromIndexes(user_iter user);
 


@@ -157,8 +154,6 @@ private:
 
     std::list<USER_IMPL>                  users;
     std::list<USER_TO_DEL>                usersToDelete;
 
     std::list<USER_IMPL>                  users;
     std::list<USER_TO_DEL>                usersToDelete;

-    /*std::list<PROPERTY_NOTIFER_IP_BEFORE> userIPNotifiersBefore;
-    std::list<PROPERTY_NOTIFER_IP_AFTER>  userIPNotifiersAfter;*/

 
     std::map<uint32_t, user_iter>         ipIndex;
     std::map<std::string, user_iter>      loginIndex;
 
     std::map<uint32_t, user_iter>         ipIndex;
     std::map<std::string, user_iter>      loginIndex;