[cvslog] (2005-10-15 23:40:12 UTC) Module eggdrop1.7: Change committed!

cvslog cvs at tsss.org
Sat Oct 15 17:40:12 CST 2005


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.7
Commit time: 2005-10-15 23:40:12 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

Modified files:
     src/modules.c src/patch.h src/mod/module.h

Log message:

* Fixed crash on startup reported by various users (global table order was
  off by one starting at index 100/101). Thanks guys.

---------------------- diff included ----------------------
Index: eggdrop1.7/src/mod/module.h
diff -u eggdrop1.7/src/mod/module.h:1.14 eggdrop1.7/src/mod/module.h:1.15
--- eggdrop1.7/src/mod/module.h:1.14	Wed Aug 24 23:42:27 2005
+++ eggdrop1.7/src/mod/module.h	Sat Oct 15 18:40:02 2005
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Id: module.h,v 1.14 2005/08/25 04:42:27 wcc Exp $
+ * $Id: module.h,v 1.15 2005/10/15 23:40:02 wcc Exp $
  */
 
 #ifndef _EGG_MOD_MODULE_H
@@ -199,208 +199,208 @@
 #define share_greet (*(int *)global[98])
 #define max_dcc (*(int *)global[99])
 /* 100 - 109 */
-#define ignore_time (*(int *)(global[101]))
-#define reserved_port_min (*(int *)(global[102]))
-#define reserved_port_max (*(int *)(global[103]))
-#define raw_log (*(int *)(global[104]))
-#define noshare (*(int *)(global[105]))
-#define make_userfile (*(int*)global[106])
-#define default_flags (*(int*)global[107])
-#define dcc_total (*(int*)global[108])
-#define tempdir ((char *)(global[109]))
+#define ignore_time (*(int *)(global[100]))
+#define reserved_port_min (*(int *)(global[101]))
+#define reserved_port_max (*(int *)(global[102]))
+#define raw_log (*(int *)(global[103]))
+#define noshare (*(int *)(global[104]))
+#define make_userfile (*(int*)global[105])
+#define default_flags (*(int*)global[106])
+#define dcc_total (*(int*)global[107])
+#define tempdir ((char *)(global[108]))
+#define natip ((char *)(global[109]))
 /* 110 - 119 */
-#define natip ((char *)(global[110]))
-#define hostname ((char *)(global[111]))
-#define origbotname ((char *)(global[112]))
-#define botuser ((char *)(global[113]))
-#define admin ((char *)(global[114]))
-#define userfile ((char *)global[115])
-#define ver ((char *)global[116])
-#define notify_new ((char *)global[117])
-#define helpdir ((char *)global[118])
-#define Version ((char *)global[119])
+#define hostname ((char *)(global[110]))
+#define origbotname ((char *)(global[111]))
+#define botuser ((char *)(global[112]))
+#define admin ((char *)(global[113]))
+#define userfile ((char *)global[114])
+#define ver ((char *)global[115])
+#define notify_new ((char *)global[116])
+#define helpdir ((char *)global[117])
+#define Version ((char *)global[118])
+#define botnetnick ((char *)global[119])
 /* 120 - 129 */
-#define botnetnick ((char *)global[120])
-#define DCC_CHAT_PASS (*(struct dcc_table *)(global[121]))
-#define DCC_BOT (*(struct dcc_table *)(global[122]))
-#define DCC_LOST (*(struct dcc_table *)(global[123]))
-#define DCC_CHAT (*(struct dcc_table *)(global[124]))
-#define interp (*(Tcl_Interp **)(global[125]))
-#define now (*(time_t*)global[126])
-#define findanyidx ((int (*)(int))global[127])
-#define findchan ((struct chanset_t *(*)(char *))global[128])
-#define cmd_die (global[129])
+#define DCC_CHAT_PASS (*(struct dcc_table *)(global[120]))
+#define DCC_BOT (*(struct dcc_table *)(global[121]))
+#define DCC_LOST (*(struct dcc_table *)(global[122]))
+#define DCC_CHAT (*(struct dcc_table *)(global[123]))
+#define interp (*(Tcl_Interp **)(global[124]))
+#define now (*(time_t*)global[125])
+#define findanyidx ((int (*)(int))global[126])
+#define findchan ((struct chanset_t *(*)(char *))global[127])
+#define cmd_die (global[128])
+#define days ((void (*)(time_t,time_t,char *,int))global[129])
 /* 130 - 139 */
