From 9dcec1feba68dc5ba38cdc634f5bf113c0f77348 Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Sat, 6 Apr 2013 13:14:45 +0200
Subject: tagging yhttpd-0.7.2

---
 src/conf/conf.cpp | 36 ++++++------------------------------
 src/conf/conf.h   |  6 ++----
 2 files changed, 8 insertions(+), 34 deletions(-)

(limited to 'src/conf')

diff --git a/src/conf/conf.cpp b/src/conf/conf.cpp
index a4a2679..5d5a535 100755
--- a/src/conf/conf.cpp
+++ b/src/conf/conf.cpp
@@ -6,11 +6,11 @@
 
 using namespace std;
 
-conf::conf( string s_conf, map<string,string>* p_main_loop_params ) : name::name( s_conf )
+conf::conf( string s_conf, map<string,string>* p_start_params ) : name::name( s_conf )
 {
   string s_check[] = {
                        get_name(),
-                       string(getenv("HOME"))+string("/.ychat/") + get_name(),
+                       string(getenv("HOME"))+string("/.yhttpd/") + get_name(),
                        string("./etc/") + get_name(),
                        string("/etc/") + get_name(),
                        string(PREFIX+string("etc/")+get_name()) };
@@ -54,11 +54,11 @@ conf::conf( string s_conf, map<string,string>* p_main_loop_params ) : name::name
   vector<string> vec_string;
   parse_xml(p_xml, &vec_string);
 
-  shashmap<string>::add_elem_insecure(tool::ychat_version(), "ychat.version");
+  shashmap<string>::add_elem_insecure(tool::yhttpd_version(), "yhttpd.version");
 
-  // Overrides ychat.conf values with command line options (ychat -o key1 value1 -o key2 value2 ...)
+  // Overrides yhttpd.conf values with command line options (yhttpd -o key1 value1 -o key2 value2 ...)
   map<string,string>::iterator iter;
-  for ( iter = p_main_loop_params->begin(); iter != p_main_loop_params->end(); iter++ )
+  for ( iter = p_start_params->begin(); iter != p_start_params->end(); iter++ )
   {
     shashmap<string>::del_elem_insecure(iter->first);
     shashmap<string>::add_elem_insecure(iter->second, iter->first);
@@ -161,35 +161,11 @@ conf::exit_if_xml_error() const
   }
 }
 
-//<<*
-string
-conf::colored_error_msg(string s_key)
-{
-  return "<font color=\"#"
-         + shashmap<string>::get_elem("chat.html.errorcolor")
-         + "\">" + shashmap<string>::get_elem(s_key) + "</font><br>\n";
-}
-//*>>
 
 int
 conf::get_int(string s_key)
 {
-  return tool::string2int(get_elem(s_key));
+   return tool::string2int(get_elem(s_key));
 }
 
-vector<string>
-conf::get_vector(string s_key)
-{
-  vector<string> vec_ret;
-  string s_val = get_elem(s_key);
-
-  for (unsigned i_pos = s_val.find(" "); i_pos != string::npos; i_pos = s_val.find(" "))
-  {
-    vec_ret.push_back(s_val.substr(0, i_pos));
-    s_val = s_val.substr(i_pos+1);
-  }
-
-  vec_ret.push_back(s_val);
-  return vec_ret;
-}
 #endif
diff --git a/src/conf/conf.h b/src/conf/conf.h
index 7dc779c..b385059 100755
--- a/src/conf/conf.h
+++ b/src/conf/conf.h
@@ -19,12 +19,10 @@ private:
   void parse_xml( TiXmlNode* p_node, vector<string>* p_vec);
 
 public:
-  conf(string s_conf, map<string,string>* p_main_loop_params);
+  conf(string s_conf, map<string,string>* p_start_params);
   ~conf();
 
-  string colored_error_msg(string s_key);  //<<
-  int get_int(string s_key);
-  vector<string> get_vector(string s_key);
+  int get_int(string s_key);  
 };
 
 #endif
-- 
cgit v1.2.3