[cvslog] [CVS] Module eggdrop1.6: Change committed

cvs at eggheads.org cvs at eggheads.org
Thu Feb 18 03:52:40 CST 2010


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2010-02-18 09:52:40 UTC
Committer  : Rumen Stoyanov <pseudo at egg6.net>

Modified files:
     config.h.in configure configure.ac doc/Changes1.6 src/botcmd.c
     src/cmds.c src/cmdt.h src/eggdrop.h src/flags.h src/main.h
     src/modules.c src/modules.h src/patch.h src/tclegg.h
     src/tclhash.c src/tclhash.h src/mod/module.h
     src/mod/assoc.mod/assoc.c src/mod/channels.mod/channels.c
     src/mod/channels.mod/channels.h src/mod/channels.mod/cmdschan.c
     src/mod/channels.mod/tclchan.c src/mod/channels.mod/udefchan.c
     src/mod/filesys.mod/files.c src/mod/filesys.mod/filesys.c
     src/mod/irc.mod/chan.c src/mod/irc.mod/cmdsirc.c
     src/mod/irc.mod/irc.c src/mod/irc.mod/msgcmds.c
     src/mod/notes.mod/cmdsnote.c src/mod/notes.mod/notes.c
     src/mod/server.mod/cmdsserv.c src/mod/server.mod/servmsg.c
     src/mod/share.mod/share.c src/mod/wire.mod/wire.c

Log message:

Changed the definition of the 'Function' type to avoid data loss with functions returning 64-bit types. 64-bit builds will no longer crash due to pointers being truncated to 32 bits.
Created new function pointer type 'IntFunc' for use only with functions returning int.

Fixes Bugzilla Bug # 485 "64-bit eggdrop builds crash on some systems"

---------------------- diff included ----------------------
Index: eggdrop1.6/config.h.in
diff -u eggdrop1.6/config.h.in:1.54 eggdrop1.6/config.h.in:1.55
--- eggdrop1.6/config.h.in:1.54	Mon Jan 25 21:12:15 2010
+++ eggdrop1.6/config.h.in	Thu Feb 18 03:52:29 2010
@@ -96,6 +96,9 @@
 /* Define to 1 if you have the `inet_aton' function. */
 #undef HAVE_INET_ATON
 
+/* Define to 1 if the system has the type `intptr_t'. */
+#undef HAVE_INTPTR_T
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
@@ -415,6 +418,10 @@
 #undef inline
 #endif
 
+/* Define to the type of a signed integer type wide enough to hold a pointer,
+   if such a type exists, and if the system does not define it. */
+#undef intptr_t
+
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t
 
Index: eggdrop1.6/configure
diff -u eggdrop1.6/configure:1.163 eggdrop1.6/configure:1.164
--- eggdrop1.6/configure:1.163	Mon Jan 25 21:12:15 2010
+++ eggdrop1.6/configure	Thu Feb 18 03:52:29 2010
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.36 .
+# From configure.ac Revision: 1.37 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for Eggdrop 1.6.20.
 #
@@ -6150,6 +6150,41 @@
     ;;
 esac
 
+
+  ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default"
+if test "x$ac_cv_type_intptr_t" = x""yes; then :
+
+$as_echo "#define HAVE_INTPTR_T 1" >>confdefs.h
+
+else
+  for ac_type in 'int' 'long int' 'long long int'; do
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($ac_type))];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define intptr_t $ac_type
+_ACEOF
+
+	  ac_type=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       test -z "$ac_type" && break
+     done
+fi
+
+
 ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
 if test "x$ac_cv_type_pid_t" = x""yes; then :
 
Index: eggdrop1.6/configure.ac
diff -u eggdrop1.6/configure.ac:1.37 eggdrop1.6/configure.ac:1.38
--- eggdrop1.6/configure.ac:1.37	Mon Jan 25 21:12:15 2010
+++ eggdrop1.6/configure.ac	Thu Feb 18 03:52:29 2010
@@ -1,11 +1,11 @@
 dnl configure.ac: this file is processed by autoconf to produce ./configure.
 dnl
-dnl $Id: configure.ac,v 1.37 2010/01/26 03:12:15 tothwolf Exp $
+dnl $Id: configure.ac,v 1.38 2010/02/18 09:52:29 pseudo Exp $
 
 AC_PREREQ(2.60)
 AC_INIT([Eggdrop],[1.6.20],[bugs at eggheads.org])
 AC_COPYRIGHT([Copyright (C) 1999 - 2010 Eggheads Development Team])
-AC_REVISION($Revision: 1.37 $)
+AC_REVISION($Revision: 1.38 $)
 AC_CONFIG_SRCDIR(src/eggdrop.h)
 AC_CONFIG_AUX_DIR(misc)
 AC_CONFIG_HEADER(config.h)
@@ -98,6 +98,7 @@
 AC_C_CONST
 AC_C_BIGENDIAN
 AC_C_INLINE
+AC_TYPE_INTPTR_T
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_STRUCT_TIMEZONE
Index: eggdrop1.6/doc/Changes1.6
diff -u eggdrop1.6/doc/Changes1.6:1.64 eggdrop1.6/doc/Changes1.6:1.65
--- eggdrop1.6/doc/Changes1.6:1.64	Tue Feb  9 08:51:07 2010
+++ eggdrop1.6/doc/Changes1.6	Thu Feb 18 03:52:29 2010
@@ -1,4 +1,4 @@
-$Id: Changes1.6,v 1.64 2010/02/09 14:51:07 thommey Exp $
+$Id: Changes1.6,v 1.65 2010/02/18 09:52:29 pseudo Exp $
 
 Eggdrop Changes (since version 1.6.0)
 
@@ -6,6 +6,13 @@
 
 1.6.20 (CVS):
 
+  - Changed the definition of the 'Function' type to avoid data loss with
+    functions returning 64-bit types. 64-bit builds will no longer crash due
+    to pointers being truncated to 32 bits. Created new function pointer type
+    'IntFunc' for use only with functions returning int.
+    Fixes Bugzilla Bug # 485 "64-bit eggdrop builds crash on some systems"
+    Patch by: pseudo
+
   - Fixed a minor notes.mod formatting bug when displaying dcc usage.
     Found by: Johannes13 / Patch by: thommey
 
Index: eggdrop1.6/src/botcmd.c
diff -u eggdrop1.6/src/botcmd.c:1.51 eggdrop1.6/src/botcmd.c:1.52
--- eggdrop1.6/src/botcmd.c:1.51	Mon Jan  4 07:15:11 2010
+++ eggdrop1.6/src/botcmd.c	Thu Feb 18 03:52:29 2010
@@ -3,7 +3,7 @@
  *   commands that comes across the botnet
  *   userfile transfer and update commands from sharebots
  *
- * $Id: botcmd.c,v 1.51 2010/01/04 13:15:11 pseudo Exp $
+ * $Id: botcmd.c,v 1.52 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1458,110 +1458,110 @@
  */
 botcmd_t C_bot[] =
 {
-  {"a",          (Function) bot_actchan},
+  {"a",          (IntFunc) bot_actchan},
 #ifndef NO_OLD_BOTNET
-  {"actchan",    (Function) bot_actchan},
+  {"actchan",    (IntFunc) bot_actchan},
 #endif
-  {"aw",         (Function) bot_away},
-  {"away",       (Function) bot_away},
-  {"bye",        (Function) bot_bye},
-  {"c",          (Function) bot_chan2},
+  {"aw",         (IntFunc) bot_away},
+  {"away",       (IntFunc) bot_away},
+  {"bye",        (IntFunc) bot_bye},
+  {"c",          (IntFunc) bot_chan2},
 #ifndef NO_OLD_BOTNET
-  {"chan",       (Function) bot_chan2},
-  {"chat",       (Function) bot_chat},
+  {"chan",       (IntFunc) bot_chan2},
+  {"chat",       (IntFunc) bot_chat},
 #endif
-  {"ct",         (Function) bot_chat},
-  {"e",          (Function) bot_error},
-  {"el",         (Function) bot_endlink},
+  {"ct",         (IntFunc) bot_chat},
+  {"e",          (IntFunc) bot_error},
+  {"el",         (IntFunc) bot_endlink},
 #ifndef NO_OLD_BOTNET
-  {"error",      (Function) bot_error},
+  {"error",      (IntFunc) bot_error},
 #endif
-  {"f!",         (Function) bot_filereject},
+  {"f!",         (IntFunc) bot_filereject},
 #ifndef NO_OLD_BOTNET
-  {"filereject", (Function) bot_filereject},
-  {"filereq",    (Function) bot_filereq},
-  {"filesend",   (Function) bot_filesend},
+  {"filereject", (IntFunc) bot_filereject},
+  {"filereq",    (IntFunc) bot_filereq},
+  {"filesend",   (IntFunc) bot_filesend},
 #endif
-  {"fr",         (Function) bot_filereq},
-  {"fs",         (Function) bot_filesend},
-  {"h",          (Function) bot_handshake},
+  {"fr",         (IntFunc) bot_filereq},
+  {"fs",         (IntFunc) bot_filesend},
+  {"h",          (IntFunc) bot_handshake},
 #ifndef NO_OLD_BOTNET
-  {"handshake",  (Function) bot_handshake},
+  {"handshake",  (IntFunc) bot_handshake},
 #endif
-  {"i",          (Function) bot_idle},
-  {"i?",         (Function) bot_infoq},
+  {"i",          (IntFunc) bot_idle},
+  {"i?",         (IntFunc) bot_infoq},
 #ifndef NO_OLD_BOTNET
-  {"idle",       (Function) bot_idle},
-  {"info?",      (Function) bot_infoq},
+  {"idle",       (IntFunc) bot_idle},
+  {"info?",      (IntFunc) bot_infoq},
 #endif
-  {"j",          (Function) bot_join},
+  {"j",          (IntFunc) bot_join},
 #ifndef NO_OLD_BOTNET
-  {"join",       (Function) bot_join},
+  {"join",       (IntFunc) bot_join},
 #endif
-  {"l",          (Function) bot_link},
+  {"l",          (IntFunc) bot_link},
 #ifndef NO_OLD_BOTNET
-  {"link",       (Function) bot_link},
-  {"linked",     (Function) bot_linked},
+  {"link",       (IntFunc) bot_link},
+  {"linked",     (IntFunc) bot_linked},
 #endif
-  {"m",          (Function) bot_motd},
+  {"m",          (IntFunc) bot_motd},
 #ifndef NO_OLD_BOTNET
-  {"motd",       (Function) bot_motd},
+  {"motd",       (IntFunc) bot_motd},
 #endif
-  {"n",          (Function) bot_nlinked},
-  {"nc",         (Function) bot_nickchange},
+  {"n",          (IntFunc) bot_nlinked},
+  {"nc",         (IntFunc) bot_nickchange},
 #ifndef NO_OLD_BOTNET
-  {"nlinked",    (Function) bot_nlinked},
+  {"nlinked",    (IntFunc) bot_nlinked},
 #endif
-  {"p",          (Function) bot_priv},
+  {"p",          (IntFunc) bot_priv},
 #ifndef NO_OLD_BOTNET
-  {"part",       (Function) bot_part},
+  {"part",       (IntFunc) bot_part},
 #endif
-  {"pi",         (Function) bot_ping},
+  {"pi",         (IntFunc) bot_ping},
 #ifndef NO_OLD_BOTNET
-  {"ping",       (Function) bot_ping},
+  {"ping",       (IntFunc) bot_ping},
 #endif
-  {"po",         (Function) bot_pong},
+  {"po",         (IntFunc) bot_pong},
 #ifndef NO_OLD_BOTNET
-  {"pong",       (Function) bot_pong},
-  {"priv",       (Function) bot_priv},
+  {"pong",       (IntFunc) bot_pong},
+  {"priv",       (IntFunc) bot_priv},
 #endif
-  {"pt",         (Function) bot_part},
-  {"r",          (Function) bot_reject},
+  {"pt",         (IntFunc) bot_part},
+  {"r",          (IntFunc) bot_reject},
 #ifndef NO_OLD_BOTNET
-  {"reject",     (Function) bot_reject},
+  {"reject",     (IntFunc) bot_reject},
 #endif
-  {"s",          (Function) bot_share},
-  {"t",          (Function) bot_trace},
-  {"tb",         (Function) bot_thisbot},
-  {"td",         (Function) bot_traced},
+  {"s",          (IntFunc) bot_share},
+  {"t",          (IntFunc) bot_trace},
+  {"tb",         (IntFunc) bot_thisbot},
+  {"td",         (IntFunc) bot_traced},
 #ifndef NO_OLD_BOTNET
-  {"thisbot",    (Function) bot_thisbot},
-  {"trace",      (Function) bot_trace},
-  {"traced",     (Function) bot_traced},
+  {"thisbot",    (IntFunc) bot_thisbot},
+  {"trace",      (IntFunc) bot_trace},
+  {"traced",     (IntFunc) bot_traced},
 #endif
-  {"u",          (Function) bot_update},
+  {"u",          (IntFunc) bot_update},
 #ifndef NO_OLD_BOTNET
-  {"uf-no",      (Function) bot_ufno},
+  {"uf-no",      (IntFunc) bot_ufno},
 #endif
-  {"ul",         (Function) bot_unlink},
-  {"un",         (Function) bot_unlinked},
+  {"ul",         (IntFunc) bot_unlink},
+  {"un",         (IntFunc) bot_unlinked},
 #ifndef NO_OLD_BOTNET
-  {"unaway",     (Function) bot_away},
-  {"unlink",     (Function) bot_unlink},
-  {"unlinked",   (Function) bot_unlinked},
-  {"update",     (Function) bot_update},
-  {"userfile?",  (Function) bot_old_userfile},
+  {"unaway",     (IntFunc) bot_away},
+  {"unlink",     (IntFunc) bot_unlink},
+  {"unlinked",   (IntFunc) bot_unlinked},
+  {"update",     (IntFunc) bot_update},
+  {"userfile?",  (IntFunc) bot_old_userfile},
 #endif
-  {"v",          (Function) bot_versions},
-  {"w",          (Function) bot_who},
+  {"v",          (IntFunc) bot_versions},
+  {"w",          (IntFunc) bot_who},
 #ifndef NO_OLD_BOTNET
-  {"who",        (Function) bot_who},
+  {"who",        (IntFunc) bot_who},
 #endif
-  {"z",          (Function) bot_zapf},
+  {"z",          (IntFunc) bot_zapf},
 #ifndef NO_OLD_BOTNET
-  {"zapf",       (Function) bot_zapf},
-  {"zapf-broad", (Function) bot_zapfbroad},
+  {"zapf",       (IntFunc) bot_zapf},
+  {"zapf-broad", (IntFunc) bot_zapfbroad},
 #endif
-  {"zb",         (Function) bot_zapfbroad},
+  {"zb",         (IntFunc) bot_zapfbroad},
   {NULL,         NULL}
 };
