Unused methods removed, add some inlining

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

diff --git a/projects/stargazer/users_impl.cpp b/projects/stargazer/users_impl.cpp
index 9faadeb3b711995a89f595a1203f055a5127dd2c..3384c6602ce48ecb3a273ff1744df1c77db67f43 100644 (file)
--- a/projects/stargazer/users_impl.cpp
+++ b/projects/stargazer/users_impl.cpp
@@ -52,7 +52,7 @@ extern const volatile time_t stgTime;
 //#define USERS_DEBUG 1
 
 //-----------------------------------------------------------------------------
 //#define USERS_DEBUG 1
 
 //-----------------------------------------------------------------------------

-USERS_IMPL::USERS_IMPL(SETTINGS * s, STORE * st, TARIFFS * t, const ADMIN & sa)
+USERS_IMPL::USERS_IMPL(SETTINGS * s, STORE * st, TARIFFS * t, const ADMIN * sa)

     : users(),
       usersToDelete(),
       userIPNotifiersBefore(),
     : users(),
       usersToDelete(),
       userIPNotifiersBefore(),


@@ -122,16 +122,16 @@ while (iter != users.end())
 return false;
 }
 //-----------------------------------------------------------------------------
 return false;
 }
 //-----------------------------------------------------------------------------

-int USERS_IMPL::Add(const string & login, const ADMIN & admin)
+int USERS_IMPL::Add(const string & login, const ADMIN * admin)

 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);

-const PRIV * priv = admin.GetPriv();
+const PRIV * priv = admin->GetPriv();

 
 if (!priv->userAddDel)
     {
     WriteServLog("%s tried to add user \'%s\'. Access denied.",
 
 if (!priv->userAddDel)
     {
     WriteServLog("%s tried to add user \'%s\'. Access denied.",

-         admin.GetLogStr().c_str(), login.c_str());
-    /*errorStr = "Admin \'" + admin.GetLogin() +
+         admin->GetLogStr().c_str(), login.c_str());
+    /*errorStr = "Admin \'" + admin->GetLogin() +

                "\': tried to add user \'" + ud->login + "\'. Access denied.";*/
     return -1;
     }
                "\': tried to add user \'" + ud->login + "\'. Access denied.";*/
     return -1;
     }


@@ -141,7 +141,7 @@ if (store->AddUser(login))
     {
     //TODO
     //WriteServLog("Admin \'%s\': tried to add user \'%s\'. Access denied.",
     {
     //TODO
     //WriteServLog("Admin \'%s\': tried to add user \'%s\'. Access denied.",

-    //     admin.GetLogin().c_str(), ud->login.c_str());
+    //     admin->GetLogin().c_str(), ud->login.c_str());

     return -1;
     }
 //////
     return -1;
     }
 //////


@@ -170,7 +170,7 @@ u.WriteConf();
 u.WriteStat();
 
 WriteServLog("%s User \'%s\' added.",
 u.WriteStat();
 
 WriteServLog("%s User \'%s\' added.",

-         admin.GetLogStr().c_str(), login.c_str());
+         admin->GetLogStr().c_str(), login.c_str());

 
 u.OnAdd();
 
 
 u.OnAdd();
 


@@ -190,15 +190,15 @@ while (ni != onAddNotifiers.end())
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-void USERS_IMPL::Del(const string & login, const ADMIN & admin)
+void USERS_IMPL::Del(const string & login, const ADMIN * admin)

 {
 {

-const PRIV * priv = admin.GetPriv();
+const PRIV * priv = admin->GetPriv();

 user_iter u;
 
 if (!priv->userAddDel)
     {
     WriteServLog("%s tried to remove user \'%s\'. Access denied.",
 user_iter u;
 
 if (!priv->userAddDel)
     {
     WriteServLog("%s tried to remove user \'%s\'. Access denied.",

-         admin.GetLogStr().c_str(), login.c_str());
+         admin->GetLogStr().c_str(), login.c_str());

     return;
     }
 
     return;
     }
 


@@ -209,7 +209,7 @@ if (!priv->userAddDel)
     if (FindByNameNonLock(login, &u))
         {
         WriteServLog("%s tried to delete user \'%s\': not found.",
     if (FindByNameNonLock(login, &u))
         {
         WriteServLog("%s tried to delete user \'%s\': not found.",

-                     admin.GetLogStr().c_str(),
+                     admin->GetLogStr().c_str(),

                      login.c_str());
         return;
         }
                      login.c_str());
         return;
         }


@@ -237,7 +237,7 @@ while (ni != onDelNotifiers.end())
     DelUserFromIndexes(u);
 
     WriteServLog("%s User \'%s\' deleted.",
     DelUserFromIndexes(u);
 
     WriteServLog("%s User \'%s\' deleted.",

-             admin.GetLogStr().c_str(), login.c_str());
+             admin->GetLogStr().c_str(), login.c_str());

 
     }
 }
 
     }
 }