Просмотр исходного кода

* Removed all references to 'configfile'

svn: 176
Bryan Drewery 22 лет назад
Родитель
Сommit
90985a6f10
4 измененных файлов с 2 добавлено и 8 удалено
  1. 1 5
      src/chanprog.c
  2. 0 1
      src/lang.h
  3. 0 1
      src/main.c
  4. 1 1
      src/tcl.c

+ 1 - 5
src/chanprog.c

@@ -25,7 +25,7 @@ extern struct userrec	*userlist;
 extern Tcl_Interp	*interp;
 extern char		 ver[], botnetnick[], firewall[], myip[], origbotname[],
 			 motdfile[], userfile[], tempdir[],
-			 notify_new[], owner[], configfile[],
+			 notify_new[], owner[], 
                          netpass[], botuser[], owners[], hubs[];
 
 extern time_t		 now, online_since;
@@ -591,10 +591,6 @@ void chanprog()
   conmask = 0;
   /* Turn off read-only variables (make them write-able) for rehash */
   protect_readonly = 0;
-  /* Now read it */
-  if (configfile[0])
-    if (!readtclprog(configfile))
-      fatal(MISC_NOCONFIGFILE, 0);
 
 //now this only checks server shit. (no channels)
   call_hook(HOOK_REHASH);

+ 0 - 1
src/lang.h

@@ -95,7 +95,6 @@
 #define MISC_NOTIFY		STR("notify")
 #define MISC_PERMOWNER		STR("Permanent owner(s)")
 /* was: MISC_ROOTWARN - 0x533 */
-#define MISC_NOCONFIGFILE	STR("CONFIG FILE NOT LOADED (NOT FOUND, OR ERROR)")
 #define MISC_NOUSERFILE		STR("USER FILE NOT FOUND!  (try './eggdrop -m %s' to make one)\n")
 #define MISC_NOUSERFILE2	STR("STARTING BOT IN USERFILE CREATION MODE.\nTelnet to the bot and enter 'NEW' as your nickname.")
 #define MISC_USERFCREATE1	STR("OR go to IRC and type:  /msg %s hello\n")

+ 0 - 1
src/main.c

@@ -105,7 +105,6 @@ char tempdir[DIRMAX] = "";
 char lock_file[40] = "";
 char *binname;
 int     sdebug = 0;		/* enable debug output? */
-char	configfile[121] = ""; /* Name of the config file */
 char	textdir[121] = "";	/* Directory for text files that get dumped */
 time_t	online_since;		/* Unix-time that the bot loaded up */
 

+ 1 - 1
src/tcl.c

@@ -40,7 +40,7 @@ extern int	reserved_port_min, reserved_port_max, localhub;
 extern char	origbotname[], botuser[], motdfile[], admin[], userfile[],
                 firewall[], notify_new[], hostname[], hostname6[], myip[], myip6[],
 		tempdir[], owner[], network[], botnetnick[],
-		bannerfile[], egg_version[], natip[], configfile[],
+		bannerfile[], egg_version[], natip[], 
 		textdir[], pid_file[], dcc_prefix[], 
 		netpass[];