Index: eggdrop1.6/src/cmds.c
diff -u eggdrop1.6/src/cmds.c:1.124 eggdrop1.6/src/cmds.c:1.125
--- eggdrop1.6/src/cmds.c:1.124	Mon Jan  4 07:15:11 2010
+++ eggdrop1.6/src/cmds.c	Thu Feb 18 03:52:29 2010
@@ -3,7 +3,7 @@
  *   commands from a user via dcc
  *   (split in 2, this portion contains no-irc commands)
  *
- * $Id: cmds.c,v 1.124 2010/01/04 13:15:11 pseudo Exp $
+ * $Id: cmds.c,v 1.125 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -2758,73 +2758,73 @@
  * As with msg commands, function is responsible for any logging.
  */
 cmd_t C_dcc[] = {
-  {"+bot",      "t",    (Function) cmd_pls_bot,    NULL},
-  {"+host",     "t|m",  (Function) cmd_pls_host,   NULL},
-  {"+ignore",   "m",    (Function) cmd_pls_ignore, NULL},
-  {"+user",     "m",    (Function) cmd_pls_user,   NULL},
-  {"-bot",      "t",    (Function) cmd_mns_user,   NULL},
-  {"-host",     "",     (Function) cmd_mns_host,   NULL},
-  {"-ignore",   "m",    (Function) cmd_mns_ignore, NULL},
-  {"-user",     "m",    (Function) cmd_mns_user,   NULL},
-  {"addlog",    "to|o", (Function) cmd_addlog,     NULL},
-  {"away",      "",     (Function) cmd_away,       NULL},
-  {"back",      "",     (Function) cmd_back,       NULL},
-  {"backup",    "m|m",  (Function) cmd_backup,     NULL},
-  {"banner",    "t",    (Function) cmd_banner,     NULL},
-  {"binds",     "m",    (Function) cmd_binds,      NULL},
-  {"boot",      "t",    (Function) cmd_boot,       NULL},
-  {"botattr",   "t",    (Function) cmd_botattr,    NULL},
-  {"botinfo",   "",     (Function) cmd_botinfo,    NULL},
-  {"bots",      "",     (Function) cmd_bots,       NULL},
-  {"bottree",   "",     (Function) cmd_bottree,    NULL},
-  {"chaddr",    "t",    (Function) cmd_chaddr,     NULL},
-  {"chat",      "",     (Function) cmd_chat,       NULL},
-  {"chattr",    "m|m",  (Function) cmd_chattr,     NULL},
-  {"chhandle",  "t",    (Function) cmd_chhandle,   NULL},
-  {"chnick",    "t",    (Function) cmd_chhandle,   NULL},
-  {"chpass",    "t",    (Function) cmd_chpass,     NULL},
-  {"comment",   "m",    (Function) cmd_comment,    NULL},
-  {"console",   "to|o", (Function) cmd_console,    NULL},
-  {"dccstat",   "t",    (Function) cmd_dccstat,    NULL},
-  {"debug",     "m",    (Function) cmd_debug,      NULL},
-  {"die",       "n",    (Function) cmd_die,        NULL},
-  {"echo",      "",     (Function) cmd_echo,       NULL},
-  {"fixcodes",  "",     (Function) cmd_fixcodes,   NULL},
-  {"help",      "",     (Function) cmd_help,       NULL},
-  {"ignores",   "m",    (Function) cmd_ignores,    NULL},
-  {"link",      "t",    (Function) cmd_link,       NULL},
-  {"loadmod",   "n",    (Function) cmd_loadmod,    NULL},
-  {"match",     "to|o", (Function) cmd_match,      NULL},
-  {"me",        "",     (Function) cmd_me,         NULL},
-  {"module",    "m",    (Function) cmd_module,     NULL},
-  {"modules",   "n",    (Function) cmd_modules,    NULL},
-  {"motd",      "",     (Function) cmd_motd,       NULL},
-  {"newpass",   "",     (Function) cmd_newpass,    NULL},
-  {"handle",    "",     (Function) cmd_handle,     NULL},
-  {"nick",      "",     (Function) cmd_handle,     NULL},
-  {"page",      "",     (Function) cmd_page,       NULL},
-  {"quit",      "",     (Function) CMD_LEAVE,      NULL},
-  {"rehash",    "m",    (Function) cmd_rehash,     NULL},
-  {"rehelp",    "n",    (Function) cmd_rehelp,     NULL},
-  {"relay",     "o",    (Function) cmd_relay,      NULL},
-  {"reload",    "m|m",  (Function) cmd_reload,     NULL},
-  {"restart",   "m",    (Function) cmd_restart,    NULL},
-  {"save",      "m|m",  (Function) cmd_save,       NULL},
-  {"set",       "n",    (Function) cmd_set,        NULL},
-  {"simul",     "n",    (Function) cmd_simul,      NULL},
-  {"status",    "m|m",  (Function) cmd_status,     NULL},
-  {"strip",     "",     (Function) cmd_strip,      NULL},
-  {"su",        "",     (Function) cmd_su,         NULL},
-  {"tcl",       "n",    (Function) cmd_tcl,        NULL},
-  {"trace",     "t",    (Function) cmd_trace,      NULL},
-  {"unlink",    "t",    (Function) cmd_unlink,     NULL},
-  {"unloadmod", "n",    (Function) cmd_unloadmod,  NULL},
-  {"uptime",    "m|m",  (Function) cmd_uptime,     NULL},
-  {"vbottree",  "",     (Function) cmd_vbottree,   NULL},
-  {"who",       "",     (Function) cmd_who,        NULL},
-  {"whois",     "to|o", (Function) cmd_whois,      NULL},
-  {"whom",      "",     (Function) cmd_whom,       NULL},
-  {"traffic",   "m|m",  (Function) cmd_traffic,    NULL},
-  {"whoami",    "",     (Function) cmd_whoami,     NULL},
+  {"+bot",      "t",    (IntFunc) cmd_pls_bot,    NULL},
+  {"+host",     "t|m",  (IntFunc) cmd_pls_host,   NULL},
+  {"+ignore",   "m",    (IntFunc) cmd_pls_ignore, NULL},
+  {"+user",     "m",    (IntFunc) cmd_pls_user,   NULL},
+  {"-bot",      "t",    (IntFunc) cmd_mns_user,   NULL},
+  {"-host",     "",     (IntFunc) cmd_mns_host,   NULL},
+  {"-ignore",   "m",    (IntFunc) cmd_mns_ignore, NULL},
+  {"-user",     "m",    (IntFunc) cmd_mns_user,   NULL},
+  {"addlog",    "to|o", (IntFunc) cmd_addlog,     NULL},
+  {"away",      "",     (IntFunc) cmd_away,       NULL},
+  {"back",      "",     (IntFunc) cmd_back,       NULL},
+  {"backup",    "m|m",  (IntFunc) cmd_backup,     NULL},
+  {"banner",    "t",    (IntFunc) cmd_banner,     NULL},
+  {"binds",     "m",    (IntFunc) cmd_binds,      NULL},
+  {"boot",      "t",    (IntFunc) cmd_boot,       NULL},
+  {"botattr",   "t",    (IntFunc) cmd_botattr,    NULL},
+  {"botinfo",   "",     (IntFunc) cmd_botinfo,    NULL},
+  {"bots",      "",     (IntFunc) cmd_bots,       NULL},
+  {"bottree",   "",     (IntFunc) cmd_bottree,    NULL},
+  {"chaddr",    "t",    (IntFunc) cmd_chaddr,     NULL},
+  {"chat",      "",     (IntFunc) cmd_chat,       NULL},
+  {"chattr",    "m|m",  (IntFunc) cmd_chattr,     NULL},
+  {"chhandle",  "t",    (IntFunc) cmd_chhandle,   NULL},
+  {"chnick",    "t",    (IntFunc) cmd_chhandle,   NULL},
+  {"chpass",    "t",    (IntFunc) cmd_chpass,     NULL},
+  {"comment",   "m",    (IntFunc) cmd_comment,    NULL},
+  {"console",   "to|o", (IntFunc) cmd_console,    NULL},
+  {"dccstat",   "t",    (IntFunc) cmd_dccstat,    NULL},
+  {"debug",     "m",    (IntFunc) cmd_debug,      NULL},
+  {"die",       "n",    (IntFunc) cmd_die,        NULL},
+  {"echo",      "",     (IntFunc) cmd_echo,       NULL},
+  {"fixcodes",  "",     (IntFunc) cmd_fixcodes,   NULL},
+  {"help",      "",     (IntFunc) cmd_help,       NULL},
+  {"ignores",   "m",    (IntFunc) cmd_ignores,    NULL},
+  {"link",      "t",    (IntFunc) cmd_link,       NULL},
+  {"loadmod",   "n",    (IntFunc) cmd_loadmod,    NULL},
+  {"match",     "to|o", (IntFunc) cmd_match,      NULL},
+  {"me",        "",     (IntFunc) cmd_me,         NULL},
+  {"module",    "m",    (IntFunc) cmd_module,     NULL},
+  {"modules",   "n",    (IntFunc) cmd_modules,    NULL},
+  {"motd",      "",     (IntFunc) cmd_motd,       NULL},
+  {"newpass",   "",     (IntFunc) cmd_newpass,    NULL},
+  {"handle",    "",     (IntFunc) cmd_handle,     NULL},
+  {"nick",      "",     (IntFunc) cmd_handle,     NULL},
+  {"page",      "",     (IntFunc) cmd_page,       NULL},
+  {"quit",      "",     (IntFunc) CMD_LEAVE,      NULL},
+  {"rehash",    "m",    (IntFunc) cmd_rehash,     NULL},
+  {"rehelp",    "n",    (IntFunc) cmd_rehelp,     NULL},
+  {"relay",     "o",    (IntFunc) cmd_relay,      NULL},
+  {"reload",    "m|m",  (IntFunc) cmd_reload,     NULL},
+  {"restart",   "m",    (IntFunc) cmd_restart,    NULL},
+  {"save",      "m|m",  (IntFunc) cmd_save,       NULL},
+  {"set",       "n",    (IntFunc) cmd_set,        NULL},
+  {"simul",     "n",    (IntFunc) cmd_simul,      NULL},
+  {"status",    "m|m",  (IntFunc) cmd_status,     NULL},
+  {"strip",     "",     (IntFunc) cmd_strip,      NULL},
+  {"su",        "",     (IntFunc) cmd_su,         NULL},
+  {"tcl",       "n",    (IntFunc) cmd_tcl,        NULL},
+  {"trace",     "t",    (IntFunc) cmd_trace,      NULL},
+  {"unlink",    "t",    (IntFunc) cmd_unlink,     NULL},
+  {"unloadmod", "n",    (IntFunc) cmd_unloadmod,  NULL},
+  {"uptime",    "m|m",  (IntFunc) cmd_uptime,     NULL},
+  {"vbottree",  "",     (IntFunc) cmd_vbottree,   NULL},
+  {"who",       "",     (IntFunc) cmd_who,        NULL},
+  {"whois",     "to|o", (IntFunc) cmd_whois,      NULL},
+  {"whom",      "",     (IntFunc) cmd_whom,       NULL},
+  {"traffic",   "m|m",  (IntFunc) cmd_traffic,    NULL},
+  {"whoami",    "",     (IntFunc) cmd_whoami,     NULL},
   {NULL,        NULL,   NULL,                      NULL}
 };
