Изменен порядок следования приватных методов и членов класса RPC_CONFIG

[stg.git] / projects / stargazer / plugins / store / mysql / mysql_store.cpp

diff --git a/projects/stargazer/plugins/store/mysql/mysql_store.cpp b/projects/stargazer/plugins/store/mysql/mysql_store.cpp
index 102be151dd27e736bb2dca8ceb0d690e81cb6abe..f78586fb1cc7a2164013466409e5c991db0c2c60 100644 (file)
--- a/projects/stargazer/plugins/store/mysql/mysql_store.cpp
+++ b/projects/stargazer/plugins/store/mysql/mysql_store.cpp
@@ -855,30 +855,29 @@ row = mysql_fetch_row(res);
 unsigned int startPos=0;
 
 char s[22];
-uint64_t traffU[DIR_NUM];
-uint64_t traffD[DIR_NUM];
 
 for (int i = 0; i < DIR_NUM; i++)
     {
+    uint64_t traff;
     sprintf(s, "D%d", i);
-    if (GetULongLongInt(row[startPos+i*2],&traffD[i], 0) != 0)
+    if (GetULongLongInt(row[startPos+i*2], &traff, 0) != 0)
         {
         mysql_free_result(res);
         errorStr = "User \'" + login + "\' stat not read. Parameter " + string(s);
         mysql_close(sock);
         return -1;
         }
-    stat->down = traffD;
+    stat->down[i] = traff;
 
     sprintf(s, "U%d", i);
-    if (GetULongLongInt(row[startPos+i*2+1], &traffU[i], 0) != 0)
+    if (GetULongLongInt(row[startPos+i*2+1], &traff, 0) != 0)
         {
         mysql_free_result(res);
         errorStr =   "User \'" + login + "\' stat not read. Parameter " + string(s);
         mysql_close(sock);
         return -1;
         }
-    stat->up = traffU;
+    stat->up[i] = traff;
     }//for
 
 startPos += (2*DIR_NUM);
@@ -1690,7 +1689,7 @@ if(MysqlSetQuery(res.c_str()))
 return 0;
 }
 //-----------------------------------------------------------------------------
-int MYSQL_STORE::WriteDetailedStat(const map<IP_DIR_PAIR, STAT_NODE> * statTree, 
+int MYSQL_STORE::WriteDetailedStat(const map<IP_DIR_PAIR, STAT_NODE> & statTree, 
                                    time_t lastStat, 
                                    const string & login) const
 {
@@ -1777,9 +1776,9 @@ strprintf(&res,"INSERT INTO detailstat_%02d_%4d SET login='%s',"\
 
 int retRes;
 map<IP_DIR_PAIR, STAT_NODE>::const_iterator stIter;
-stIter = statTree->begin();
+stIter = statTree.begin();
 
-while (stIter != statTree->end())
+while (stIter != statTree.end())
     {
         strprintf(&tempStr,"IP='%s', dir=%d, down=%lld, up=%lld, cash=%f", 
                 inet_ntostring(stIter->first.ip).c_str(),