-#define days ((void (*)(time_t,time_t,char *,int))global[130])
-#define ismember ((memberlist * (*) (struct chanset_t *, char *))global[131])
-#define newsplit ((char *(*)(char **))global[132])
-#define splitnick ((char *(*)(char **))global[133])
-#define splitc ((void (*)(char *,char *,char))global[134])
-#define addignore ((void (*) (char *, char *, char *,time_t))global[135])
-#define match_ignore ((int (*)(char *))global[136])
-#define delignore ((int (*)(char *))global[137])
-#define fatal (global[138])
-#define xtra_kill ((void (*)(struct user_entry *))global[139])
+#define ismember ((memberlist * (*) (struct chanset_t *, char *))global[130])
+#define newsplit ((char *(*)(char **))global[131])
+#define splitnick ((char *(*)(char **))global[132])
+#define splitc ((void (*)(char *,char *,char))global[133])
+#define addignore ((void (*) (char *, char *, char *,time_t))global[134])
+#define match_ignore ((int (*)(char *))global[135])
+#define delignore ((int (*)(char *))global[136])
+#define fatal (global[137])
+#define xtra_kill ((void (*)(struct user_entry *))global[138])
+#define xtra_unpack ((void (*)(struct userrec *, struct user_entry *))global[139])
 /* 140 - 149 */
-#define xtra_unpack ((void (*)(struct userrec *, struct user_entry *))global[140])
-#define movefile ((int (*) (char *, char *))global[141])
-#define copyfile ((int (*) (char *, char *))global[142])
-#define do_tcl ((void (*)(char *, char *))global[143])
-#define readtclprog ((int (*)(const char *))global[144])
-#define get_language ((char *(*)(int))global[145])
-#define def_get ((void *(*)(struct userrec *, struct user_entry *))global[146])
-#define makepass ((void (*) (char *))global[147])
-#define wild_match ((int (*)(const char *, const char *))global[148])
-#define maskhost ((void (*)(const char *, char *, int))global[149])
+#define movefile ((int (*) (char *, char *))global[140])
+#define copyfile ((int (*) (char *, char *))global[141])
+#define do_tcl ((void (*)(char *, char *))global[142])
+#define readtclprog ((int (*)(const char *))global[143])
+#define get_language ((char *(*)(int))global[144])
+#define def_get ((void *(*)(struct userrec *, struct user_entry *))global[145])
+#define makepass ((void (*) (char *))global[146])
+#define wild_match ((int (*)(const char *, const char *))global[147])
+#define maskhost ((void (*)(const char *, char *, int))global[148])
+#define show_motd ((void(*)(int))global[149])
 /* 150 - 159 */
-#define show_motd ((void(*)(int))global[150])
-#define tellhelp ((void(*)(int, char *, struct flag_record *, int))global[151])
-#define showhelp ((void(*)(char *, char *, struct flag_record *, int))global[152])
-#define add_help_reference ((void(*)(char *))global[153])
-#define rem_help_reference ((void(*)(char *))global[154])
-#define touch_laston ((void (*)(struct userrec *,char *,time_t))global[155])
-#define add_mode ((void (*)(struct chanset_t *,char,char,char *))(*(Function**)(global[156])))
-#define rmspace ((void (*)(char *))global[157])
-#define in_chain ((int (*)(char *))global[158])
-#define add_note ((int (*)(char *,char*,char*,int,int))global[159])
+#define tellhelp ((void(*)(int, char *, struct flag_record *, int))global[150])
+#define showhelp ((void(*)(char *, char *, struct flag_record *, int))global[151])
+#define add_help_reference ((void(*)(char *))global[152])
+#define rem_help_reference ((void(*)(char *))global[153])
+#define touch_laston ((void (*)(struct userrec *,char *,time_t))global[154])
+#define add_mode ((void (*)(struct chanset_t *,char,char,char *))(*(Function**)(global[155])))
+#define rmspace ((void (*)(char *))global[156])
+#define in_chain ((int (*)(char *))global[157])
+#define add_note ((int (*)(char *,char*,char*,int,int))global[158])
+#define del_lang_section ((int(*)(char *))global[159])
 /* 160 - 169 */
