Remove some dead code:

- Conditions in m_httpd_stats which can never be true.
- Commented out code in m_sqloper.
- Unused macro in inspircd.h.

diff --git a/include/inspircd.h b/include/inspircd.h
index 86853a94f3cebdc41ac8381ca50a4ec8e132110b..84ac93357da2349c0b98243683c923c28672744a 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -112,11 +112,6 @@ CoreExport extern InspIRCd* ServerInstance;
  */
 #define ERROR -1
 
-/** Support for librodent -
- * see http://www.chatspike.net/index.php?z=64
- */
-#define ETIREDHAMSTERS EAGAIN
-
 /** Template function to convert any input type to std::string
  */
 template<typename T> inline std::string ConvNumeric(const T &in)

diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index 547d6032f1ebbf2e219728ed99ac8d585295084e..9115fedaf71a9443c38b2bfac25fd3e5fc8e44eb 100644 (file)
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -55,8 +55,7 @@ class ModuleHttpStats : public Module
                                ret += it->second;
                                ret += ';';
                        }
-                       else if (*x == 0x9 ||  *x == 0xA || *x == 0xD ||
-                               (*x >= 0x20 && *x <= 0xD7FF) || (*x >= 0xE000 && *x <= 0x10FFFF))
+                       else if (*x == 0x9 ||  *x == 0xA || *x == 0xD || *x >= 0x20)
                        {
                                // The XML specification defines the following characters as valid inside an XML document:
                                // Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF]

diff --git a/src/modules/m_sqloper.cpp b/src/modules/m_sqloper.cpp
index 38bcb744a2a4718a92f8a557badffa08265a197b..7097cd8e2b120cd6886cb3c4de47e1f206a544e3 100644 (file)
--- a/src/modules/m_sqloper.cpp
+++ b/src/modules/m_sqloper.cpp
@@ -57,21 +57,8 @@ class OpMeQuery : public SQLQuery
                SQLEntries row;
                while (res.GetRow(row))
                {
-#if 0
-                       parameterlist cols;
-                       res.GetCols(cols);
-
-                       std::vector<KeyVal>* items;
-                       reference<ConfigTag> tag = ConfigTag::create("oper", "<m_sqloper>", 0, items);
-                       for(unsigned int i=0; i < cols.size(); i++)
-                       {
-                               if (!row[i].nul)
-                                       items->insert(std::make_pair(cols[i], row[i]));
-                       }
-#else
                        if (OperUser(user, row[0], row[1]))
                                return;
-#endif
                }
                ServerInstance->Logs->Log("m_sqloper",DEBUG, "SQLOPER: no matches for %s (checked %d rows)", uid.c_str(), res.Rows());
                // nobody succeeded... fall back to OPER