X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/e767204dbf56ac466489c142f0acdaebd5d0b935..42c4d12010e1ed77ea2934073b1298cf7b852ce8:/projects/stargazer/users_impl.cpp

diff --git a/projects/stargazer/users_impl.cpp b/projects/stargazer/users_impl.cpp
index 3384c660..c139e65c 100644
--- a/projects/stargazer/users_impl.cpp
+++ b/projects/stargazer/users_impl.cpp
@@ -40,9 +40,9 @@
 #include <string>
 #include <vector>
 
-#include "settings.h"
+#include "stg/settings.h"
+#include "stg/common.h"
 #include "users_impl.h"
-#include "common.h"
 #include "stg_timer.h"
 
 using namespace std;
@@ -52,7 +52,7 @@ extern const volatile time_t stgTime;
 //#define USERS_DEBUG 1
 
 //-----------------------------------------------------------------------------
-USERS_IMPL::USERS_IMPL(SETTINGS * s, STORE * st, TARIFFS * t, const ADMIN * sa)
+USERS_IMPL::USERS_IMPL(SETTINGS_IMPL * s, STORE * st, TARIFFS * t, const ADMIN * sa)
     : users(),
       usersToDelete(),
       userIPNotifiersBefore(),
@@ -336,7 +336,7 @@ while (ui != us->users.end())
     {
     us->UnSetUserNotifiers(ui);
     us->DelUserFromIndexes(ui);
-    ui++;
+    ++ui;
     }
 
 list<USER_TO_DEL>::iterator iter;
@@ -373,7 +373,7 @@ if (TimeToWriteDetailStat(t))
         {
         usersCnt++;
         usr->WriteDetailStat();
-        usr++;
+        ++usr;
         if (usersCnt % 10 == 0)
             for_each(users.begin(), users.end(), mem_fun_ref(&USER_IMPL::Run));
         }
@@ -467,13 +467,13 @@ if (!isRunning)
 nonstop = false;
 
 //5 seconds to thread stops itself
-unsigned i;
-for (i = 0; i < 25 * (users.size() / 50 + 1); i++)
+struct timespec ts = {0, 200000000};
+for (size_t i = 0; i < 25 * (users.size() / 50 + 1); i++)
     {
     if (!isRunning)
         break;
 
-    usleep(200000);
+    nanosleep(&ts, NULL);
     }
 
 //after 5 seconds waiting thread still running. now kill it
@@ -710,7 +710,7 @@ while (bi != userIPNotifiersBefore.end())
         //printfd(__FILE__, "Notifier Before removed. User %s\n", bi->GetUser()->GetLogin().c_str());
         break;
         }
-    bi++;
+    ++bi;
     }
 
 ai = userIPNotifiersAfter.begin();
@@ -723,7 +723,7 @@ while (ai != userIPNotifiersAfter.end())
         //printfd(__FILE__, "Notifier After removed. User %s\n", ai->GetUser()->GetLogin().c_str());
         break;
         }
-    ai++;
+    ++ai;
     }
 }
 //-----------------------------------------------------------------------------