-#define del_lang_section ((int(*)(char *))global[160])
-#define detect_dcc_flood ((int (*) (time_t *,struct chat_info *,int))global[161])
-#define flush_lines ((void(*)(int,struct chat_info*))global[162])
-#define expected_memory ((int(*)(void))global[163])
-#define do_restart (*(int *)(global[164]))
-#define add_hook(a,b) (((void (*) (int, Function))global[165])(a,b))
-#define del_hook(a,b) (((void (*) (int, Function))global[166])(a,b))
-#define H_event (*(p_tcl_bind_list *)(global[167]))
-#define H_dcc (*(p_tcl_bind_list *)(global[168]))
-#define H_filt (*(p_tcl_bind_list *)(global[169]))
+#define detect_dcc_flood ((int (*) (time_t *,struct chat_info *,int))global[160])
+#define flush_lines ((void(*)(int,struct chat_info*))global[161])
+#define expected_memory ((int(*)(void))global[162])
+#define do_restart (*(int *)(global[163]))
+#define add_hook(a,b) (((void (*) (int, Function))global[164])(a,b))
+#define del_hook(a,b) (((void (*) (int, Function))global[165])(a,b))
+#define H_event (*(p_tcl_bind_list *)(global[166]))
+#define H_dcc (*(p_tcl_bind_list *)(global[167]))
+#define H_filt (*(p_tcl_bind_list *)(global[168]))
+#define H_chon (*(p_tcl_bind_list *)(global[169]))
 /* 170 - 179 */
-#define H_chon (*(p_tcl_bind_list *)(global[170]))
-#define H_chof (*(p_tcl_bind_list *)(global[171]))
-#define H_load (*(p_tcl_bind_list *)(global[172]))
-#define H_unld (*(p_tcl_bind_list *)(global[173]))
-#define H_chat (*(p_tcl_bind_list *)(global[174]))
-#define H_act (*(p_tcl_bind_list *)(global[175]))
-#define H_bcst (*(p_tcl_bind_list *)(global[176]))
-#define H_bot (*(p_tcl_bind_list *)(global[177]))
-#define H_link (*(p_tcl_bind_list *)(global[178]))
-#define H_disc (*(p_tcl_bind_list *)(global[179]))
+#define H_chof (*(p_tcl_bind_list *)(global[170]))
+#define H_load (*(p_tcl_bind_list *)(global[171]))
+#define H_unld (*(p_tcl_bind_list *)(global[172]))
+#define H_chat (*(p_tcl_bind_list *)(global[173]))
+#define H_act (*(p_tcl_bind_list *)(global[174]))
+#define H_bcst (*(p_tcl_bind_list *)(global[175]))
+#define H_bot (*(p_tcl_bind_list *)(global[176]))
+#define H_link (*(p_tcl_bind_list *)(global[177]))
+#define H_disc (*(p_tcl_bind_list *)(global[178]))
+#define H_away (*(p_tcl_bind_list *)(global[179]))
 /* 180 - 189 */
