[cvslog] (2005-09-05 03:38:42 UTC) Module eggdrop1.6: Change committed!

cvslog cvs at tsss.org
Sun Sep 4 21:38:42 CST 2005


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2005-09-05 03:38:42 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

Modified files:
     language/core.danish.lang language/core.english.lang
     language/core.french.lang language/core.german.lang src/main.c
     src/patch.h

Log message:

* Fixed the stagnant-module warning in main.c from possibly not displaying
  if uptime or encryption are last in the module list.
* We had two variables named 'xx' in main(). Not a good idea. I don't like
  single-letter variable names anyway... makes things unclear.

---------------------- diff included ----------------------
Index: eggdrop1.6/language/core.danish.lang
diff -u eggdrop1.6/language/core.danish.lang:1.10 eggdrop1.6/language/core.danish.lang:1.11
--- eggdrop1.6/language/core.danish.lang:1.10	Sun Aug  8 23:39:43 2004
+++ eggdrop1.6/language/core.danish.lang	Sun Sep  4 22:38:31 2005
@@ -1,7 +1,7 @@
 # core.danish.lang
 #   core language messages for eggdrop
 #
-# $Id: core.danish.lang,v 1.10 2004/08/09 04:39:43 wcc Exp $
+# $Id: core.danish.lang,v 1.11 2005/09/05 03:38:31 wcc Exp $
 
 # General stuff
 0x001,Brug
@@ -45,7 +45,7 @@
 0x209,Fejl under indlæsning af modul:
 0x20a,Fejl under fjernelse af module:
 0x20b,Kan ikke indlæse modulet
-0x20c,Stillestående module; der VIL opstå hukommelseslækager!
+0x20c,Stillestående modules; der VIL opstå hukommelseslækager!
 0x20d,Du har installeret moduler, men ikke valgt noget krypterings\n\
 modul, venligst rådfør dig med standard config filen for info.\n
 0x20e,Filesys modul ikke indlæst.
Index: eggdrop1.6/language/core.english.lang
diff -u eggdrop1.6/language/core.english.lang:1.43 eggdrop1.6/language/core.english.lang:1.44
--- eggdrop1.6/language/core.english.lang:1.43	Sun Aug  8 23:39:44 2004
+++ eggdrop1.6/language/core.english.lang	Sun Sep  4 22:38:31 2005
@@ -1,7 +1,7 @@
 # core.english.lang
 #   core language messages for eggdrop
 #
-# $Id: core.english.lang,v 1.43 2004/08/09 04:39:44 wcc Exp $
+# $Id: core.english.lang,v 1.44 2005/09/05 03:38:31 wcc Exp $
 
 # General stuff
 0x001,Usage
@@ -45,7 +45,7 @@
 0x209,Error loading module:
 0x20a,Error unloading module:
 0x20b,Can't load modules
-0x20c,Stagnant module; there WILL be memory leaks!
+0x20c,Stagnant modules; there WILL be memory leaks!
 0x20d,You have installed modules but have not selected an encryption\n\
 module, please consult the default config file for info.\n
 0x20e,Filesys module not loaded.
Index: eggdrop1.6/language/core.french.lang
diff -u eggdrop1.6/language/core.french.lang:1.32 eggdrop1.6/language/core.french.lang:1.33
--- eggdrop1.6/language/core.french.lang:1.32	Sun Aug  8 23:39:44 2004
+++ eggdrop1.6/language/core.french.lang	Sun Sep  4 22:38:31 2005
@@ -1,7 +1,7 @@
 # core.french.lang
 #   core language messages for eggdrop
 #
-# $Id: core.french.lang,v 1.32 2004/08/09 04:39:44 wcc Exp $
+# $Id: core.french.lang,v 1.33 2005/09/05 03:38:31 wcc Exp $
 
 
 # General stuff
@@ -46,7 +46,7 @@
 0x209,Erreur pendant le chargement du module:
 0x20a,Erreur pendant le déchargement du module:
 0x20b,Ne peut pas charger les modules
-0x20c,Module stagnant; il va y avoir perte de mémoire!
+0x20c,Modules stagnant; il va y avoir perte de mémoire!
 0x20d,Vous avez installé des modules, mais n'avez pas choisi de module de cryptage,\n\
 consultez le ficher de configuration initiale pour plus de renseignements.\n
 0x20e,Module Filesys non chargé.