Index: eggdrop1.6/src/cmdt.h
diff -u eggdrop1.6/src/cmdt.h:1.14 eggdrop1.6/src/cmdt.h:1.15
--- eggdrop1.6/src/cmdt.h:1.14	Sun Jan  3 07:27:31 2010
+++ eggdrop1.6/src/cmdt.h	Thu Feb 18 03:52:29 2010
@@ -2,7 +2,7 @@
  * cmdt.h
  *   stuff for builtin commands
  *
- * $Id: cmdt.h,v 1.14 2010/01/03 13:27:31 pseudo Exp $
+ * $Id: cmdt.h,v 1.15 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -29,13 +29,13 @@
 typedef struct {
   char *name;
   char *flags;
-  Function func;
+  IntFunc func;
   char *funcname;
 } cmd_t;
 
 typedef struct {
   char *name;
-  Function func;
+  IntFunc func;
 } botcmd_t;
 
 #endif /* _EGG_CMDT_H */
Index: eggdrop1.6/src/eggdrop.h
diff -u eggdrop1.6/src/eggdrop.h:1.75 eggdrop1.6/src/eggdrop.h:1.76
--- eggdrop1.6/src/eggdrop.h:1.75	Thu Feb  4 07:56:59 2010
+++ eggdrop1.6/src/eggdrop.h	Thu Feb 18 03:52:29 2010
@@ -4,7 +4,7 @@
  *
  *   IF YOU ALTER THIS FILE, YOU NEED TO RECOMPILE THE BOT.
  *
- * $Id: eggdrop.h,v 1.75 2010/02/04 13:56:59 simple Exp $
+ * $Id: eggdrop.h,v 1.76 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -327,7 +327,8 @@
 /***********************************************************************/
 
 /* It's used in so many places, let's put it here */