-#define H_away (*(p_tcl_bind_list *)(global[180]))
-#define H_nkch (*(p_tcl_bind_list *)(global[181]))
-#define USERENTRY_BOTADDR (*(struct user_entry_type *)(global[182]))
-#define USERENTRY_BOTFL (*(struct user_entry_type *)(global[183]))
-#define USERENTRY_HOSTS (*(struct user_entry_type *)(global[184]))
-#define USERENTRY_PASS (*(struct user_entry_type *)(global[185]))
-#define USERENTRY_XTRA (*(struct user_entry_type *)(global[186]))
-#define USERENTRY_INFO (*(struct user_entry_type *)(global[187]))
-#define USERENTRY_COMMENT (*(struct user_entry_type *)(global[188]))
-#define USERENTRY_LASTON (*(struct user_entry_type *)(global[189]))
+#define H_nkch (*(p_tcl_bind_list *)(global[180]))
+#define USERENTRY_BOTADDR (*(struct user_entry_type *)(global[181]))
+#define USERENTRY_BOTFL (*(struct user_entry_type *)(global[182]))
+#define USERENTRY_HOSTS (*(struct user_entry_type *)(global[183]))
+#define USERENTRY_PASS (*(struct user_entry_type *)(global[184]))
+#define USERENTRY_XTRA (*(struct user_entry_type *)(global[185]))
+#define USERENTRY_INFO (*(struct user_entry_type *)(global[186]))
+#define USERENTRY_COMMENT (*(struct user_entry_type *)(global[187]))
+#define USERENTRY_LASTON (*(struct user_entry_type *)(global[188]))
+#define user_del_chan ((void(*)(char *))(global[189]))
 /* 190 - 199 */
-#define user_del_chan ((void(*)(char *))(global[190]))
-#define putlog (global[191])
-#define botnet_send_chan ((void(*)(int,char*,char*,int,char*))global[192])
-#define list_type_kill ((void(*)(struct list_type *))global[193])
-#define logmodes ((int(*)(char *))global[194])
-#define masktype ((const char *(*)(int))global[195])
-#define stripmodes ((int(*)(char *))global[196])
-#define stripmasktype ((const char *(*)(int))global[197])
-#define sub_lang ((void(*)(int,char *))global[198])
-#define online_since (*(int *)(global[199]))
+#define putlog (global[190])
+#define botnet_send_chan ((void(*)(int,char*,char*,int,char*))global[191])
+#define list_type_kill ((void(*)(struct list_type *))global[192])
+#define logmodes ((int(*)(char *))global[193])
+#define masktype ((const char *(*)(int))global[194])
+#define stripmodes ((int(*)(char *))global[195])
+#define stripmasktype ((const char *(*)(int))global[196])
+#define sub_lang ((void(*)(int,char *))global[197])
+#define online_since (*(int *)(global[198]))
+#define cmd_loadlanguage ((int (*)(struct userrec *,int,char *))global[199])
 /* 200 - 209 */
-#define cmd_loadlanguage ((int (*)(struct userrec *,int,char *))global[200])
-#define check_dcc_attrs ((int (*)(struct userrec *,int))global[201])
-#define check_dcc_chanattrs ((int (*)(struct userrec *,char *,int,int))global[202])
-#define add_tcl_coups ((void (*) (tcl_coups *))global[203])
-#define rem_tcl_coups ((void (*) (tcl_coups *))global[204])
-#define botname ((char *)(global[205]))
-#define check_tcl_chjn ((void (*) (const char *,const char *,int,char,int,const char *))global[206])
-#define sanitycheck_dcc ((int (*)(char *, char *, char *, char *))global[207])
-#define isowner ((int (*)(char *))global[208])
-#define rfc_casecmp ((int(*)(char *, char *))(*(Function**)(global[209])))
+#define check_dcc_attrs ((int (*)(struct userrec *,int))global[200])
+#define check_dcc_chanattrs ((int (*)(struct userrec *,char *,int,int))global[201])
+#define add_tcl_coups ((void (*) (tcl_coups *))global[202])
+#define rem_tcl_coups ((void (*) (tcl_coups *))global[203])
+#define botname ((char *)(global[204]))
+#define check_tcl_chjn ((void (*) (const char *,const char *,int,char,int,const char *))global[205])
+#define sanitycheck_dcc ((int (*)(char *, char *, char *, char *))global[206])
+#define isowner ((int (*)(char *))global[207])
+#define rfc_casecmp ((int(*)(char *, char *))(*(Function**)(global[208])))
+#define rfc_ncasecmp ((int(*)(char *, char *, int *))(*(Function**)(global[209])))
 /* 210 - 219 */
