Небольшая чистка кода библиотеки conffiles

diff --git a/stglibs/conffiles.lib/conffiles.cpp b/stglibs/conffiles.lib/conffiles.cpp
index 549cb22d4e6d6533cdc7af55a9eaa0f1128e41ce..a6fbe6d6ca302274f671bdb617bea3c740747ea5 100644 (file)
--- a/stglibs/conffiles.lib/conffiles.cpp
+++ b/stglibs/conffiles.lib/conffiles.cpp
@@ -28,11 +28,13 @@
  */
 
 //---------------------------------------------------------------------------
  */
 
 //---------------------------------------------------------------------------

-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cerrno>
+#include <cstring>
+#include <cstdlib>
+

 #include <fstream>
 #include <algorithm>
 #include <fstream>
 #include <algorithm>

+

 #include "conffiles.h"
 #include "common.h"
 
 #include "conffiles.h"
 #include "common.h"
 


@@ -133,16 +135,6 @@ error = 0;
 return e;
 }
 //---------------------------------------------------------------------------
 return e;
 }
 //---------------------------------------------------------------------------

-int CONFIGFILE::FindParameter(const string &parameter, string * value) const
-{
-it = param_val.find(parameter);
-if (it == param_val.end())
-    return -1;
-
-*value = param_val[parameter];
-return 0;
-}
-//---------------------------------------------------------------------------

 int CONFIGFILE::Flush()
 {
 fstream f(fileName.c_str(), ios::out);
 int CONFIGFILE::Flush()
 {
 fstream f(fileName.c_str(), ios::out);


@@ -451,5 +443,3 @@ Flush();
 return 0;
 }
 //---------------------------------------------------------------------------
 return 0;
 }
 //---------------------------------------------------------------------------

-
-

diff --git a/stglibs/conffiles.lib/conffiles.h b/stglibs/conffiles.lib/conffiles.h
index ee575d6511bc7c83c197e0a034c25e1e5630887b..83a16d9bbf6a1ab5ae3f033f9bb097b27b17b542 100644 (file)
--- a/stglibs/conffiles.lib/conffiles.h
+++ b/stglibs/conffiles.lib/conffiles.h
@@ -31,8 +31,7 @@
 
 #ifndef ConfFilesH
 #define ConfFilesH
 
 #ifndef ConfFilesH
 #define ConfFilesH

-#include <sys/types.h>
-#include <stdio.h>
+

 #include <map>
 #include <string>
 
 #include <map>
 #include <string>
 


@@ -40,8 +39,6 @@
 
 using namespace std;
 //---------------------------------------------------------------------------
 
 using namespace std;
 //---------------------------------------------------------------------------

-//#define CONF_STR_LEN    300
-//typedef char STRING[CONF_STR_LEN];

 
 typedef bool (*StringCaseCmp_t)(const string & str1, const string & str2);
 
 
 typedef bool (*StringCaseCmp_t)(const string & str1, const string & str2);
 


@@ -67,8 +64,6 @@ public:
     int ReadString(const string & param, char * val, int * maxLen, const char * defaultVal) const;
     int ReadString(const string & param, string * val, const string & defaultVal) const;
 
     int ReadString(const string & param, char * val, int * maxLen, const char * defaultVal) const;
     int ReadString(const string & param, string * val, const string & defaultVal) const;
 

-    int FindParameter(const string &parameter, string * value) const;
-

     int ReadTime       (const string & param, time_t *,        time_t) const;
 
     int ReadShortInt   (const string & param, short int *,     short int) const;
     int ReadTime       (const string & param, time_t *,        time_t) const;
 
     int ReadShortInt   (const string & param, short int *,     short int) const;