-typedef int (*Function) ();
+typedef intptr_t (*Function) ();
+typedef int (*IntFunc) ();
 
 /* Public structure for the listening port map */
 struct portmap {
Index: eggdrop1.6/src/flags.h
diff -u eggdrop1.6/src/flags.h:1.19 eggdrop1.6/src/flags.h:1.20
--- eggdrop1.6/src/flags.h:1.19	Sun Jan  3 07:27:32 2010
+++ eggdrop1.6/src/flags.h	Thu Feb 18 03:52:29 2010
@@ -1,7 +1,7 @@
 /*
  * flags.h
  *
- * $Id: flags.h,v 1.19 2010/01/03 13:27:32 pseudo Exp $
+ * $Id: flags.h,v 1.20 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -29,7 +29,7 @@
   int match;
   int global;
   int udef_global;
-  int bot;
+  intptr_t bot;
   int chan;
   int udef_chan;
 };
Index: eggdrop1.6/src/main.h
diff -u eggdrop1.6/src/main.h:1.39 eggdrop1.6/src/main.h:1.40
--- eggdrop1.6/src/main.h:1.39	Sun Jan  3 07:27:32 2010
+++ eggdrop1.6/src/main.h	Thu Feb 18 03:52:29 2010
@@ -2,7 +2,7 @@
  * main.h
  *   include file to include most other include files
  *
- * $Id: main.h,v 1.39 2010/01/03 13:27:32 pseudo Exp $
+ * $Id: main.h,v 1.40 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -83,6 +83,10 @@
 #  include <strings.h>
 #endif
 
+#ifdef HAVE_INTTYPES_H
+#  include <inttypes.h>
+#endif
+
 #include <sys/types.h>
 #include "lush.h"
 #include "lang.h"
Index: eggdrop1.6/src/mod/assoc.mod/assoc.c
diff -u eggdrop1.6/src/mod/assoc.mod/assoc.c:1.35 eggdrop1.6/src/mod/assoc.mod/assoc.c:1.36
--- eggdrop1.6/src/mod/assoc.mod/assoc.c:1.35	Sun Jan  3 07:27:40 2010
+++ eggdrop1.6/src/mod/assoc.mod/assoc.c	Thu Feb 18 03:52:29 2010
@@ -2,7 +2,7 @@
  * assoc.c -- part of assoc.mod
  *   the assoc code, moved here mainly from botnet.c for module work
  *
- * $Id: assoc.c,v 1.35 2010/01/03 13:27:40 pseudo Exp $
+ * $Id: assoc.c,v 1.36 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -326,7 +326,7 @@
       nick = newsplit(&par);
       s1 = get_assoc_name(chan);
       if (linking && ((s1 == NULL) || (s1[0] == 0) ||
-          (((int) get_user(find_entry_type("BOTFL"),
+          (((intptr_t) get_user(find_entry_type("BOTFL"),
           dcc[idx].user) & BOT_HUB)))) {
         add_assoc(par, chan);
         botnet_send_assoc(idx, chan, nick, par);
@@ -368,12 +368,12 @@
 };
 
 static cmd_t mybot[] = {
-  {"assoc", "",   (Function) zapf_assoc, NULL},
+  {"assoc", "",   (IntFunc) zapf_assoc, NULL},
   {NULL,    NULL, NULL,                  NULL}
 };
 
 static cmd_t mylink[] = {
-  {"*",  "",   (Function) link_assoc, "assoc"},
+  {"*",  "",   (IntFunc) link_assoc, "assoc"},
   {NULL, NULL, NULL,                     NULL}
 };
 
Index: eggdrop1.6/src/mod/channels.mod/channels.c
diff -u eggdrop1.6/src/mod/channels.mod/channels.c:1.103 eggdrop1.6/src/mod/channels.mod/channels.c:1.104
--- eggdrop1.6/src/mod/channels.mod/channels.c:1.103	Sat Feb  6 03:20:12 2010
+++ eggdrop1.6/src/mod/channels.mod/channels.c	Thu Feb 18 03:52:29 2010
@@ -2,7 +2,7 @@
  * channels.c -- part of channels.mod
  *   support for channels within the bot
  *
- * $Id: channels.c,v 1.103 2010/02/06 09:20:12 pseudo Exp $
+ * $Id: channels.c,v 1.104 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -461,11 +461,11 @@
     for (ul = udef; ul; ul = ul->next) {
       if (ul->defined && ul->name) {
         if (ul->type == UDEF_FLAG)
-          fprintf(f, "channel set %s %c%s%s\n", name, getudef(ul->values, chan->dname) ? '+' : '-',
-                  "udef-flag-", ul->name);
+          fprintf(f, "channel set %s %c%s%s\n", name, getudef(ul->values,
+                  chan->dname) ? '+' : '-', "udef-flag-", ul->name);
         else if (ul->type == UDEF_INT)
-          fprintf(f, "channel set %s %s%s %d\n", name, "udef-int-", ul->name, getudef(ul->values,
-                  chan->dname));
+          fprintf(f, "channel set %s %s%s %d\n", name, "udef-int-", ul->name,
+                  (int) getudef(ul->values, chan->dname));
         else if (ul->type == UDEF_STR) {
           char *p = (char *) getudef(ul->values, chan->dname);
 
@@ -565,7 +565,7 @@
 }
 
 static cmd_t my_chon[] = {
-  {"*",  "",   (Function) channels_chon, "channels:chon"},
+  {"*",  "",   (IntFunc) channels_chon, "channels:chon"},
   {NULL, NULL, NULL,                                NULL}
 };
 
Index: eggdrop1.6/src/mod/channels.mod/channels.h
diff -u eggdrop1.6/src/mod/channels.mod/channels.h:1.31 eggdrop1.6/src/mod/channels.mod/channels.h:1.32
--- eggdrop1.6/src/mod/channels.mod/channels.h:1.31	Sun Jan  3 07:27:40 2010
+++ eggdrop1.6/src/mod/channels.mod/channels.h	Thu Feb 18 03:52:29 2010
@@ -1,7 +1,7 @@
 /*
  * channels.h -- part of channels.mod
  *
- * $Id: channels.h,v 1.31 2010/01/03 13:27:40 pseudo Exp $
+ * $Id: channels.h,v 1.32 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -50,7 +50,7 @@
 struct udef_chans {
   struct udef_chans *next;     /* Ptr to next value.                   */
   char *chan;                  /* Dname of channel name.               */
-  int value;                   /* Actual value.                        */
+  intptr_t value;              /* Actual value.                        */
 };
 
 /* Structure for user defined channel settings.
@@ -113,11 +113,11 @@
 static int expmem_udef_chans (int, struct udef_chans *);
 static void free_udef(struct udef_struct *);
 static void free_udef_chans(struct udef_chans *, int);
-static int getudef(struct udef_chans *, char *);
+static intptr_t getudef(struct udef_chans *, char *);
 static void initudef(int type, char *, int);
-static void setudef(struct udef_struct *, char *, int);
+static void setudef(struct udef_struct *, char *, intptr_t);
 static void remove_channel(struct chanset_t *);
-static int ngetudef(char *, char *);
+static intptr_t ngetudef(char *, char *);
 static int expired_mask(struct chanset_t *chan, char *who);
 inline static int chanset_unlink(struct chanset_t *chan);
 
Index: eggdrop1.6/src/mod/channels.mod/cmdschan.c
diff -u eggdrop1.6/src/mod/channels.mod/cmdschan.c:1.79 eggdrop1.6/src/mod/channels.mod/cmdschan.c:1.80
--- eggdrop1.6/src/mod/channels.mod/cmdschan.c:1.79	Thu Jan  7 07:48:31 2010
+++ eggdrop1.6/src/mod/channels.mod/cmdschan.c	Thu Feb 18 03:52:29 2010
@@ -2,7 +2,7 @@
  * cmdschan.c -- part of channels.mod
  *   commands from a user via dcc that cause server interaction
  *
- * $Id: cmdschan.c,v 1.79 2010/01/07 13:48:31 pseudo Exp $
+ * $Id: cmdschan.c,v 1.80 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1577,26 +1577,26 @@
  * NOTE: As with msg commands, the function is responsible for any logging.
  */
 static cmd_t C_dcc_irc[] = {
-  {"+ban",     "ol|ol", (Function) cmd_pls_ban,    NULL},
-  {"+exempt",  "ol|ol", (Function) cmd_pls_exempt, NULL},
-  {"+invite",  "ol|ol", (Function) cmd_pls_invite, NULL},
-  {"+chan",    "n",     (Function) cmd_pls_chan,   NULL},
-  {"+chrec",   "m|m",   (Function) cmd_pls_chrec,  NULL},
-  {"-ban",     "ol|ol", (Function) cmd_mns_ban,    NULL},
-  {"-chan",    "n",     (Function) cmd_mns_chan,   NULL},
-  {"-chrec",   "m|m",   (Function) cmd_mns_chrec,  NULL},
-  {"bans",     "ol|ol", (Function) cmd_bans,       NULL},
-  {"-exempt",  "ol|ol", (Function) cmd_mns_exempt, NULL},
-  {"-invite",  "ol|ol", (Function) cmd_mns_invite, NULL},
-  {"exempts",  "ol|ol", (Function) cmd_exempts,    NULL},
-  {"invites",  "ol|ol", (Function) cmd_invites,    NULL},
-  {"chaninfo", "m|m",   (Function) cmd_chaninfo,   NULL},
-  {"chanload", "n|n",   (Function) cmd_chanload,   NULL},
-  {"chanset",  "n|n",   (Function) cmd_chanset,    NULL},
-  {"chansave", "n|n",   (Function) cmd_chansave,   NULL},
-  {"chinfo",   "m|m",   (Function) cmd_chinfo,     NULL},
-  {"info",     "",      (Function) cmd_info,       NULL},
-  {"stick",    "ol|ol", (Function) cmd_stick,      NULL},
-  {"unstick",  "ol|ol", (Function) cmd_unstick,    NULL},
+  {"+ban",     "ol|ol", (IntFunc) cmd_pls_ban,    NULL},
+  {"+exempt",  "ol|ol", (IntFunc) cmd_pls_exempt, NULL},
+  {"+invite",  "ol|ol", (IntFunc) cmd_pls_invite, NULL},
+  {"+chan",    "n",     (IntFunc) cmd_pls_chan,   NULL},
+  {"+chrec",   "m|m",   (IntFunc) cmd_pls_chrec,  NULL},
+  {"-ban",     "ol|ol", (IntFunc) cmd_mns_ban,    NULL},
+  {"-chan",    "n",     (IntFunc) cmd_mns_chan,   NULL},
+  {"-chrec",   "m|m",   (IntFunc) cmd_mns_chrec,  NULL},
+  {"bans",     "ol|ol", (IntFunc) cmd_bans,       NULL},
+  {"-exempt",  "ol|ol", (IntFunc) cmd_mns_exempt, NULL},
+  {"-invite",  "ol|ol", (IntFunc) cmd_mns_invite, NULL},
+  {"exempts",  "ol|ol", (IntFunc) cmd_exempts,    NULL},
+  {"invites",  "ol|ol", (IntFunc) cmd_invites,    NULL},
+  {"chaninfo", "m|m",   (IntFunc) cmd_chaninfo,   NULL},
+  {"chanload", "n|n",   (IntFunc) cmd_chanload,   NULL},
+  {"chanset",  "n|n",   (IntFunc) cmd_chanset,    NULL},
+  {"chansave", "n|n",   (IntFunc) cmd_chansave,   NULL},
+  {"chinfo",   "m|m",   (IntFunc) cmd_chinfo,     NULL},
+  {"info",     "",      (IntFunc) cmd_info,       NULL},
+  {"stick",    "ol|ol", (IntFunc) cmd_stick,      NULL},
+  {"unstick",  "ol|ol", (IntFunc) cmd_unstick,    NULL},
   {NULL,       NULL,    NULL,                      NULL}
 };
Index: eggdrop1.6/src/mod/channels.mod/tclchan.c
diff -u eggdrop1.6/src/mod/channels.mod/tclchan.c:1.103 eggdrop1.6/src/mod/channels.mod/tclchan.c:1.104
--- eggdrop1.6/src/mod/channels.mod/tclchan.c:1.103	Sun Feb  7 11:21:14 2010
+++ eggdrop1.6/src/mod/channels.mod/tclchan.c	Thu Feb 18 03:52:29 2010
@@ -1,7 +1,7 @@
 /*
  * tclchan.c -- part of channels.mod
  *
- * $Id: tclchan.c,v 1.103 2010/02/07 17:21:14 pseudo Exp $
+ * $Id: tclchan.c,v 1.104 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1454,7 +1454,7 @@
           val = nmalloc(3 * strlen(item[i]) + 10);
           convert_element(item[i], val);
           val = nrealloc(val, strlen(val) + 1);
-          setudef(ul, chan->dname, (int) val);
+          setudef(ul, chan->dname, (intptr_t) val);
           found = 1;
           break;
         }
Index: eggdrop1.6/src/mod/channels.mod/udefchan.c
diff -u eggdrop1.6/src/mod/channels.mod/udefchan.c:1.15 eggdrop1.6/src/mod/channels.mod/udefchan.c:1.16
--- eggdrop1.6/src/mod/channels.mod/udefchan.c:1.15	Sun Jan  3 07:27:41 2010
+++ eggdrop1.6/src/mod/channels.mod/udefchan.c	Thu Feb 18 03:52:29 2010
@@ -2,7 +2,7 @@
  * udefchan.c -- part of channels.mod
  *   user definable channel flags/settings
  *
- * $Id: udefchan.c,v 1.15 2010/01/03 13:27:41 pseudo Exp $
+ * $Id: udefchan.c,v 1.16 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1999 - 2010 Eggheads Development Team
@@ -47,7 +47,7 @@
   return i;
 }
 
-static int getudef(struct udef_chans *ul, char *name)
+static intptr_t getudef(struct udef_chans *ul, char *name)
 {
   int val = 0;
 
@@ -59,7 +59,7 @@
   return val;
 }
 
-static int ngetudef(char *name, char *chan)
+static intptr_t ngetudef(char *name, char *chan)
 {
   struct udef_struct *l;
   struct udef_chans *ll;
@@ -74,7 +74,7 @@
   return 0;
 }
 
-static void setudef(struct udef_struct *us, char *name, int value)
+static void setudef(struct udef_struct *us, char *name, intptr_t value)
 {
   struct udef_chans *ul, *ul_last = NULL;
 
Index: eggdrop1.6/src/mod/filesys.mod/files.c
diff -u eggdrop1.6/src/mod/filesys.mod/files.c:1.55 eggdrop1.6/src/mod/filesys.mod/files.c:1.56
--- eggdrop1.6/src/mod/filesys.mod/files.c:1.55	Sun Jan  3 07:27:42 2010
+++ eggdrop1.6/src/mod/filesys.mod/files.c	Thu Feb 18 03:52:29 2010
@@ -2,7 +2,7 @@
  * files.c - part of filesys.mod
  *   handles all file system commands
  *
- * $Id: files.c,v 1.55 2010/01/03 13:27:42 pseudo Exp $
+ * $Id: files.c,v 1.56 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1349,37 +1349,37 @@
 }
 
 static cmd_t myfiles[] = {
-  {"cancel",    "",   (Function) cmd_cancel,    NULL},
-  {"cd",        "",   (Function) cmd_chdir,     NULL},
-  {"chdir",     "",   (Function) cmd_chdir,     NULL},
-  {"cp",        "j",  (Function) cmd_cp,        NULL},
-  {"desc",      "",   (Function) cmd_desc,      NULL},
-  {"filestats", "j",  (Function) cmd_filestats, NULL},
-  {"get",       "",   (Function) cmd_get,       NULL},
-  {"reget",     "",   (Function) cmd_reget,     NULL},
-  {"help",      "",   (Function) cmd_file_help, NULL},
-  {"hide",      "j",  (Function) cmd_hide,      NULL},
-  {"ln",        "j",  (Function) cmd_ln,        NULL},
-  {"ls",        "",   (Function) cmd_ls,        NULL},
-  {"lsa",       "j",  (Function) cmd_lsa,       NULL},
-  {"mkdir",     "j",  (Function) cmd_mkdir,     NULL},
-  {"mv",        "j",  (Function) cmd_mv,        NULL},
-  {"note",      "",   (Function) filesys_note,  NULL},
-  {"pending",   "",   (Function) cmd_pending,   NULL},
-  {"pwd",       "",   (Function) cmd_pwd,       NULL},
-  {"quit",      "",   (Function) CMD_LEAVE,     NULL},
-  {"rm",        "j",  (Function) cmd_rm,        NULL},
-  {"rmdir",     "j",  (Function) cmd_rmdir,     NULL},
-  {"share",     "j",  (Function) cmd_share,     NULL},
+  {"cancel",    "",   (IntFunc) cmd_cancel,    NULL},
+  {"cd",        "",   (IntFunc) cmd_chdir,     NULL},
+  {"chdir",     "",   (IntFunc) cmd_chdir,     NULL},
+  {"cp",        "j",  (IntFunc) cmd_cp,        NULL},
+  {"desc",      "",   (IntFunc) cmd_desc,      NULL},
+  {"filestats", "j",  (IntFunc) cmd_filestats, NULL},
+  {"get",       "",   (IntFunc) cmd_get,       NULL},
+  {"reget",     "",   (IntFunc) cmd_reget,     NULL},
+  {"help",      "",   (IntFunc) cmd_file_help, NULL},
+  {"hide",      "j",  (IntFunc) cmd_hide,      NULL},
+  {"ln",        "j",  (IntFunc) cmd_ln,        NULL},
+  {"ls",        "",   (IntFunc) cmd_ls,        NULL},
+  {"lsa",       "j",  (IntFunc) cmd_lsa,       NULL},
+  {"mkdir",     "j",  (IntFunc) cmd_mkdir,     NULL},
+  {"mv",        "j",  (IntFunc) cmd_mv,        NULL},
+  {"note",      "",   (IntFunc) filesys_note,  NULL},
+  {"pending",   "",   (IntFunc) cmd_pending,   NULL},
+  {"pwd",       "",   (IntFunc) cmd_pwd,       NULL},
+  {"quit",      "",   (IntFunc) CMD_LEAVE,     NULL},
+  {"rm",        "j",  (IntFunc) cmd_rm,        NULL},
+  {"rmdir",     "j",  (IntFunc) cmd_rmdir,     NULL},
+  {"share",     "j",  (IntFunc) cmd_share,     NULL},
 /* Since we have spelt optimize wrong for so many years, we will
  * keep the old spelling around for the command name for now to
  * avoid problems with people typing .optimise and wondering
  * where it went (guppy:28Nov2001) */