-#define rfc_ncasecmp ((int(*)(char *, char *, int *))(*(Function**)(global[210])))
-#define global_exempts (*(maskrec **)(global[211]))
-#define global_invites (*(maskrec **)(global[212]))
-#define check_tcl_filt ((const char *(*)(int, const char *))global[213])
-#define use_exempts (*(int *)(global[214]))
-#define use_invites (*(int *)(global[215]))
-#define force_expire (*(int *)(global[216]))
-#define add_lang_section ((void(*)(char *))global[217])
-#define user_realloc(x,y) ((void *(*)(void *,int,char *,int))global[218])((x),(y),__FILE__,__LINE__)
-#define nrealloc(x,y) (((void *(*)())global[219])((x),(y),MODULE_NAME,__FILE__,__LINE__))
+#define global_exempts (*(maskrec **)(global[210]))
+#define global_invites (*(maskrec **)(global[211]))
+#define check_tcl_filt ((const char *(*)(int, const char *))global[212])
+#define use_exempts (*(int *)(global[213]))
+#define use_invites (*(int *)(global[214]))
+#define force_expire (*(int *)(global[215]))
+#define add_lang_section ((void(*)(char *))global[216])
+#define user_realloc(x,y) ((void *(*)(void *,int,char *,int))global[217])((x),(y),__FILE__,__LINE__)
+#define nrealloc(x,y) (((void *(*)())global[218])((x),(y),MODULE_NAME,__FILE__,__LINE__))
+#define xtra_set ((int(*)(struct userrec *,struct user_entry *, void *))global[219])
 /* 220 - 229 */
-#define xtra_set ((int(*)(struct userrec *,struct user_entry *, void *))global[220])
 
 #ifdef DEBUG_ASSERT
 #  define Assert(expr)          do {                                    \
         if (!(expr))                                                    \
-                (global[221](__FILE__, __LINE__, MODULE_NAME));         \
+                (global[220](__FILE__, __LINE__, MODULE_NAME));         \
 } while (0)
 #else
 #  define Assert(expr)  do {    } while (0)
 #endif
 
-#define allocsock ((int(*)(int sock,int options))global[222])
-#define call_hostbyip ((void(*)(IP, char *, int))global[223])
-#define call_ipbyhost ((void(*)(char *, IP, int))global[224])
-#define iptostr ((char *(*)(IP))global[225])
-#define DCC_DNSWAIT (*(struct dcc_table *)(global[226]))
-#define hostsanitycheck_dcc ((int(*)(char *, char *, IP, char *, char *))global[227])
-#define dcc_dnsipbyhost ((void (*)(char *))global[228])
-#define dcc_dnshostbyip ((void (*)(IP))global[229])
+#define allocsock ((int(*)(int sock,int options))global[221])
+#define call_hostbyip ((void(*)(IP, char *, int))global[222])
+#define call_ipbyhost ((void(*)(char *, IP, int))global[223])
+#define iptostr ((char *(*)(IP))global[224])
+#define DCC_DNSWAIT (*(struct dcc_table *)(global[225]))
+#define hostsanitycheck_dcc ((int(*)(char *, char *, IP, char *, char *))global[226])
+#define dcc_dnsipbyhost ((void (*)(char *))global[227])
+#define dcc_dnshostbyip ((void (*)(IP))global[228])
+#define changeover_dcc ((void (*)(int, struct dcc_table *, int))global[229])
 /* 230 - 239 */
-#define changeover_dcc ((void (*)(int, struct dcc_table *, int))global[230])
-#define make_rand_str ((void (*) (char *, int))global[231])
-#define protect_readonly (*(int *)(global[232]))
-#define findchan_by_dname ((struct chanset_t *(*)(char *))global[233])
-#define removedcc ((void (*) (int))global[234])
-#define userfile_perm (*(int *)global[235])
-#define sock_has_data ((int(*)(int, int))global[236])
-#define bots_in_subtree ((int (*)(tand_t *))global[237])
-#define users_in_subtree ((int (*)(tand_t *))global[238])
-#define egg_inet_aton ((int (*)(const char *cp, struct in_addr *addr))global[239])
+#define make_rand_str ((void (*) (char *, int))global[230])
+#define protect_readonly (*(int *)(global[231]))
+#define findchan_by_dname ((struct chanset_t *(*)(char *))global[232])
+#define removedcc ((void (*) (int))global[233])
+#define userfile_perm (*(int *)global[234])
+#define sock_has_data ((int(*)(int, int))global[235])
+#define bots_in_subtree ((int (*)(tand_t *))global[236])
+#define users_in_subtree ((int (*)(tand_t *))global[237])
+#define egg_inet_aton ((int (*)(const char *cp, struct in_addr *addr))global[238])
+#define egg_snprintf (global[239])
 /* 240 - 249 */
