tagging yhttpd-0.7.0yhttpd-0.7.0

1 files changed, 11 insertions, 12 deletions

diff --git a/src/conf/conf.h b/src/conf/conf.h
index 20aa91c..7508872 100755
--- a/src/conf/conf.h
+++ b/src/conf/conf.h
@@ -1,28 +1,27 @@
+// class conf declaration. this class parses the server config file.
+
 #ifndef CONF_H
 #define CONF_H
 
-class conf; // Predefine for nmap.tmpl
+class conf;
 
-#include <map>
 #include "../incl.h"
-#include "../maps/shashmap.h"
+#include "../maps/nmap.h"
 #include "../name.h"
 #include "../contrib/xml/tinyxml.h"
 
 using namespace std;
 
-class conf : public shashmap<string>, name
+class conf : public nmap<string,string>, name
 {
 private:
-  TiXmlDocument* p_xml;
-  void exit_if_xml_error() const;
-  void parse_xml( TiXmlNode* p_node, vector<string>* p_vec);
-
+    TiXmlDocument* p_xml;
+    void exit_if_xml_error() const;
+    void parse_xml( TiXmlNode* p_node, vector<string>* p_vec);
 public:
-  conf(string s_conf, map<string,string>* p_start_params);
-  ~conf();
-
-  string colored_error_msg( string s_key );  //<<
+    //conf ( string s_conf );
+    conf ( string s_conf, map<string,string>* p_start_params );
+    ~conf();
 };
 
 #endif