Index: eggdrop1.6/language/core.german.lang
diff -u eggdrop1.6/language/core.german.lang:1.35 eggdrop1.6/language/core.german.lang:1.36
--- eggdrop1.6/language/core.german.lang:1.35	Sun Aug  8 23:39:44 2004
+++ eggdrop1.6/language/core.german.lang	Sun Sep  4 22:38:32 2005
@@ -6,7 +6,7 @@
 # Modified by Michael for 1.3.25.
 # Modified by rtc for 1.4.0
 #
-# $Id: core.german.lang,v 1.35 2004/08/09 04:39:44 wcc Exp $
+# $Id: core.german.lang,v 1.36 2005/09/05 03:38:32 wcc Exp $
 
 # General stuff
 0x001,Gebrauch
@@ -50,7 +50,7 @@
 0x209,Fehler beim Laden des Moduls:
 0x20a,Fehler beim Entfernen des Moduls:
 0x20b,Kann keine Module laden
-0x20c,Stillstehendes Modul; es WERDEN Speicherlecks auftreten!
+0x20c,Stillstehendes Moduls; es WERDEN Speicherlecks auftreten!
 0x20d,Du hast die modulare Version installiert, jedoch kein \n\
 Verschluesselungsmodul ausgewaehlt. Fuer weitere Informationen siehe\n\
 die mitgelieferte Konfigurationsdatei.\n
Index: eggdrop1.6/src/main.c
diff -u eggdrop1.6/src/main.c:1.116 eggdrop1.6/src/main.c:1.117
--- eggdrop1.6/src/main.c:1.116	Sat Aug 20 16:27:30 2005
+++ eggdrop1.6/src/main.c	Sun Sep  4 22:38:32 2005
@@ -5,7 +5,7 @@
  *   command line arguments
  *   context and assert debugging
  *
- * $Id: main.c,v 1.116 2005/08/20 21:27:30 wcc Exp $
+ * $Id: main.c,v 1.117 2005/09/05 03:38:32 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1043,8 +1043,8 @@
         /* Unload as many modules as possible */
         int f = 1;
         module_entry *p;
-        Function x;
-        char xx[256];
+        Function startfunc;
+        char name[256];
 
         /* oops, I guess we should call this event before tcl is restarted */
         check_tcl_event("prerestart");
@@ -1061,8 +1061,8 @@
               d = d->next;
             }
             if (ok) {
-              strcpy(xx, p->name);
-              if (module_unload(xx, botnetnick) == NULL) {
+              strcpy(name, p->name);
+              if (module_unload(name, botnetnick) == NULL) {
                 f = 1;
                 break;
               }
@@ -1070,16 +1070,18 @@
           }
         }
 
+        /* Make sure we don't have any modules left hanging around other than
+         * "eggdrop" and the two that are supposed to be.
+         */
         for (f = 0, p = module_list; p; p = p->next) {
-          if (!strcmp(p->name, "eggdrop") || !strcmp(p->name, "encryption") ||
-              !strcmp(p->name, "uptime"))
-            f = 0;
-          else
-            f = 1;
+          if (strcmp(p->name, "eggdrop") && strcmp(p->name, "encryption") &&
+              strcmp(p->name, "uptime")) {
+            f++;
+          }
         }
-        if (f)
-          /* Should be only 3 modules now - eggdrop, encryption, and uptime */
+        if (f != 0) {
           putlog(LOG_MISC, "*", MOD_STAGNANT);
+        }
 
         flushlogs();
         kill_tcl();
@@ -1089,8 +1091,8 @@
         /* this resets our modules which we didn't unload (encryption and uptime) */
         for (p = module_list; p; p = p->next) {
           if (p->funcs) {
-            x = p->funcs[MODCALL_START];
-            x(NULL);
+            startfunc = p->funcs[MODCALL_START];
+            startfunc(NULL);
           }
         }
 
@@ -1098,6 +1100,7 @@
         restart_chons();
         call_hook(HOOK_LOADED);
       }
+
       do_restart = 0;
     }
   }
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1170 eggdrop1.6/src/patch.h:1.1171
--- eggdrop1.6/src/patch.h:1.1170	Sun Sep  4 13:53:58 2005
+++ eggdrop1.6/src/patch.h	Sun Sep  4 22:38:32 2005
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1170 2005/09/04 18:53:58 wcc Exp $
+ * $Id: patch.h,v 1.1171 2005/09/05 03:38:32 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1125860044");            /* current unixtime */
+patch("1125891204");            /* current unixtime */
 /*
  *
  *
  */
-patch("rembot");
+patch("main-fixes");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list