Оптимизация CONFIGFILE

Метод Flush вынесен из приватной части в публичную для явной записи
данных на диск. Так же этот метод добавлен в деструктор для
автоматической записи на диск. Т.к. методы Write* более не могут вызвать
ошибку (работают только с представлением в ОЗУ) тип возвращаемого
значяения сделан void (к стати, раньше он всегда был 0).
Flush и Error сделаны константными, а error мутабельным.

diff --git a/stglibs/conffiles.lib/conffiles.cpp b/stglibs/conffiles.lib/conffiles.cpp
index 47a92db08a024cae1ebadc12a3c9afe943edf96e..b247d041d675da7a37e5d4973de8cbd1b44503c7 100644 (file)
--- a/stglibs/conffiles.lib/conffiles.cpp
+++ b/stglibs/conffiles.lib/conffiles.cpp
@@ -84,6 +84,7 @@ while (getline(f, line))
 //---------------------------------------------------------------------------
 CONFIGFILE::~CONFIGFILE()
 {
 //---------------------------------------------------------------------------
 CONFIGFILE::~CONFIGFILE()
 {

+Flush();

 }
 //---------------------------------------------------------------------------
 const string & CONFIGFILE::GetFileName() const
 }
 //---------------------------------------------------------------------------
 const string & CONFIGFILE::GetFileName() const


@@ -91,14 +92,14 @@ const string & CONFIGFILE::GetFileName() const
 return fileName;
 }
 //---------------------------------------------------------------------------
 return fileName;
 }
 //---------------------------------------------------------------------------

-int CONFIGFILE::Error()
+int CONFIGFILE::Error() const

 {
 int e = error;
 error = 0;
 return e;
 }
 //---------------------------------------------------------------------------
 {
 int e = error;
 error = 0;
 return e;
 }
 //---------------------------------------------------------------------------

-int CONFIGFILE::Flush()
+int CONFIGFILE::Flush() const

 {
 ofstream f(fileName.c_str());
 if (!f.is_open())
 {
 ofstream f(fileName.c_str());
 if (!f.is_open())


@@ -111,7 +112,7 @@ map<string, string>::const_iterator it = param_val.begin();
 while (it != param_val.end())
     {
     f << it->first << "=" << it->second << "\n";
 while (it != param_val.end())
     {
     f << it->first << "=" << it->second << "\n";

-    it++;
+    ++it;

     }
 
 f.close();
     }
 
 f.close();


@@ -152,18 +153,10 @@ if (it != param_val.end())
 *val = defaultVal;
 return -1;
 }
 *val = defaultVal;
 return -1;
 }

-/*//---------------------------------------------------------------------------
-int CONFIGFILE::WriteString(const string & param, const char * val)
-{
-WriteString(param, string(val));
-return 0;
-}*/

 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------

-int CONFIGFILE::WriteString(const string & param, const string &val)
+void CONFIGFILE::WriteString(const string & param, const string &val)

 {
 param_val[param] = val;
 {
 param_val[param] = val;

-Flush();
-return 0;

 }
 //---------------------------------------------------------------------------
 int CONFIGFILE::ReadTime(const string & param, time_t * val, time_t defaultVal) const
 }
 //---------------------------------------------------------------------------
 int CONFIGFILE::ReadTime(const string & param, time_t * val, time_t defaultVal) const


@@ -362,14 +355,11 @@ if (it != param_val.end())
 return -1;
 }
 //---------------------------------------------------------------------------
 return -1;
 }
 //---------------------------------------------------------------------------

-int CONFIGFILE::WriteInt(const string & param, int64_t val)
+void CONFIGFILE::WriteInt(const string & param, int64_t val)

 {
 string s;
 {
 string s;

-//sprintf(s, "%lld", val);

 x2str(val, s);
 param_val[param] = s;
 x2str(val, s);
 param_val[param] = s;

-Flush();
-return 0;

 }
 //---------------------------------------------------------------------------
 int CONFIGFILE::ReadDouble(const string & param, double * val, double defaultVal) const
 }
 //---------------------------------------------------------------------------
 int CONFIGFILE::ReadDouble(const string & param, double * val, double defaultVal) const


@@ -394,12 +384,10 @@ if (it != param_val.end())
 return -1;
 }
 //---------------------------------------------------------------------------
 return -1;
 }
 //---------------------------------------------------------------------------

-int CONFIGFILE::WriteDouble(const string & param, double val)
+void CONFIGFILE::WriteDouble(const string & param, double val)

 {
 char s[30];
 {
 char s[30];

-sprintf(s, "%f", val);
+snprintf(s, 30, "%f", val);

 param_val[param] = s;
 param_val[param] = s;

-Flush();
-return 0;

 }
 //---------------------------------------------------------------------------
 }
 //---------------------------------------------------------------------------

diff --git a/stglibs/conffiles.lib/conffiles.h b/stglibs/conffiles.lib/conffiles.h
index 04e35a3aa235f227e9a0e4c7bb13be36f19e3000..07f716cdfc4aa6f24c75b95ed8a593a43c2bec39 100644 (file)
--- a/stglibs/conffiles.lib/conffiles.h
+++ b/stglibs/conffiles.lib/conffiles.h
@@ -64,19 +64,18 @@ public:
     int ReadULongLongInt(const string & param, uint64_t *, uint64_t) const;
     int ReadDouble(const string & param, double * val, double defaultVal) const;
 
     int ReadULongLongInt(const string & param, uint64_t *, uint64_t) const;
     int ReadDouble(const string & param, double * val, double defaultVal) const;
 

-    int WriteString(const string & param, const char * val) { return WriteString(param, std::string(val)); }
-    int WriteString(const string & param, const string & val);
-    int WriteInt(const string & param, int64_t val);
-    int WriteDouble(const string & param, double val);
+    void WriteString(const string & param, const char * val) { return WriteString(param, std::string(val)); }
+    void WriteString(const string & param, const string & val);
+    void WriteInt(const string & param, int64_t val);
+    void WriteDouble(const string & param, double val);

 
 

-    int Error();
+    int Error() const;
+    int Flush() const;

 
 private:
 
 private:

-    int Flush();
-

     map<string, string, StringCaseCmp_t> param_val;
     string fileName;
     map<string, string, StringCaseCmp_t> param_val;
     string fileName;

-    int error;
+    mutable int error;

 };
 //---------------------------------------------------------------------------
 #endif
 };
 //---------------------------------------------------------------------------
 #endif