-#define egg_snprintf (global[240])
-#define egg_vsnprintf ((int (*)(char *, size_t, const char *, va_list))global[241])
-#define egg_memset ((void *(*)(void *, int, size_t))global[242])
-#define egg_strcasecmp ((int (*)(const char *, const char *))global[243])
-#define egg_strncasecmp ((int (*)(const char *, const char *, size_t))global[244])
-#define is_file ((int (*)(const char *))global[245])
-#define must_be_owner (*(int *)(global[246]))
-#define tandbot (*(tand_t **)(global[247]))
-#define party (*(party_t **)(global[248]))
-#define open_address_listen ((int (*)(IP addr, int *port))global[249])
+#define egg_vsnprintf ((int (*)(char *, size_t, const char *, va_list))global[240])
+#define egg_memset ((void *(*)(void *, int, size_t))global[241])
+#define egg_strcasecmp ((int (*)(const char *, const char *))global[242])
+#define egg_strncasecmp ((int (*)(const char *, const char *, size_t))global[243])
+#define is_file ((int (*)(const char *))global[244])
+#define must_be_owner (*(int *)(global[245]))
+#define tandbot (*(tand_t **)(global[246]))
+#define party (*(party_t **)(global[247]))
+#define open_address_listen ((int (*)(IP addr, int *port))global[248])
+#define str_escape ((char *(*)(const char *, const char, const char))global[249])
 /* 250 - 259 */
-#define str_escape ((char *(*)(const char *, const char, const char))global[250])
-#define strchr_unescape ((char *(*)(char *, const char, register const char))global[251])
-#define str_unescape ((void (*)(char *, register const char))global[252])
-#define clear_chanlist_member ((void (*)(const char *nick))global[253])
-#define fixfrom ((char *(*)(char *))global[254])
-#define socklist (*(struct sock_list **)global[255])
-#define sockoptions ((int (*)(int, int, int))global[256])
-#define kill_bot ((void (*)(char *, char *))global[257])
-#define quit_msg ((char *)(global[258]))
-#define module_load ((char *(*)(char *))global[259])
+#define strchr_unescape ((char *(*)(char *, const char, register const char))global[250])
+#define str_unescape ((void (*)(char *, register const char))global[251])
+#define clear_chanlist_member ((void (*)(const char *nick))global[252])
+#define fixfrom ((char *(*)(char *))global[253])
+#define socklist (*(struct sock_list **)global[254])
+#define sockoptions ((int (*)(int, int, int))global[255])
+#define kill_bot ((void (*)(char *, char *))global[256])
+#define quit_msg ((char *)(global[257]))
+#define module_load ((char *(*)(char *))global[258])
+#define module_unload ((char *(*)(char *, char *))global[259])
 /* 260 - 269 */
-#define module_unload ((char *(*)(char *, char *))global[260])
-#define parties (*(int *)global[261])
-#define tell_bottree ((void (*)(int, int))global[262])
-#define MD5_Init ((void (*)(MD5_CTX *))global[263])
-#define MD5_Update ((void (*)(MD5_CTX *, void *, unsigned long))global[264])
-#define MD5_Final ((void (*)(unsigned char *, MD5_CTX *))global[265])
-#define wild_match_per ((int (*)(const char *, const char *))global[266])
-#define killtransfer ((void(*)(int))global[267])
-#define write_ignores ((int (*)(FILE *, int))global[268])
-#define copy_to_tmp (*(int *)(global[269]))
+#define parties (*(int *)global[260])
+#define tell_bottree ((void (*)(int, int))global[261])
+#define MD5_Init ((void (*)(MD5_CTX *))global[262])
+#define MD5_Update ((void (*)(MD5_CTX *, void *, unsigned long))global[263])
+#define MD5_Final ((void (*)(unsigned char *, MD5_CTX *))global[264])
+#define wild_match_per ((int (*)(const char *, const char *))global[265])
+#define killtransfer ((void(*)(int))global[266])
+#define write_ignores ((int (*)(FILE *, int))global[267])
+#define copy_to_tmp (*(int *)(global[268]))
+#define quiet_reject (*(int *)(global[269]))
 /* 270 - */