-  {"optimise",  "j",  (Function) cmd_optimize,  NULL},
-  {"optimize",  "j",  (Function) cmd_optimize,  NULL},
-  {"stats",     "",   (Function) cmd_stats,     NULL},
-  {"unhide",    "j",  (Function) cmd_unhide,    NULL},
-  {"unshare",   "j",  (Function) cmd_unshare,   NULL},
+  {"optimise",  "j",  (IntFunc) cmd_optimize,  NULL},
+  {"optimize",  "j",  (IntFunc) cmd_optimize,  NULL},
+  {"stats",     "",   (IntFunc) cmd_stats,     NULL},
+  {"unhide",    "j",  (IntFunc) cmd_unhide,    NULL},
+  {"unshare",   "j",  (IntFunc) cmd_unshare,   NULL},
   {NULL,        NULL, NULL,                     NULL}
 };
 
Index: eggdrop1.6/src/mod/filesys.mod/filesys.c
diff -u eggdrop1.6/src/mod/filesys.mod/filesys.c:1.76 eggdrop1.6/src/mod/filesys.mod/filesys.c:1.77
--- eggdrop1.6/src/mod/filesys.mod/filesys.c:1.76	Sun Jan  3 07:27:42 2010
+++ eggdrop1.6/src/mod/filesys.mod/filesys.c	Thu Feb 18 03:52:29 2010
@@ -2,7 +2,7 @@
  * filesys.c -- part of filesys.mod
  *   main file of the filesys eggdrop module
  *
- * $Id: filesys.c,v 1.76 2010/01/03 13:27:42 pseudo Exp $
+ * $Id: filesys.c,v 1.77 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -914,7 +914,7 @@
 }
 
 static cmd_t myload[] = {
-  {"server", "",   (Function) init_server_ctcps, "filesys:server"},
+  {"server", "",   (IntFunc) init_server_ctcps, "filesys:server"},
   {NULL,     NULL, NULL,                                     NULL}
 };
 
Index: eggdrop1.6/src/mod/irc.mod/chan.c
diff -u eggdrop1.6/src/mod/irc.mod/chan.c:1.133 eggdrop1.6/src/mod/irc.mod/chan.c:1.134
--- eggdrop1.6/src/mod/irc.mod/chan.c:1.133	Thu Jan  7 07:48:31 2010
+++ eggdrop1.6/src/mod/irc.mod/chan.c	Thu Feb 18 03:52:29 2010
@@ -6,7 +6,7 @@
  *   user kickban, kick, op, deop
  *   idle kicking
  *
- * $Id: chan.c,v 1.133 2010/01/07 13:48:31 pseudo Exp $
+ * $Id: chan.c,v 1.134 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -2550,33 +2550,33 @@
 }
 
 static cmd_t irc_raw[] = {
-  {"324",     "",   (Function) got324,       "irc:324"},
-  {"352",     "",   (Function) got352,       "irc:352"},
-  {"354",     "",   (Function) got354,       "irc:354"},
-  {"315",     "",   (Function) got315,       "irc:315"},
-  {"367",     "",   (Function) got367,       "irc:367"},
-  {"368",     "",   (Function) got368,       "irc:368"},
-  {"403",     "",   (Function) got403,       "irc:403"},
-  {"405",     "",   (Function) got405,       "irc:405"},
-  {"471",     "",   (Function) got471,       "irc:471"},
-  {"473",     "",   (Function) got473,       "irc:473"},
-  {"474",     "",   (Function) got474,       "irc:474"},
-  {"475",     "",   (Function) got475,       "irc:475"},
-  {"INVITE",  "",   (Function) gotinvite, "irc:invite"},
-  {"TOPIC",   "",   (Function) gottopic,   "irc:topic"},
-  {"331",     "",   (Function) got331,       "irc:331"},
-  {"332",     "",   (Function) got332,       "irc:332"},
-  {"JOIN",    "",   (Function) gotjoin,     "irc:join"},
-  {"PART",    "",   (Function) gotpart,     "irc:part"},
-  {"KICK",    "",   (Function) gotkick,     "irc:kick"},
-  {"NICK",    "",   (Function) gotnick,     "irc:nick"},
-  {"QUIT",    "",   (Function) gotquit,     "irc:quit"},
-  {"PRIVMSG", "",   (Function) gotmsg,       "irc:msg"},
-  {"NOTICE",  "",   (Function) gotnotice, "irc:notice"},
-  {"MODE",    "",   (Function) gotmode,     "irc:mode"},
-  {"346",     "",   (Function) got346,       "irc:346"},
-  {"347",     "",   (Function) got347,       "irc:347"},
-  {"348",     "",   (Function) got348,       "irc:348"},
-  {"349",     "",   (Function) got349,       "irc:349"},
+  {"324",     "",   (IntFunc) got324,       "irc:324"},
+  {"352",     "",   (IntFunc) got352,       "irc:352"},
+  {"354",     "",   (IntFunc) got354,       "irc:354"},
+  {"315",     "",   (IntFunc) got315,       "irc:315"},
+  {"367",     "",   (IntFunc) got367,       "irc:367"},
+  {"368",     "",   (IntFunc) got368,       "irc:368"},
+  {"403",     "",   (IntFunc) got403,       "irc:403"},
+  {"405",     "",   (IntFunc) got405,       "irc:405"},
+  {"471",     "",   (IntFunc) got471,       "irc:471"},
+  {"473",     "",   (IntFunc) got473,       "irc:473"},
+  {"474",     "",   (IntFunc) got474,       "irc:474"},
+  {"475",     "",   (IntFunc) got475,       "irc:475"},
+  {"INVITE",  "",   (IntFunc) gotinvite, "irc:invite"},
+  {"TOPIC",   "",   (IntFunc) gottopic,   "irc:topic"},
+  {"331",     "",   (IntFunc) got331,       "irc:331"},
+  {"332",     "",   (IntFunc) got332,       "irc:332"},
+  {"JOIN",    "",   (IntFunc) gotjoin,     "irc:join"},
+  {"PART",    "",   (IntFunc) gotpart,     "irc:part"},
+  {"KICK",    "",   (IntFunc) gotkick,     "irc:kick"},
+  {"NICK",    "",   (IntFunc) gotnick,     "irc:nick"},
+  {"QUIT",    "",   (IntFunc) gotquit,     "irc:quit"},
+  {"PRIVMSG", "",   (IntFunc) gotmsg,       "irc:msg"},
+  {"NOTICE",  "",   (IntFunc) gotnotice, "irc:notice"},
+  {"MODE",    "",   (IntFunc) gotmode,     "irc:mode"},
+  {"346",     "",   (IntFunc) got346,       "irc:346"},
+  {"347",     "",   (IntFunc) got347,       "irc:347"},
+  {"348",     "",   (IntFunc) got348,       "irc:348"},
+  {"349",     "",   (IntFunc) got349,       "irc:349"},
   {NULL,      NULL, NULL,                         NULL}
 };
Index: eggdrop1.6/src/mod/irc.mod/cmdsirc.c
diff -u eggdrop1.6/src/mod/irc.mod/cmdsirc.c:1.65 eggdrop1.6/src/mod/irc.mod/cmdsirc.c:1.66
--- eggdrop1.6/src/mod/irc.mod/cmdsirc.c:1.65	Mon Jan  4 07:15:11 2010
+++ eggdrop1.6/src/mod/irc.mod/cmdsirc.c	Thu Feb 18 03:52:29 2010
@@ -2,7 +2,7 @@
  * chancmds.c -- part of irc.mod
  *   handles commands directly relating to channel interaction
  *
- * $Id: cmdsirc.c,v 1.65 2010/01/04 13:15:11 pseudo Exp $
+ * $Id: cmdsirc.c,v 1.66 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1159,25 +1159,25 @@
 }
 
 static cmd_t irc_dcc[] = {
-  {"adduser",      "m|m",   (Function) cmd_adduser,      NULL},
-  {"deluser",      "m|m",   (Function) cmd_deluser,      NULL},
-  {"reset",        "m|m",   (Function) cmd_reset,        NULL},
-  {"resetbans",    "o|o",   (Function) cmd_resetbans,    NULL},
-  {"resetexempts", "o|o",   (Function) cmd_resetexempts, NULL},
-  {"resetinvites", "o|o",   (Function) cmd_resetinvites, NULL},
-  {"act",          "o|o",   (Function) cmd_act,          NULL},
-  {"channel",      "o|o",   (Function) cmd_channel,      NULL},
-  {"op",           "o|o",   (Function) cmd_op,           NULL},
-  {"deop",         "o|o",   (Function) cmd_deop,         NULL},
-  {"halfop",       "ol|ol", (Function) cmd_halfop,       NULL},
-  {"dehalfop",     "ol|ol", (Function) cmd_dehalfop,     NULL},
-  {"voice",        "ov|ov", (Function) cmd_voice,        NULL},
-  {"devoice",      "ov|ov", (Function) cmd_devoice,      NULL},
-  {"invite",       "o|o",   (Function) cmd_invite,       NULL},
-  {"kick",         "lo|lo", (Function) cmd_kick,         NULL},
-  {"kickban",      "lo|lo", (Function) cmd_kickban,      NULL},
-  {"msg",          "o",     (Function) cmd_msg,          NULL},
-  {"say",          "o|o",   (Function) cmd_say,          NULL},
-  {"topic",        "lo|lo", (Function) cmd_topic,        NULL},
+  {"adduser",      "m|m",   (IntFunc) cmd_adduser,      NULL},
+  {"deluser",      "m|m",   (IntFunc) cmd_deluser,      NULL},
+  {"reset",        "m|m",   (IntFunc) cmd_reset,        NULL},
+  {"resetbans",    "o|o",   (IntFunc) cmd_resetbans,    NULL},
+  {"resetexempts", "o|o",   (IntFunc) cmd_resetexempts, NULL},
+  {"resetinvites", "o|o",   (IntFunc) cmd_resetinvites, NULL},
+  {"act",          "o|o",   (IntFunc) cmd_act,          NULL},
+  {"channel",      "o|o",   (IntFunc) cmd_channel,      NULL},
+  {"op",           "o|o",   (IntFunc) cmd_op,           NULL},
+  {"deop",         "o|o",   (IntFunc) cmd_deop,         NULL},
+  {"halfop",       "ol|ol", (IntFunc) cmd_halfop,       NULL},
+  {"dehalfop",     "ol|ol", (IntFunc) cmd_dehalfop,     NULL},
+  {"voice",        "ov|ov", (IntFunc) cmd_voice,        NULL},
+  {"devoice",      "ov|ov", (IntFunc) cmd_devoice,      NULL},
+  {"invite",       "o|o",   (IntFunc) cmd_invite,       NULL},
+  {"kick",         "lo|lo", (IntFunc) cmd_kick,         NULL},
+  {"kickban",      "lo|lo", (IntFunc) cmd_kickban,      NULL},
+  {"msg",          "o",     (IntFunc) cmd_msg,          NULL},
+  {"say",          "o|o",   (IntFunc) cmd_say,          NULL},
+  {"topic",        "lo|lo", (IntFunc) cmd_topic,        NULL},
   {NULL,           NULL,    NULL,                        NULL}
 };
