Fix trailing whitespaces.

[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 cd1f0f9d723628e47d1369b0b49b4bc1b8277b7d..e23b2030ab92470fe418550a80a51b832b061795 100644 (file)
--- a/projects/stargazer/plugins/store/files/file_store.cpp
+++ b/projects/stargazer/plugins/store/files/file_store.cpp
@@ -1471,10 +1471,7 @@ if (conf.ReadString("ChangePolicy", &str, "allow") < 0)
 else
     td->tariffConf.changePolicy = TARIFF::StringToChangePolicy(str);
 
 else
     td->tariffConf.changePolicy = TARIFF::StringToChangePolicy(str);
 

-if (conf.ReadString("ChangePolicyTimeout", &str, "1970-01-01 00:00:00") < 0)
-    td->tariffConf.changePolicyTimeout = 0;
-else
-    td->tariffConf.changePolicyTimeout = readTime(str);
+conf.ReadTime("ChangePolicyTimeout", &td->tariffConf.changePolicyTimeout, 0);

 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------


@@ -1537,7 +1534,7 @@ std::string fileName = storeSettings.GetTariffsDir() + "/" + tariffName + ".tf";
     cf.WriteString("TraffType", TARIFF::TraffTypeToString(td.tariffConf.traffType));
     cf.WriteString("Period", TARIFF::PeriodToString(td.tariffConf.period));
     cf.WriteString("ChangePolicy", TARIFF::ChangePolicyToString(td.tariffConf.changePolicy));
     cf.WriteString("TraffType", TARIFF::TraffTypeToString(td.tariffConf.traffType));
     cf.WriteString("Period", TARIFF::PeriodToString(td.tariffConf.period));
     cf.WriteString("ChangePolicy", TARIFF::ChangePolicyToString(td.tariffConf.changePolicy));

-    cf.WriteString("ChangePolicyTimeout", formatTime(td.tariffConf.changePolicyTimeout));
+    cf.WriteTime("ChangePolicyTimeout", td.tariffConf.changePolicyTimeout);

     }
 
 return 0;
     }
 
 return 0;


@@ -1609,7 +1606,7 @@ if (e)
     printfd(__FILE__, "FILES_STORE::WriteDetailStat - chmod/chown failed for user '%s'. Error: '%s'\n", login.c_str(), strerror(errno));
     }
 
     printfd(__FILE__, "FILES_STORE::WriteDetailStat - chmod/chown failed for user '%s'. Error: '%s'\n", login.c_str(), strerror(errno));
     }
 

-snprintf(dn, FN_STR_LEN, "%s/%s/detail_stat/%d/%s%d", 
+snprintf(dn, FN_STR_LEN, "%s/%s/detail_stat/%d/%s%d",

          storeSettings.GetUsersDir().c_str(),
          login.c_str(),
          lt->tm_year+1900,
          storeSettings.GetUsersDir().c_str(),
          login.c_str(),
          lt->tm_year+1900,