-#define quiet_reject (*(int *)(global[270]))
-#define file_readable ((int (*) (char *))global[271])
-#define strip_mirc_codes ((void (*)(int, char *))global[272])
-#define check_ansi ((int (*) (char *))global[273])
-#define oatoi ((int (*) (const char *))global[274])
-#define str_isdigit ((int (*) (const char *))global[275])
-#define remove_crlf ((void (*)(char **))global[276])
+#define file_readable ((int (*) (char *))global[270])
+#define strip_mirc_codes ((void (*)(int, char *))global[271])
+#define check_ansi ((int (*) (char *))global[272])
+#define oatoi ((int (*) (const char *))global[273])
+#define str_isdigit ((int (*) (const char *))global[274])
+#define remove_crlf ((void (*)(char **))global[275])
 
 /* This is for blowfish module, couldnt be bothered making a whole new .h
  * file for it ;)
Index: eggdrop1.7/src/modules.c
diff -u eggdrop1.7/src/modules.c:1.18 eggdrop1.7/src/modules.c:1.19
--- eggdrop1.7/src/modules.c:1.18	Wed Aug 24 19:25:29 2005
+++ eggdrop1.7/src/modules.c	Sat Oct 15 18:40:02 2005
@@ -19,7 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Id: modules.c,v 1.18 2005/08/25 00:25:29 wcc Exp $
+ * $Id: modules.c,v 1.19 2005/10/15 23:40:02 wcc Exp $
  */
 
 #include <ctype.h>
@@ -328,8 +328,8 @@
   (Function) & default_flags,
   (Function) & dcc_total,
   (Function) tempdir,
-  /* 110 - 119 */
   (Function) natip,
+  /* 110 - 119 */
   (Function) hostname,
   (Function) origbotname,
   (Function) botuser,
@@ -339,8 +339,8 @@
   (Function) notify_new,
   (Function) helpdir,
   (Function) version,
-  /* 120 - 129 */
   (Function) botnetnick,
+  /* 120 - 129 */
   (Function) & DCC_CHAT_PASS,
   (Function) & DCC_BOT,
   (Function) & DCC_LOST,
@@ -350,8 +350,8 @@
   (Function) findanyidx,
   (Function) findchan,
   (Function) cmd_die,
-  /* 130 - 139 */
   (Function) days,
+  /* 130 - 139 */
   (Function) ismember,
   (Function) newsplit,
   (Function) splitnick,
@@ -361,8 +361,8 @@
   (Function) delignore,
   (Function) fatal,
   (Function) xtra_kill,
-  /* 140 - 149 */
   (Function) xtra_unpack,
+  /* 140 - 149 */
   (Function) movefile,
   (Function) copyfile,
   (Function) do_tcl,
@@ -372,8 +372,8 @@
   (Function) makepass,
   (Function) _wild_match,
   (Function) maskhost,
-  /* 150 - 159 */
   (Function) show_motd,
+  /* 150 - 159 */
   (Function) tellhelp,
   (Function) showhelp,
   (Function) add_help_reference,
@@ -383,8 +383,8 @@
   (Function) rmspace,
   (Function) in_chain,
   (Function) add_note,
-  /* 160 - 169 */
   (Function) del_lang_section,
+  /* 160 - 169 */
   (Function) detect_dcc_flood,
   (Function) flush_lines,
   (Function) expected_memory,
@@ -394,8 +394,8 @@
   (Function) & H_event,
   (Function) & H_dcc,
   (Function) & H_filt,
-  /* 170 - 179 */
   (Function) & H_chon,
+  /* 170 - 179 */
   (Function) & H_chof,
   (Function) & H_load,
   (Function) & H_unld,