Index: eggdrop1.6/src/mod/irc.mod/irc.c
diff -u eggdrop1.6/src/mod/irc.mod/irc.c:1.118 eggdrop1.6/src/mod/irc.mod/irc.c:1.119
--- eggdrop1.6/src/mod/irc.mod/irc.c:1.118	Sat Feb  6 03:20:12 2010
+++ eggdrop1.6/src/mod/irc.mod/irc.c	Thu Feb 18 03:52:29 2010
@@ -2,7 +2,7 @@
  * irc.c -- part of irc.mod
  *   support for channels within the bot
  *
- * $Id: irc.c,v 1.118 2010/02/06 09:20:12 pseudo Exp $
+ * $Id: irc.c,v 1.119 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -718,7 +718,7 @@
   BADARGS(7, 7, " nick user at host handle desto/chan keyword/nick text");
 
   CHECKVALIDITY(channels_6char);
-  sprintf(x, "%d", F(argv[1], argv[2], argv[3], argv[4], argv[5], argv[6]));
+  sprintf(x, "%d", (int) F(argv[1], argv[2], argv[3], argv[4], argv[5], argv[6]));
   Tcl_AppendResult(irp, x, NULL);
   return TCL_OK;
 }
@@ -1100,7 +1100,7 @@
     break;
   }
   /* Update all rfc_ function pointers */
-  add_hook(HOOK_RFC_CASECMP, (Function) rfc_compliant);
+  add_hook(HOOK_RFC_CASECMP, (Function) (intptr_t) rfc_compliant);
 }
 
 static char *traced_nettype(ClientData cdata, Tcl_Interp *irp,
@@ -1119,7 +1119,7 @@
    * links to point to the rfc compliant versions if rfc_compliant
    * is 1, or to the normal version if it's 0.
    */
-  add_hook(HOOK_RFC_CASECMP, (Function) rfc_compliant);
+  add_hook(HOOK_RFC_CASECMP, (Function) (intptr_t) rfc_compliant);
   return NULL;
 }
 
Index: eggdrop1.6/src/mod/irc.mod/msgcmds.c
diff -u eggdrop1.6/src/mod/irc.mod/msgcmds.c:1.57 eggdrop1.6/src/mod/irc.mod/msgcmds.c:1.58
--- eggdrop1.6/src/mod/irc.mod/msgcmds.c:1.57	Sun Jan  3 07:27:55 2010
+++ eggdrop1.6/src/mod/irc.mod/msgcmds.c	Thu Feb 18 03:52:29 2010
@@ -2,7 +2,7 @@
  * msgcmds.c -- part of irc.mod
  *   all commands entered via /MSG
  *
- * $Id: msgcmds.c,v 1.57 2010/01/03 13:27:55 pseudo Exp $
+ * $Id: msgcmds.c,v 1.58 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1117,26 +1117,26 @@
  * 0 if not.
  */
 static cmd_t C_msg[] = {
-  {"addhost", "",    (Function) msg_addhost, NULL},
-  {"die",     "n",   (Function) msg_die,     NULL},
-  {"go",      "",    (Function) msg_go,      NULL},
-  {"hello",   "",    (Function) msg_hello,   NULL},
-  {"help",    "",    (Function) msg_help,    NULL},
-  {"ident",   "",    (Function) msg_ident,   NULL},
-  {"info",    "",    (Function) msg_info,    NULL},
-  {"invite",  "o|o", (Function) msg_invite,  NULL},
-  {"jump",    "m",   (Function) msg_jump,    NULL},
-  {"key",     "o|o", (Function) msg_key,     NULL},
-  {"memory",  "m",   (Function) msg_memory,  NULL},
-  {"op",      "",    (Function) msg_op,      NULL},
-  {"halfop",  "",    (Function) msg_halfop,  NULL},
-  {"pass",    "",    (Function) msg_pass,    NULL},
-  {"rehash",  "m",   (Function) msg_rehash,  NULL},
-  {"reset",   "m",   (Function) msg_reset,   NULL},
-  {"save",    "m",   (Function) msg_save,    NULL},
-  {"status",  "m|m", (Function) msg_status,  NULL},
-  {"voice",   "",    (Function) msg_voice,   NULL},
-  {"who",     "",    (Function) msg_who,     NULL},
-  {"whois",   "",    (Function) msg_whois,   NULL},
+  {"addhost", "",    (IntFunc) msg_addhost, NULL},
+  {"die",     "n",   (IntFunc) msg_die,     NULL},
+  {"go",      "",    (IntFunc) msg_go,      NULL},
+  {"hello",   "",    (IntFunc) msg_hello,   NULL},
+  {"help",    "",    (IntFunc) msg_help,    NULL},
+  {"ident",   "",    (IntFunc) msg_ident,   NULL},
+  {"info",    "",    (IntFunc) msg_info,    NULL},
+  {"invite",  "o|o", (IntFunc) msg_invite,  NULL},
+  {"jump",    "m",   (IntFunc) msg_jump,    NULL},
+  {"key",     "o|o", (IntFunc) msg_key,     NULL},
+  {"memory",  "m",   (IntFunc) msg_memory,  NULL},
+  {"op",      "",    (IntFunc) msg_op,      NULL},
+  {"halfop",  "",    (IntFunc) msg_halfop,  NULL},
+  {"pass",    "",    (IntFunc) msg_pass,    NULL},
+  {"rehash",  "m",   (IntFunc) msg_rehash,  NULL},
+  {"reset",   "m",   (IntFunc) msg_reset,   NULL},
+  {"save",    "m",   (IntFunc) msg_save,    NULL},
+  {"status",  "m|m", (IntFunc) msg_status,  NULL},
+  {"voice",   "",    (IntFunc) msg_voice,   NULL},
+  {"who",     "",    (IntFunc) msg_who,     NULL},
+  {"whois",   "",    (IntFunc) msg_whois,   NULL},
   {NULL,      NULL,  NULL,                   NULL}
 };
Index: eggdrop1.6/src/mod/module.h
diff -u eggdrop1.6/src/mod/module.h:1.92 eggdrop1.6/src/mod/module.h:1.93
--- eggdrop1.6/src/mod/module.h:1.92	Sun Feb  7 11:21:14 2010
+++ eggdrop1.6/src/mod/module.h	Thu Feb 18 03:52:29 2010
@@ -1,7 +1,7 @@
 /*
  * module.h
  *
- * $Id: module.h,v 1.92 2010/02/07 17:21:14 pseudo Exp $
+ * $Id: module.h,v 1.93 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -107,7 +107,7 @@
 #define module_depend ((Function *(*)(char *,char *,int,int))global[6])
 #define module_undepend ((int(*)(char *))global[7])
 /* 8 - 11 */
-#define add_bind_table ((p_tcl_bind_list(*)(const char *,int,Function))global[8])
+#define add_bind_table ((p_tcl_bind_list(*)(const char *,int,IntFunc))global[8])
 #define del_bind_table ((void (*) (p_tcl_bind_list))global[9])
 #define find_bind_table ((p_tcl_bind_list(*)(const char *))global[10])
 #define check_tcl_bind ((int (*) (p_tcl_bind_list,const char *,struct flag_record *,const char *, int))global[11])
@@ -187,7 +187,7 @@
 #define chatout (global[70])
 #define chanout_but ((void(*)())global[71])
 /* 72 - 75 */
-#define check_validity ((int (*) (char *,Function))global[72])
+#define check_validity ((int (*) (char *,IntFunc))global[72])
 #define egg_list_delete ((int (*)( struct list_type **, struct list_type *))global[73])
 #define egg_list_append ((int (*) ( struct list_type **, struct list_type *))global[74])
 #define egg_list_contains ((int (*) (struct list_type *, struct list_type *))global[75])
Index: eggdrop1.6/src/mod/notes.mod/cmdsnote.c
diff -u eggdrop1.6/src/mod/notes.mod/cmdsnote.c:1.23 eggdrop1.6/src/mod/notes.mod/cmdsnote.c:1.24
--- eggdrop1.6/src/mod/notes.mod/cmdsnote.c:1.23	Sun Jan  3 07:27:55 2010
+++ eggdrop1.6/src/mod/notes.mod/cmdsnote.c	Thu Feb 18 03:52:29 2010
@@ -2,7 +2,7 @@
  * cmdsnote.c -- part of notes.mod
  *   handles all notes interaction over the party line
  *
- * $Id: cmdsnote.c,v 1.23 2010/01/03 13:27:55 pseudo Exp $
+ * $Id: cmdsnote.c,v 1.24 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -240,11 +240,11 @@
 }
 
 static cmd_t notes_cmds[] = {
-  {"fwd",      "m",  (Function) cmd_fwd,         NULL},
-  {"notes",    "",   (Function) cmd_notes,       NULL},
-  {"+noteign", "",   (Function) cmd_pls_noteign, NULL},
-  {"-noteign", "",   (Function) cmd_mns_noteign, NULL},
-  {"noteigns", "",   (Function) cmd_noteigns,    NULL},
-  {"note",     "",   (Function) cmd_note,        NULL},
+  {"fwd",      "m",  (IntFunc) cmd_fwd,         NULL},
+  {"notes",    "",   (IntFunc) cmd_notes,       NULL},
+  {"+noteign", "",   (IntFunc) cmd_pls_noteign, NULL},
+  {"-noteign", "",   (IntFunc) cmd_mns_noteign, NULL},
+  {"noteigns", "",   (IntFunc) cmd_noteigns,    NULL},
+  {"note",     "",   (IntFunc) cmd_note,        NULL},
   {NULL,       NULL, NULL,                       NULL}
 };
