Removed deprecated direct reference to file_cache MOTD, RULES

[user/henk/code/inspircd.git] / src / helperfuncs.cpp

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index eed15dc7b78e2eb01734e44b94a03285249de6a0..7434a9becdd6010813588def50941852c80e5568 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -53,25 +53,17 @@ using namespace std;
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern ServerConfig *Config;
-
 extern time_t TIME;
 extern char lowermap[255];
-extern std::stringstream config_f;
 static char list[MAXBUF];
 extern userrec* fd_ref_table[65536];
-
 extern serverstats* stats;
-
 static char already_sent[65536];
 extern std::vector<userrec*> all_opers;
-
 extern ClassVector Classes;
-
 extern user_hash clientlist;
 extern chan_hash chanlist;
 extern command_table cmdlist;
-extern file_cache MOTD;
-extern file_cache RULES;
 
 void log(int level,char *text, ...)
 {
@@ -117,7 +109,7 @@ void readfile(file_cache &F, const char* fname)
                 {
                         fgets(linebuf,sizeof(linebuf),file);
                         linebuf[strlen(linebuf)-1]='\0';
-                        if (linebuf[0] == 0)
+                        if (!*linebuf)
                         {
                                 strcpy(linebuf,"  ");
                         }
@@ -772,12 +764,12 @@ chanrec* FindChan(const char* chan)
 long GetMaxBans(char* name)
 {
         char CM[MAXBUF];
-        for (int count = 0; count < ConfValueEnum("banlist",&config_f); count++)
+        for (int count = 0; count < ConfValueEnum("banlist",&Config->config_f); count++)
         {
-                ConfValue("banlist","chan",count,CM,&config_f);
+                ConfValue("banlist","chan",count,CM,&Config->config_f);
                 if (match(name,CM))
                 {
-                        ConfValue("banlist","limit",count,CM,&config_f);
+                        ConfValue("banlist","limit",count,CM,&Config->config_f);
                         return atoi(CM);
                 }
         }
@@ -851,7 +843,7 @@ char* chanmodes(chanrec *chan)
         {
                 strlcat(scratch,"t",MAXMODES);
         }
-        if (chan->key[0])
+        if (*chan->key)
         {
                 strlcat(scratch,"k",MAXMODES);
         }
@@ -875,7 +867,7 @@ char* chanmodes(chanrec *chan)
         {
                 strlcat(scratch,"p",MAXMODES);
         }
-        if (chan->key[0])
+        if (*chan->key)
         {
                 strlcat(sparam," ",MAXBUF);
                 strlcat(sparam,chan->key,MAXBUF);