@@ -405,8 +405,8 @@
   (Function) & H_bot,
   (Function) & H_link,
   (Function) & H_disc,
-  /* 180 - 189 */
   (Function) & H_away,
+  /* 180 - 189 */
   (Function) & H_nkch,
   (Function) & USERENTRY_BOTADDR,
   (Function) & USERENTRY_BOTFL,
@@ -416,8 +416,8 @@
   (Function) & USERENTRY_INFO,
   (Function) & USERENTRY_COMMENT,
   (Function) & USERENTRY_LASTON,
-  /* 190 - 199 */
   (Function) user_del_chan,
+  /* 190 - 199 */
   (Function) putlog,
   (Function) botnet_send_chan,
   (Function) list_type_kill,
@@ -427,8 +427,8 @@
   (Function) stripmasktype,
   (Function) sub_lang,
   (Function) & online_since,
-  /* 200 - 209 */
   (Function) cmd_loadlanguage,
+  /* 200 - 209 */
   (Function) check_dcc_attrs,
   (Function) check_dcc_chanattrs,
   (Function) add_tcl_coups,
@@ -438,8 +438,8 @@
   (Function) sanitycheck_dcc,
   (Function) isowner,
   (Function) & rfc_casecmp,
-  /* 210 - 219 */
   (Function) & rfc_ncasecmp,
+  /* 210 - 219 */
   (Function) & global_exempts,
   (Function) & global_invites,
   (Function) check_tcl_filt,
@@ -449,8 +449,8 @@
   (Function) add_lang_section,
   (Function) _user_realloc,
   (Function) mod_realloc,
-  /* 220 - 229 */
   (Function) xtra_set,
+  /* 220 - 229 */
 #ifdef DEBUG_ASSERT
   (Function) eggAssert,
 #else
@@ -464,8 +464,8 @@
   (Function) hostsanitycheck_dcc,
   (Function) dcc_dnsipbyhost,
   (Function) dcc_dnshostbyip,
-  /* 230 - 239 */
   (Function) changeover_dcc,
+  /* 230 - 239 */
   (Function) make_rand_str,
   (Function) & protect_readonly,
   (Function) findchan_by_dname,
@@ -475,8 +475,8 @@
   (Function) bots_in_subtree,
   (Function) users_in_subtree,
   (Function) egg_inet_aton,
-  /* 240 - 249 */
   (Function) egg_snprintf,
+  /* 240 - 249 */
   (Function) egg_vsnprintf,
   (Function) egg_memset,
   (Function) egg_strcasecmp,
@@ -486,8 +486,8 @@
   (Function) & tandbot,
   (Function) & party,
   (Function) open_address_listen,
-  /* 250 - 259 */
   (Function) str_escape,
+  /* 250 - 259 */
   (Function) strchr_unescape,
   (Function) str_unescape,
   (Function) clear_chanlist_member,
@@ -497,8 +497,8 @@
   (Function) kill_bot,
   (Function) quit_msg,
   (Function) module_load,
-  /* 260 - 269 */
   (Function) module_unload,
+  /* 260 - 269 */
   (Function) & parties,
   (Function) tell_bottree,
   (Function) MD5_Init,
@@ -508,8 +508,8 @@
   (Function) killtransfer,
   (Function) write_ignores,
   (Function) & copy_to_tmp,
-  /* 270 - */
   (Function) & quiet_reject,
+  /* 270 - */
   (Function) file_readable,
   (Function) strip_mirc_codes,
   (Function) check_ansi,
Index: eggdrop1.7/src/patch.h
diff -u eggdrop1.7/src/patch.h:1.52 eggdrop1.7/src/patch.h:1.53
--- eggdrop1.7/src/patch.h:1.52	Sun Sep  4 22:27:09 2005
+++ eggdrop1.7/src/patch.h	Sat Oct 15 18:40:02 2005
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.52 2005/09/05 03:27:09 wcc Exp $
+ * $Id: patch.h,v 1.53 2005/10/15 23:40:02 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1125888917");            /* current unixtime */
+patch("1129419490");            /* current unixtime */
 /*
  *
  *
  */
-patch("mainloop-cleanups");
+patch("no-startup-crash");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list