Index: eggdrop1.6/src/mod/notes.mod/notes.c
diff -u eggdrop1.6/src/mod/notes.mod/notes.c:1.61 eggdrop1.6/src/mod/notes.mod/notes.c:1.62
--- eggdrop1.6/src/mod/notes.mod/notes.c:1.61	Tue Feb  9 08:51:07 2010
+++ eggdrop1.6/src/mod/notes.mod/notes.c	Thu Feb 18 03:52:29 2010
@@ -5,7 +5,7 @@
  *   note cmds
  *   note ignores
  *
- * $Id: notes.c,v 1.61 2010/02/09 14:51:07 thommey Exp $
+ * $Id: notes.c,v 1.62 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1086,27 +1086,27 @@
 
 
 static cmd_t notes_join[] = {
-  {"*",  "",   (Function) join_notes, "notes"},
+  {"*",  "",   (IntFunc) join_notes, "notes"},
   {NULL, NULL, NULL,                     NULL}
 };
 
 static cmd_t notes_nkch[] = {
-  {"*",  "",   (Function) notes_change, "notes"},
+  {"*",  "",   (IntFunc) notes_change, "notes"},
   {NULL, NULL, NULL,                       NULL}
 };
 
 static cmd_t notes_away[] = {
-  {"*",  "",   (Function) away_notes, "notes"},
+  {"*",  "",   (IntFunc) away_notes, "notes"},
   {NULL, NULL, NULL,                     NULL}
 };
 
 static cmd_t notes_chon[] = {
-  {"*",  "",   (Function) chon_notes, "notes"},
+  {"*",  "",   (IntFunc) chon_notes, "notes"},
   {NULL, NULL, NULL,                     NULL}
 };
 
 static cmd_t notes_msgs[] = {
-  {"notes", "",   (Function) msg_notes, NULL},
+  {"notes", "",   (IntFunc) msg_notes, NULL},
   {NULL,    NULL, NULL,                 NULL}
 };
 
Index: eggdrop1.6/src/mod/server.mod/cmdsserv.c
diff -u eggdrop1.6/src/mod/server.mod/cmdsserv.c:1.25 eggdrop1.6/src/mod/server.mod/cmdsserv.c:1.26
--- eggdrop1.6/src/mod/server.mod/cmdsserv.c:1.25	Sun Jan  3 07:27:55 2010
+++ eggdrop1.6/src/mod/server.mod/cmdsserv.c	Thu Feb 18 03:52:29 2010
@@ -2,7 +2,7 @@
  * cmdsserv.c -- part of server.mod
  *   handles commands from a user via dcc that cause server interaction
  *
- * $Id: cmdsserv.c,v 1.25 2010/01/03 13:27:55 pseudo Exp $
+ * $Id: cmdsserv.c,v 1.26 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -132,9 +132,9 @@
 }
 
 static cmd_t C_dcc_serv[] = {
-  {"dump",       "m",  (Function) cmd_dump,       NULL},
-  {"jump",       "m",  (Function) cmd_jump,       NULL},
-  {"servers",    "o",  (Function) cmd_servers,    NULL},
-  {"clearqueue", "m",  (Function) cmd_clearqueue, NULL},
+  {"dump",       "m",  (IntFunc) cmd_dump,       NULL},
+  {"jump",       "m",  (IntFunc) cmd_jump,       NULL},
+  {"servers",    "o",  (IntFunc) cmd_servers,    NULL},
+  {"clearqueue", "m",  (IntFunc) cmd_clearqueue, NULL},
   {NULL,         NULL, NULL,                      NULL}
 };
Index: eggdrop1.6/src/mod/server.mod/servmsg.c
diff -u eggdrop1.6/src/mod/server.mod/servmsg.c:1.104 eggdrop1.6/src/mod/server.mod/servmsg.c:1.105
--- eggdrop1.6/src/mod/server.mod/servmsg.c:1.104	Sun Jan  3 07:27:55 2010
+++ eggdrop1.6/src/mod/server.mod/servmsg.c	Thu Feb 18 03:52:30 2010
@@ -1,7 +1,7 @@
 /*
  * servmsg.c -- part of server.mod
  *
- * $Id: servmsg.c,v 1.104 2010/01/03 13:27:55 pseudo Exp $
+ * $Id: servmsg.c,v 1.105 2010/02/18 09:52:30 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1215,29 +1215,29 @@
 
 
 static cmd_t my_raw_binds[] = {
-  {"PRIVMSG", "",   (Function) gotmsg,       NULL},
-  {"NOTICE",  "",   (Function) gotnotice,    NULL},
-  {"MODE",    "",   (Function) gotmode,      NULL},
-  {"PING",    "",   (Function) gotping,      NULL},
-  {"PONG",    "",   (Function) gotpong,      NULL},
-  {"WALLOPS", "",   (Function) gotwall,      NULL},
-  {"001",     "",   (Function) got001,       NULL},
-  {"251",     "",   (Function) got251,       NULL},
-  {"303",     "",   (Function) got303,       NULL},
-  {"432",     "",   (Function) got432,       NULL},
-  {"433",     "",   (Function) got433,       NULL},
-  {"437",     "",   (Function) got437,       NULL},
-  {"438",     "",   (Function) got438,       NULL},
-  {"451",     "",   (Function) got451,       NULL},
-  {"442",     "",   (Function) got442,       NULL},
-  {"465",     "",   (Function) got465,       NULL},
-  {"NICK",    "",   (Function) gotnick,      NULL},
-  {"ERROR",   "",   (Function) goterror,     NULL},
+  {"PRIVMSG", "",   (IntFunc) gotmsg,       NULL},
+  {"NOTICE",  "",   (IntFunc) gotnotice,    NULL},
+  {"MODE",    "",   (IntFunc) gotmode,      NULL},
+  {"PING",    "",   (IntFunc) gotping,      NULL},
+  {"PONG",    "",   (IntFunc) gotpong,      NULL},
+  {"WALLOPS", "",   (IntFunc) gotwall,      NULL},
+  {"001",     "",   (IntFunc) got001,       NULL},
+  {"251",     "",   (IntFunc) got251,       NULL},
+  {"303",     "",   (IntFunc) got303,       NULL},
+  {"432",     "",   (IntFunc) got432,       NULL},
+  {"433",     "",   (IntFunc) got433,       NULL},
+  {"437",     "",   (IntFunc) got437,       NULL},
+  {"438",     "",   (IntFunc) got438,       NULL},
+  {"451",     "",   (IntFunc) got451,       NULL},
+  {"442",     "",   (IntFunc) got442,       NULL},
+  {"465",     "",   (IntFunc) got465,       NULL},
+  {"NICK",    "",   (IntFunc) gotnick,      NULL},
+  {"ERROR",   "",   (IntFunc) goterror,     NULL},
 /* ircu2.10.10 has a bug when a client is throttled ERROR is sent wrong */
-  {"ERROR:",  "",   (Function) goterror,     NULL},
-  {"KICK",    "",   (Function) gotkick,      NULL},
-  {"318",     "",   (Function) whoispenalty, NULL},
-  {"311",     "",   (Function) got311,       NULL},
+  {"ERROR:",  "",   (IntFunc) goterror,     NULL},
+  {"KICK",    "",   (IntFunc) gotkick,      NULL},
+  {"318",     "",   (IntFunc) whoispenalty, NULL},
+  {"311",     "",   (IntFunc) got311,       NULL},
   {NULL,      NULL, NULL,                    NULL}
 };
 
Index: eggdrop1.6/src/mod/share.mod/share.c
diff -u eggdrop1.6/src/mod/share.mod/share.c:1.91 eggdrop1.6/src/mod/share.mod/share.c:1.92
--- eggdrop1.6/src/mod/share.mod/share.c:1.91	Sun Feb  7 11:21:14 2010
+++ eggdrop1.6/src/mod/share.mod/share.c	Thu Feb 18 03:52:30 2010
@@ -1,7 +1,7 @@
 /*
  * share.c -- part of share.mod
  *
- * $Id: share.c,v 1.91 2010/02/07 17:21:14 pseudo Exp $
+ * $Id: share.c,v 1.92 2010/02/18 09:52:30 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1257,45 +1257,45 @@
 
 /* Note: these MUST be sorted. */
 static botcmd_t C_share[] = {
-  {"!",        (Function) share_endstartup},
-  {"+b",       (Function) share_pls_ban},
-  {"+bc",      (Function) share_pls_banchan},
-  {"+bh",      (Function) share_pls_bothost},
-  {"+cr",      (Function) share_pls_chrec},
-  {"+e",       (Function) share_pls_exempt},
-  {"+ec",      (Function) share_pls_exemptchan},
-  {"+h",       (Function) share_pls_host},
-  {"+i",       (Function) share_pls_ignore},
-  {"+inv",     (Function) share_pls_invite},
-  {"+invc",    (Function) share_pls_invitechan},
-  {"-b",       (Function) share_mns_ban},
-  {"-bc",      (Function) share_mns_banchan},
-  {"-cr",      (Function) share_mns_chrec},
-  {"-e",       (Function) share_mns_exempt},
-  {"-ec",      (Function) share_mns_exemptchan},
-  {"-h",       (Function) share_mns_host},
-  {"-i",       (Function) share_mns_ignore},
-  {"-inv",     (Function) share_mns_invite},
-  {"-invc",    (Function) share_mns_invitechan},
-  {"a",        (Function) share_chattr},
-  {"c",        (Function) share_change},
-  {"chchinfo", (Function) share_chchinfo},
-  {"e",        (Function) share_end},
-  {"feats",    (Function) share_feats},
-  {"h",        (Function) share_chhand},
-  {"k",        (Function) share_killuser},
-  {"n",        (Function) share_newuser},
-  {"r!",       (Function) share_resync},
-  {"r?",       (Function) share_resyncq},
-  {"rn",       (Function) share_resync_no},
-  {"s",        (Function) share_stick_ban},
-  {"se",       (Function) share_stick_exempt},
-  {"sInv",     (Function) share_stick_invite},
-  {"u?",       (Function) share_userfileq},
-  {"un",       (Function) share_ufno},
-  {"us",       (Function) share_ufsend},
-  {"uy",       (Function) share_ufyes},
-  {"v",        (Function) share_version},
+  {"!",        (IntFunc) share_endstartup},
+  {"+b",       (IntFunc) share_pls_ban},
+  {"+bc",      (IntFunc) share_pls_banchan},
+  {"+bh",      (IntFunc) share_pls_bothost},
+  {"+cr",      (IntFunc) share_pls_chrec},
+  {"+e",       (IntFunc) share_pls_exempt},
+  {"+ec",      (IntFunc) share_pls_exemptchan},
+  {"+h",       (IntFunc) share_pls_host},
+  {"+i",       (IntFunc) share_pls_ignore},
+  {"+inv",     (IntFunc) share_pls_invite},
+  {"+invc",    (IntFunc) share_pls_invitechan},
+  {"-b",       (IntFunc) share_mns_ban},
+  {"-bc",      (IntFunc) share_mns_banchan},
+  {"-cr",      (IntFunc) share_mns_chrec},
+  {"-e",       (IntFunc) share_mns_exempt},
+  {"-ec",      (IntFunc) share_mns_exemptchan},
+  {"-h",       (IntFunc) share_mns_host},
+  {"-i",       (IntFunc) share_mns_ignore},
+  {"-inv",     (IntFunc) share_mns_invite},
+  {"-invc",    (IntFunc) share_mns_invitechan},
+  {"a",        (IntFunc) share_chattr},
+  {"c",        (IntFunc) share_change},
+  {"chchinfo", (IntFunc) share_chchinfo},
+  {"e",        (IntFunc) share_end},
+  {"feats",    (IntFunc) share_feats},
+  {"h",        (IntFunc) share_chhand},
+  {"k",        (IntFunc) share_killuser},
+  {"n",        (IntFunc) share_newuser},
+  {"r!",       (IntFunc) share_resync},
+  {"r?",       (IntFunc) share_resyncq},
+  {"rn",       (IntFunc) share_resync_no},
+  {"s",        (IntFunc) share_stick_ban},
+  {"se",       (IntFunc) share_stick_exempt},
+  {"sInv",     (IntFunc) share_stick_invite},
+  {"u?",       (IntFunc) share_userfileq},
+  {"un",       (IntFunc) share_ufno},
+  {"us",       (IntFunc) share_ufsend},
+  {"uy",       (IntFunc) share_ufyes},
+  {"v",        (IntFunc) share_version},
   {NULL,       NULL}
 };
 
