Небольшой рефакторинг плагина radius

[stg.git] / projects / stargazer / plugins / store / files / file_store.cpp

diff --git a/projects/stargazer/plugins/store/files/file_store.cpp b/projects/stargazer/plugins/store/files/file_store.cpp
index 07638400fe1c0dd9177cfe1dd50cca523a986655..fe5ed230052a1b30aad4e9c40ba8f37197021add 100644 (file)
--- a/projects/stargazer/plugins/store/files/file_store.cpp
+++ b/projects/stargazer/plugins/store/files/file_store.cpp
@@ -438,7 +438,7 @@ mode_t FILES_STORE_SETTINGS::GetConfMode() const
 {
 return confMode;
 }
-//-----------------------------------------------------------------------------
+/*//-----------------------------------------------------------------------------
 mode_t FILES_STORE_SETTINGS::GetConfModeDir() const
 {
 mode_t mode = confMode;
@@ -446,7 +446,7 @@ if (statMode & S_IRUSR) mode |= S_IXUSR;
 if (statMode & S_IRGRP) mode |= S_IXGRP;
 if (statMode & S_IROTH) mode |= S_IXOTH;
 return mode;
-}
+}*/
 //-----------------------------------------------------------------------------
 uid_t  FILES_STORE_SETTINGS::GetConfUID() const
 {
@@ -1766,7 +1766,7 @@ switch (td.tariffConf.traffType)
 return 0;
 }
 //-----------------------------------------------------------------------------
-int FILES_STORE::WriteDetailedStat(const map<IP_DIR_PAIR, STAT_NODE> * statTree,
+int FILES_STORE::WriteDetailedStat(const map<IP_DIR_PAIR, STAT_NODE> & statTree,
                                    time_t lastStat,
                                    const string & login) const
 {
@@ -1895,13 +1895,14 @@ if (fprintf(statFile, "-> %02d.%02d.%02d - %02d.%02d.%02d\n",
     STG_LOCKER lock(&mutex, __FILE__, __LINE__);
     errorStr = string("fprint failed. Message: '") + strerror(errno) + "'";
     printfd(__FILE__, "FILES_STORE::WriteDetailStat - fprintf failed. Message: '%s'\n", strerror(errno));
+    fclose(statFile);
     return -1;
     }
 
 map<IP_DIR_PAIR, STAT_NODE>::const_iterator stIter;
-stIter = statTree->begin();
+stIter = statTree.begin();
 
-while (stIter != statTree->end())
+while (stIter != statTree.end())
     {
     string u, d;
     x2str(stIter->second.up, u);
@@ -2214,4 +2215,3 @@ fclose(msgFile);
 return 0;
 }
 //-----------------------------------------------------------------------------
-