@@ -2060,7 +2060,7 @@
 }
 
 static cmd_t my_cmds[] = {
-  {"flush", "n",  (Function) cmd_flush, NULL},
+  {"flush", "n",  (IntFunc) cmd_flush, NULL},
   {NULL,    NULL, NULL,                 NULL}
 };
 
Index: eggdrop1.6/src/mod/wire.mod/wire.c
diff -u eggdrop1.6/src/mod/wire.mod/wire.c:1.40 eggdrop1.6/src/mod/wire.mod/wire.c:1.41
--- eggdrop1.6/src/mod/wire.mod/wire.c:1.40	Sun Jan  3 07:27:55 2010
+++ eggdrop1.6/src/mod/wire.mod/wire.c	Thu Feb 18 03:52:30 2010
@@ -15,7 +15,7 @@
  * 1.4       1997-11-25      1.2.2.0         Added language addition  Kirk
  * 1.5       1998-07-12      1.3.0.0         Fixed ;me and updated    BB
  *
- * $Id: wire.c,v 1.40 2010/01/03 13:27:55 pseudo Exp $
+ * $Id: wire.c,v 1.41 2010/02/18 09:52:30 pseudo Exp $
  */
 /*
  * Copyright (C) 1999 - 2010 Eggheads Development Team
@@ -384,7 +384,7 @@
                                  * we add a bind */
     wire_bot[0].name = wirecmd;
     wire_bot[0].flags = "";
-    wire_bot[0].func = (Function) wire_filter;
+    wire_bot[0].func = (IntFunc) wire_filter;
     add_builtins(H_bot, wire_bot);
   }
 }
@@ -439,7 +439,7 @@
   if (!w2) {                    /* Someone else is NOT using this key */
     wire_bot[0].name = wirecmd;
     wire_bot[0].flags = "";
-    wire_bot[0].func = (Function) wire_filter;
+    wire_bot[0].func = (IntFunc) wire_filter;
     rem_builtins(H_bot, wire_bot);
   }
   w2 = wirelist;
@@ -530,19 +530,19 @@
 }
 
 static cmd_t wire_dcc[] = {
-  {"wire",     "",   (Function) cmd_wire,     NULL},
-  {"onwire",   "",   (Function) cmd_onwire,   NULL},
-  {"wirelist", "n",  (Function) cmd_wirelist, NULL},
+  {"wire",     "",   (IntFunc) cmd_wire,     NULL},
+  {"onwire",   "",   (IntFunc) cmd_onwire,   NULL},
+  {"wirelist", "n",  (IntFunc) cmd_wirelist, NULL},
   {NULL,       NULL, NULL,                    NULL}
 };
 
 static cmd_t wire_chof[] = {
-  {"*", "",    (Function) chof_wire, "wire:chof"},
+  {"*", "",    (IntFunc) chof_wire, "wire:chof"},
   {NULL, NULL, NULL,                        NULL}
 };
 
 static cmd_t wire_filt[] = {
-  {";*", "",   (Function) cmd_putwire, "wire:filt"},
+  {";*", "",   (IntFunc) cmd_putwire, "wire:filt"},
   {NULL, NULL, NULL,                          NULL}
 };
 
@@ -562,7 +562,7 @@
     nfree(enctmp);
     wire_bot[0].name = wiretmp;
     wire_bot[0].flags = "";
-    wire_bot[0].func = (Function) wire_filter;
+    wire_bot[0].func = (IntFunc) wire_filter;
     rem_builtins(H_bot, wire_bot);
     w = w->next;
   }
Index: eggdrop1.6/src/modules.c
diff -u eggdrop1.6/src/modules.c:1.105 eggdrop1.6/src/modules.c:1.106
--- eggdrop1.6/src/modules.c:1.105	Sun Feb  7 11:21:14 2010
+++ eggdrop1.6/src/modules.c	Thu Feb 18 03:52:29 2010
@@ -4,7 +4,7 @@
  *
  * by Darrin Smith (beldin at light.iinet.net.au)
  *
- * $Id: modules.c,v 1.105 2010/02/07 17:21:14 pseudo Exp $
+ * $Id: modules.c,v 1.106 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1034,8 +1034,8 @@
       }
       break;
     case HOOK_MATCH_NOTEREJ:
-      if (match_noterej == (int (*)(struct userrec *, char *)) false_func)
-        match_noterej = func;
+      if (match_noterej == false_func)
+        match_noterej = (int (*)(struct userrec *, char *)) func;
       break;
     case HOOK_DNS_HOSTBYIP:
       if (dns_hostbyip == block_dns_hostbyip)
Index: eggdrop1.6/src/modules.h
diff -u eggdrop1.6/src/modules.h:1.20 eggdrop1.6/src/modules.h:1.21
--- eggdrop1.6/src/modules.h:1.20	Sun Jan  3 07:27:32 2010
+++ eggdrop1.6/src/modules.h	Thu Feb 18 03:52:29 2010
@@ -4,7 +4,7 @@
  *
  * by Darrin Smith (beldin at light.iinet.net.au)
  *
- * $Id: modules.h,v 1.20 2010/01/03 13:27:32 pseudo Exp $
+ * $Id: modules.h,v 1.21 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -51,7 +51,7 @@
 
 extern struct hook_entry {
   struct hook_entry *next;
-  int (*func) ();
+  Function func;
 } *hook_list[REAL_HOOKS];
 
 #define call_hook(x) do {                                       \
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1234 eggdrop1.6/src/patch.h:1.1235
--- eggdrop1.6/src/patch.h:1.1234	Tue Feb  9 08:51:07 2010
+++ eggdrop1.6/src/patch.h	Thu Feb 18 03:52:29 2010
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1234 2010/02/09 14:51:07 thommey Exp $
+ * $Id: patch.h,v 1.1235 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1265726952");            /* current unixtime */
+patch("1266486110");            /* current unixtime */
 /*
  *
  *
  */
-patch("notesusagefix");
+patch("64bitfix");
 /*
  *
  *
Index: eggdrop1.6/src/tclegg.h
diff -u eggdrop1.6/src/tclegg.h:1.37 eggdrop1.6/src/tclegg.h:1.38
--- eggdrop1.6/src/tclegg.h:1.37	Mon Jan 25 21:12:15 2010
+++ eggdrop1.6/src/tclegg.h	Thu Feb 18 03:52:29 2010
@@ -2,7 +2,7 @@
  * tclegg.h
  *   stuff used by tcl.c and tclhash.c
  *
- * $Id: tclegg.h,v 1.37 2010/01/26 03:12:15 tothwolf Exp $
+ * $Id: tclegg.h,v 1.38 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -156,12 +156,12 @@
 
 typedef struct _tcl_cmds {
   char *name;
-  Function func;
+  IntFunc func;
 } tcl_cmds;
 
 typedef struct _cd_tcl_cmd {
   char *name;
-  Function callback;
+  IntFunc callback;
   void *cdata;
 } cd_tcl_cmd;
 
Index: eggdrop1.6/src/tclhash.c
diff -u eggdrop1.6/src/tclhash.c:1.65 eggdrop1.6/src/tclhash.c:1.66
--- eggdrop1.6/src/tclhash.c:1.65	Sun Jan  3 07:27:32 2010
+++ eggdrop1.6/src/tclhash.c	Thu Feb 18 03:52:29 2010
@@ -7,7 +7,7 @@
  *   (non-Tcl) procedure lookups for msg/dcc/file commands
  *   (Tcl) binding internal procedures to msg/dcc/file commands
  *
- * $Id: tclhash.c,v 1.65 2010/01/03 13:27:32 pseudo Exp $
+ * $Id: tclhash.c,v 1.66 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -253,7 +253,7 @@
   bind_table_list = NULL;
 }
 
-tcl_bind_list_t *add_bind_table(const char *nme, int flg, Function func)
+tcl_bind_list_t *add_bind_table(const char *nme, int flg, IntFunc func)
 {
   tcl_bind_list_t *tl, *tl_prev;
   int v;
@@ -487,7 +487,7 @@
   return TCL_OK;
 }
 
-int check_validity(char *nme, Function func)
+int check_validity(char *nme, IntFunc func)
 {
   char *p;
   tcl_bind_list_t *tl;
Index: eggdrop1.6/src/tclhash.h
diff -u eggdrop1.6/src/tclhash.h:1.20 eggdrop1.6/src/tclhash.h:1.21
--- eggdrop1.6/src/tclhash.h:1.20	Sun Jan  3 07:27:32 2010
+++ eggdrop1.6/src/tclhash.h	Thu Feb 18 03:52:29 2010
@@ -1,7 +1,7 @@
 /*
  * tclhash.h
  *
- * $Id: tclhash.h,v 1.20 2010/01/03 13:27:32 pseudo Exp $
+ * $Id: tclhash.h,v 1.21 2010/02/18 09:52:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -60,7 +60,7 @@
   tcl_bind_mask_t *first;       /* Pointer to registered binds for this list. */
   char name[5];                 /* Name of the bind. */
   u_8bit_t flags;               /* Flags for this element. HT_* */
-  Function func;                /* Function used as the Tcl calling interface
+  IntFunc func;                 /* Function used as the Tcl calling interface
                                  * for procs actually representing C functions. */
 } tcl_bind_list_t, *p_tcl_bind_list;
 
@@ -73,7 +73,7 @@
 void kill_bind(void);
 int expmem_tclhash(void);
 
-tcl_bind_list_t *add_bind_table(const char *nme, int flg, Function func);
+tcl_bind_list_t *add_bind_table(const char *nme, int flg, IntFunc func);
 void del_bind_table(tcl_bind_list_t *tl_which);
 
 tcl_bind_list_t *find_bind_table(const char *nme);
@@ -111,7 +111,7 @@
 void rem_builtins(tcl_bind_list_t *, cmd_t *);
 void add_builtins(tcl_bind_list_t *, cmd_t *);
 
-int check_validity(char *, Function);
+int check_validity(char *, IntFunc);
 extern p_tcl_bind_list H_chat, H_act, H_bcst, H_chon, H_chof;
 extern p_tcl_bind_list H_load, H_unld, H_dcc, H_bot, H_link;
 extern p_tcl_bind_list H_away, H_nkch, H_filt, H_disc, H_event;
----------------------- End of diff -----------------------


More information about the Changes mailing list