* Removed struct userrec * from "cmd" bind table

svn: 1289

src/core_binds.c

@@ -27,7 +27,7 @@ void core_binds_init()
         BT_away = bind_table_add("away", 3, "sis", MATCH_MASK, BIND_STACKABLE);
         BT_bot = bind_table_add("bot", 3, "sss", MATCH_EXACT, 0);
         BT_chon = bind_table_add("chon", 2, "si", MATCH_MASK | MATCH_FLAGS, BIND_STACKABLE);
-        BT_dcc = bind_table_add("dcc", 3, "Uis", MATCH_PARTIAL | MATCH_FLAGS, 0);
+        BT_dcc = bind_table_add("dcc", 2, "is", MATCH_PARTIAL | MATCH_FLAGS, 0);
         add_builtins("dcc", C_dcc);
         BT_nkch = bind_table_add("nkch", 2, "ss", MATCH_MASK, BIND_STACKABLE);
         BT_note = bind_table_add("note", 3 , "sss", MATCH_EXACT, 0);
@@ -77,7 +77,7 @@ void check_bind_dcc(const char *cmd, int idx, const char *text)
     }
   }
 
-  x = check_bind_hits(BT_dcc, cmd, &fr, &hits, dcc[idx].user, idx, args);
+  x = check_bind_hits(BT_dcc, cmd, &fr, &hits, idx, args);
 
   if (hits != 1)
     putlog(LOG_CMDS, "*", "! #%s# %s %s", dcc[idx].nick, cmd, args);

src/main.c

@@ -680,9 +680,9 @@ void share_init();
 void transfer_init();
 
 #ifndef CYGWIN_HACKS
-long *_start();
+int _start();
 int tracecheck_breakpoint() {
-  long *u = _start;
+  int *u = _start;
   return (*u == 0xCC);
 }
 #endif /* !CYGWIN_HACKS */

src/mod/channels.mod/cmdschan.c

@@ -10,7 +10,7 @@ static struct flag_record user	 = {FR_GLOBAL | FR_CHAN, 0, 0, 0 };
 static struct flag_record victim = {FR_GLOBAL | FR_CHAN, 0, 0, 0 };
 
 
-static void cmd_pls_mask(char type, struct userrec *u, int idx, char *par)
+static void cmd_pls_mask(char type, int idx, char *par)
 {
   char *chname = NULL, *who = NULL, s[UHOSTLEN] = "", s1[UHOSTLEN] = "", *p = NULL, *p_expire = NULL, *cmd = NULL;
   unsigned long int expire_time = 0, expire_foo;
@@ -27,10 +27,10 @@ static void cmd_pls_mask(char type, struct userrec *u, int idx, char *par)
     chname = newsplit(&par);
   else
     chname = 0;
-  if (chname || !(u->flags & USER_MASTER)) {
+  if (chname || !(dcc[idx].user->flags & USER_MASTER)) {
     if (!chname)
       chname = dcc[idx].u.chat->con_chan;
-    get_user_flagrec(u, &user, chname);
+    get_user_flagrec(dcc[idx].user, &user, chname);
     chan = findchan_by_dname(chname);
     /* *shrug* ??? (guppy:10Feb1999) */
     if (!chan || (chan && private(user, chan, PRIV_OP))) {
@@ -148,30 +148,30 @@ static void cmd_pls_mask(char type, struct userrec *u, int idx, char *par)
   }
 }
 
-static void cmd_pls_ban(struct userrec *u, int idx, char *par)
+static void cmd_pls_ban(int idx, char *par)
 {
-  cmd_pls_mask('b', u, idx, par);
+  cmd_pls_mask('b', idx, par);
 }
 
-static void cmd_pls_exempt(struct userrec *u, int idx, char *par)
+static void cmd_pls_exempt(int idx, char *par)
 { 
   if (!use_exempts) {
     dprintf(idx, "This command can only be used with use-exempts enabled.\n");
     return;
   }
-  cmd_pls_mask('e', u, idx, par);
+  cmd_pls_mask('e', idx, par);
 }
 
-static void cmd_pls_invite(struct userrec *u, int idx, char *par)
+static void cmd_pls_invite(int idx, char *par)
 {
   if (!use_invites) {
     dprintf(idx, "This command can only be used with use-invites enabled.\n");
     return;
   }
-  cmd_pls_mask('I', u, idx, par);
+  cmd_pls_mask('I', idx, par);
 }
 
-static void cmd_mns_mask(char type, struct userrec *u, int idx, char *par)
+static void cmd_mns_mask(char type, int idx, char *par)
 {
   int i = 0, j;
   struct chanset_t *chan = NULL;
@@ -188,10 +188,10 @@ static void cmd_mns_mask(char type, struct userrec *u, int idx, char *par)
     chname = newsplit(&par);
   else
     chname = dcc[idx].u.chat->con_chan;
-  if (chname || !(u->flags & USER_MASTER)) {
+  if (chname || !(dcc[idx].user->flags & USER_MASTER)) {
     if (!chname)
       chname = dcc[idx].u.chat->con_chan;
-    get_user_flagrec(u, &user, chname);
+    get_user_flagrec(dcc[idx].user, &user, chname);
 
     if (strchr(CHANMETA, chname[0]) && private(user, findchan_by_dname(chname), PRIV_OP)) {
       dprintf(idx, "No such channel.\n");
@@ -201,7 +201,7 @@ static void cmd_mns_mask(char type, struct userrec *u, int idx, char *par)
       return;
   }
   strncpyz(s, who, sizeof s);
-  i = u_delmask(type, NULL, s, (u->flags & USER_MASTER));
+  i = u_delmask(type, NULL, s, (dcc[idx].user->flags & USER_MASTER));
   if (i > 0) {
     if (lastdeletedmask)
       mask = lastdeletedmask;
@@ -277,30 +277,30 @@ static void cmd_mns_mask(char type, struct userrec *u, int idx, char *par)
   dprintf(idx, "No such %s.\n", cmd);
 }
 
-static void cmd_mns_ban(struct userrec *u, int idx, char *par)
+static void cmd_mns_ban(int idx, char *par)
 {
-  cmd_mns_mask('b', u, idx, par);
+  cmd_mns_mask('b', idx, par);
 }
 
-static void cmd_mns_exempt(struct userrec *u, int idx, char *par)
+static void cmd_mns_exempt(int idx, char *par)
 {
   if (!use_exempts) {
     dprintf(idx, "This command can only be used with use-exempts enabled.\n");
     return;
   }
-  cmd_mns_mask('e', u, idx, par);
+  cmd_mns_mask('e', idx, par);
 }
 
-static void cmd_mns_invite(struct userrec *u, int idx, char *par)
+static void cmd_mns_invite(int idx, char *par)
 {
   if (!use_invites) {
     dprintf(idx, "This command can only be used with use-invites enabled.\n");
     return;
   }
-  cmd_mns_mask('I', u, idx, par);
+  cmd_mns_mask('I', idx, par);
 }
 
-static void cmd_bans(struct userrec *u, int idx, char *par)
+static void cmd_bans(int idx, char *par)
 {
   if (!egg_strcasecmp(par, "all")) {
     putlog(LOG_CMDS, "*", "#%s# bans all", dcc[idx].nick);
@@ -311,7 +311,7 @@ static void cmd_bans(struct userrec *u, int idx, char *par)
   }
 }
 
-static void cmd_exempts(struct userrec *u, int idx, char *par)
+static void cmd_exempts(int idx, char *par)
 {
   if (!use_exempts) {
     dprintf(idx, "This command can only be used with use-exempts enabled.\n");
@@ -326,7 +326,7 @@ static void cmd_exempts(struct userrec *u, int idx, char *par)
   }
 }
 
-static void cmd_invites(struct userrec *u, int idx, char *par)
+static void cmd_invites(int idx, char *par)
 {
   if (!use_invites) {
     dprintf(idx, "This command can only be used with use-invites enabled.\n");
@@ -341,7 +341,7 @@ static void cmd_invites(struct userrec *u, int idx, char *par)
   }
 }
 
-static void cmd_info(struct userrec *u, int idx, char *par)
+static void cmd_info(int idx, char *par)
 {
   char s[512] = "", *chname = NULL, *s1 = NULL;
   int locked = 0;
@@ -350,7 +350,7 @@ static void cmd_info(struct userrec *u, int idx, char *par)
     dprintf(idx, "Info storage is turned off.\n");
     return;
   }
-  s1 = get_user(&USERENTRY_INFO, u);
+  s1 = get_user(&USERENTRY_INFO, dcc[idx].user);
   if (s1 && s1[0] == '@')
     locked = 1;
   if (par[0] && strchr(CHANMETA, par[0])) {
@@ -381,7 +381,7 @@ static void cmd_info(struct userrec *u, int idx, char *par)
     putlog(LOG_CMDS, "*", "#%s# info %s", dcc[idx].nick, chname ? chname : "");
     return;
   }
-  if (locked && !(u && (u->flags & USER_MASTER))) {
+  if (locked && !(dcc[idx].user && (dcc[idx].user->flags & USER_MASTER))) {
     dprintf(idx, "Your info line is locked.  Sorry.\n");
     return;
   }
@@ -392,7 +392,7 @@ static void cmd_info(struct userrec *u, int idx, char *par)
       dprintf(idx, "Removed your info line on %s.\n", chname);
       putlog(LOG_CMDS, "*", "#%s# info %s none", dcc[idx].nick, chname);
     } else {
-      set_user(&USERENTRY_INFO, u, NULL);
+      set_user(&USERENTRY_INFO, dcc[idx].user, NULL);
       dprintf(idx, "Removed your default info line.\n");
       putlog(LOG_CMDS, "*", "#%s# info none", dcc[idx].nick);
     }
@@ -405,13 +405,13 @@ static void cmd_info(struct userrec *u, int idx, char *par)
     dprintf(idx, "Your info on %s is now: %s\n", chname, par);
     putlog(LOG_CMDS, "*", "#%s# info %s ...", dcc[idx].nick, chname);
   } else {
-    set_user(&USERENTRY_INFO, u, par);
+    set_user(&USERENTRY_INFO, dcc[idx].user, par);
     dprintf(idx, "Your default info is now: %s\n", par);
     putlog(LOG_CMDS, "*", "#%s# info ...", dcc[idx].nick);
   }
 }
 
-static void cmd_chinfo(struct userrec *u, int idx, char *par)
+static void cmd_chinfo(int idx, char *par)
 {
   char *handle = NULL, *chname = NULL;
   struct userrec *u1 = NULL;
@@ -438,16 +438,16 @@ static void cmd_chinfo(struct userrec *u, int idx, char *par)
     }
   } else
     chname = 0;
-  if (u1->bot && !(u->flags & USER_MASTER)) {
+  if (u1->bot && !(dcc[idx].user->flags & USER_MASTER)) {
     dprintf(idx, "You have to be master to change bots info.\n");
     return;
   }
-  if ((u1->flags & USER_OWNER) && !(u->flags & USER_OWNER)) {
+  if ((u1->flags & USER_OWNER) && !(dcc[idx].user->flags & USER_OWNER)) {
     dprintf(idx, "You can't change info for the bot owner.\n");
     return;
   }
   if (chname) {
-    get_user_flagrec(u, &user, chname);
+    get_user_flagrec(dcc[idx].user, &user, chname);
     get_user_flagrec(u1, &victim, chname);
     if ((chan_owner(victim) || glob_owner(victim)) &&
 	!(glob_owner(user) || chan_owner(user))) {
@@ -455,8 +455,7 @@ static void cmd_chinfo(struct userrec *u, int idx, char *par)
       return;
     }
   }
-  putlog(LOG_CMDS, "*", "#%s# chinfo %s %s %s", dcc[idx].nick, handle,
-	 chname ? chname : par, chname ? par : "");
+  putlog(LOG_CMDS, "*", "#%s# chinfo %s %s %s", dcc[idx].nick, handle, chname ? chname : par, chname ? par : "");
   if (!egg_strcasecmp(par, "none"))
     par[0] = 0;
   if (chname) {
@@ -479,7 +478,7 @@ static void cmd_chinfo(struct userrec *u, int idx, char *par)
   }
 }
 
-static void cmd_slowjoin(struct userrec *u, int idx, char *par)
+static void cmd_slowjoin(int idx, char *par)
 {
   int intvl = 0, delay = 0, count = 1;
   char *chname = NULL, *p = NULL, buf[2048] = "", buf2[1048] = "";
@@ -554,7 +553,7 @@ static void cmd_slowjoin(struct userrec *u, int idx, char *par)
 #endif /* LEAF */
 }
 
-static void cmd_slowpart(struct userrec *u, int idx, char *par)
+static void cmd_slowpart(int idx, char *par)
 {
   int intvl = 0, delay = 0, count = 1;
   char *chname = NULL, *p = NULL;
@@ -769,17 +768,17 @@ static void cmd_stick_yn(int idx, char *par, int yn)
 }
 
 
-static void cmd_stick(struct userrec *u, int idx, char *par)
+static void cmd_stick(int idx, char *par)
 {
   cmd_stick_yn(idx, par, 1);
 }
 
-static void cmd_unstick(struct userrec *u, int idx, char *par)
+static void cmd_unstick(int idx, char *par)
 {
   cmd_stick_yn(idx, par, 0);
 }
 
-static void cmd_pls_chrec(struct userrec *u, int idx, char *par)
+static void cmd_pls_chrec(int idx, char *par)
 {
   char *nick = NULL, *chn = NULL;
   struct chanset_t *chan = NULL;
@@ -806,7 +805,7 @@ static void cmd_pls_chrec(struct userrec *u, int idx, char *par)
     dprintf(idx, "No such channel.\n");
     return;
   }
-  get_user_flagrec(u, &user, chan->dname);
+  get_user_flagrec(dcc[idx].user, &user, chan->dname);
   get_user_flagrec(u1, &victim, chan->dname);
   if (private(user, chan, PRIV_OP)) {
     dprintf(idx, "No such channel.\n");
@@ -824,13 +823,12 @@ static void cmd_pls_chrec(struct userrec *u, int idx, char *par)
 	    nick, chan->dname);
     return;
   }
-  putlog(LOG_CMDS, "*", "#%s# +chrec %s %s", dcc[idx].nick,
-	 nick, chan->dname);
+  putlog(LOG_CMDS, "*", "#%s# +chrec %s %s", dcc[idx].nick, nick, chan->dname);
   add_chanrec(u1, chan->dname);
   dprintf(idx, "Added %s channel record for %s.\n", chan->dname, nick);
 }
 
-static void cmd_mns_chrec(struct userrec *u, int idx, char *par)
+static void cmd_mns_chrec(int idx, char *par)
 {
   char *nick = NULL, *chn = NULL;
   struct userrec *u1 = NULL;
@@ -858,7 +856,7 @@ static void cmd_mns_chrec(struct userrec *u, int idx, char *par)
     }
   } else
     chn = newsplit(&par);
-  get_user_flagrec(u, &user, chn);
+  get_user_flagrec(dcc[idx].user, &user, chn);
   get_user_flagrec(u1, &victim, chn);
   if (private(user, findchan_by_dname(chn), PRIV_OP)) {
     dprintf(idx, "No such channel.\n");
@@ -880,7 +878,7 @@ static void cmd_mns_chrec(struct userrec *u, int idx, char *par)
   dprintf(idx, "Removed %s channel record from %s.\n", chn, nick);
 }
 
-static void cmd_cycle(struct userrec *u, int idx, char *par)
+static void cmd_cycle(int idx, char *par)
 {
   char *chname = NULL;
   char buf2[1024] = "";
@@ -913,7 +911,7 @@ static void cmd_cycle(struct userrec *u, int idx, char *par)
 #endif /* LEAF */
 }
 
-static void cmd_down(struct userrec *u, int idx, char *par)
+static void cmd_down(int idx, char *par)
 {
   char *chname = NULL, buf2[1024] = "";
   struct chanset_t *chan = NULL;
@@ -941,7 +939,7 @@ static void cmd_down(struct userrec *u, int idx, char *par)
   
 }
 
-static void pls_chan(struct userrec *u, int idx, char *par, char *bot)
+static void pls_chan(int idx, char *par, char *bot)
 {
   char *chname = NULL, result[1024] = "", buf[2048] = "";
   struct chanset_t *chan = NULL;
@@ -999,12 +997,12 @@ static void pls_chan(struct userrec *u, int idx, char *par, char *bot)
   }
 }
 
-static void cmd_pls_chan(struct userrec *u, int idx, char *par)
+static void cmd_pls_chan(int idx, char *par)
 {
-  pls_chan(u, idx, par, NULL);
+  pls_chan(idx, par, NULL);
 }
 
-static void cmd_botjoin(struct userrec *u, int idx, char *par)
+static void cmd_botjoin(int idx, char *par)
 {
   char *bot = NULL;
   struct userrec *botu = NULL;
@@ -1018,13 +1016,13 @@ static void cmd_botjoin(struct userrec *u, int idx, char *par)
   bot = newsplit(&par);
   botu = get_user_by_handle(userlist, bot);
   if (botu && botu->bot) {
-    pls_chan(u, idx, par, bot);
+    pls_chan(idx, par, bot);
   } else {
     dprintf(idx, "Error: '%s' is not a bot.\n", bot);
   }
 }
 
-static void mns_chan(struct userrec *u, int idx, char *par, char *bot)
+static void mns_chan(int idx, char *par, char *bot)
 {
   char *chname = NULL, buf2[1024] = "";
   struct chanset_t *chan = NULL;
@@ -1070,12 +1068,12 @@ static void mns_chan(struct userrec *u, int idx, char *par, char *bot)
     dprintf(idx, "Channel %s removed from the bot: %s\n", chname, bot);
 }
 
-static void cmd_mns_chan(struct userrec *u, int idx, char *par)
+static void cmd_mns_chan(int idx, char *par)
 {
-  mns_chan(u, idx, par, NULL);
+  mns_chan(idx, par, NULL);
 }
 
-static void cmd_botpart(struct userrec *u, int idx, char *par)
+static void cmd_botpart(int idx, char *par)
 {
   char *bot = NULL;
   struct userrec *botu = NULL;
@@ -1090,7 +1088,7 @@ static void cmd_botpart(struct userrec *u, int idx, char *par)
   bot = newsplit(&par);
   botu = get_user_by_handle(userlist, bot);
   if (botu && botu->bot) {
-    mns_chan(u, idx, par, bot);
+    mns_chan(idx, par, bot);
   } else {
     dprintf(idx, "Error: '%s' is not a bot.\n", bot);
   }
@@ -1171,7 +1169,7 @@ void show_int(int idx, char *work, int *cnt, const char *desc, int state, const
 #define SHOW_FLAG(name, state) show_flag(idx, work, &cnt, name, state)
 #define SHOW_INT(desc, state, yes, no) show_int(idx, work, &cnt, desc, state, yes, no)
 #define P_STR deflag == P_KICK ? "Kick" : (deflag == P_DEOP ? "Deop" : (deflag == P_DELETE ? "Remove" : NULL))
-static void cmd_chaninfo(struct userrec *u, int idx, char *par)
+static void cmd_chaninfo(int idx, char *par)
 {
   char *chname = NULL, work[512] = "";
   struct chanset_t *chan = NULL;
@@ -1185,7 +1183,7 @@ static void cmd_chaninfo(struct userrec *u, int idx, char *par)
     }
   } else {
     chname = newsplit(&par);
-    get_user_flagrec(u, &user, chname);
+    get_user_flagrec(dcc[idx].user, &user, chname);
     if (!glob_master(user) && !chan_master(user)) {
       dprintf(idx, "You don't have access to %s.\n", chname);
       return;
@@ -1287,7 +1285,7 @@ static void cmd_chaninfo(struct userrec *u, int idx, char *par)
   }
 }
 
-static void cmd_chanset(struct userrec *u, int idx, char *par)
+static void cmd_chanset(int idx, char *par)
 {
   char *chname = NULL, result[1024] = "";
   struct chanset_t *chan = NULL;
@@ -1302,7 +1300,7 @@ static void cmd_chanset(struct userrec *u, int idx, char *par)
 
   if (strlen(par) > 2 && par[0] == '*' && par[1] == ' ') {
     all = 1;
-    get_user_flagrec(u, &user, chanset ? chanset->dname : "");
+    get_user_flagrec(dcc[idx].user, &user, chanset ? chanset->dname : "");
     if (!glob_master(user)) {
       dprintf(idx, "You need to be a global master to use %schanset *.\n", settings.dcc_prefix);
       return;
@@ -1311,7 +1309,7 @@ static void cmd_chanset(struct userrec *u, int idx, char *par)
   } else {
     if (strchr(CHANMETA, par[0])) {
       chname = newsplit(&par);
-      get_user_flagrec(u, &user, chname);
+      get_user_flagrec(dcc[idx].user, &user, chname);
       if (!glob_master(user) && !chan_master(user)) {
         dprintf(idx, "You don't have access to %s. \n", chname);
 	return;

src/mod/irc.mod/cmdsirc.c

@@ -61,7 +61,7 @@ static char *getnick(char *handle, struct chanset_t *chan)
   return NULL;
 }
 
-static void cmd_act(struct userrec *u, int idx, char *par)
+static void cmd_act(int idx, char *par)
 {
   char *chname = NULL;
   struct chanset_t *chan = NULL;
@@ -97,7 +97,7 @@ static void cmd_act(struct userrec *u, int idx, char *par)
   dprintf(idx, "Action to %s: %s\n", chan->dname, par);
 }
 
-static void cmd_msg(struct userrec *u, int idx, char *par)
+static void cmd_msg(int idx, char *par)
 {
   char *nick = NULL;
 
@@ -111,7 +111,7 @@ static void cmd_msg(struct userrec *u, int idx, char *par)
   }
 }
 
-static void cmd_say(struct userrec *u, int idx, char *par)
+static void cmd_say(int idx, char *par)
 {
   char *chname = NULL;
   struct chanset_t *chan = NULL;
@@ -145,7 +145,7 @@ static void cmd_say(struct userrec *u, int idx, char *par)
   dprintf(idx, "Said to %s: %s\n", chan->dname, par);
 }
 
-static void cmd_swhois(struct userrec *u, int idx, char *par)
+static void cmd_swhois(int idx, char *par)
 {
   char *server = NULL, *nick = NULL;
 
@@ -167,7 +167,7 @@ static void cmd_swhois(struct userrec *u, int idx, char *par)
   dprintf(DP_SERVER, "WHOIS %s %s\n", server, nick ? nick : "");
 }
 
-static void cmd_kickban(struct userrec *u, int idx, char *par)
+static void cmd_kickban(int idx, char *par)
 {
   struct chanset_t *chan = NULL;
   char *chname = NULL, *nick = NULL, *s1 = NULL, s[UHOSTLEN] = "", bantype = 0;
@@ -207,6 +207,7 @@ static void cmd_kickban(struct userrec *u, int idx, char *par)
   if (all)
     chan = chanset;
   while (chan) {
+    struct userrec *u = NULL;
 
     get_user_flagrec(dcc[idx].user, &user, chan->dname);
 
@@ -295,7 +296,7 @@ static void cmd_kickban(struct userrec *u, int idx, char *par)
   }
 }
 
-static void cmd_voice(struct userrec *u, int idx, char *par)
+static void cmd_voice(int idx, char *par)
 {
   struct chanset_t *chan = NULL;
   char *nick = NULL, s[UHOSTLEN] = "";
@@ -315,7 +316,7 @@ static void cmd_voice(struct userrec *u, int idx, char *par)
     chan = chanset;
   putlog(LOG_CMDS, "*", "#%s# (%s) voice %s", dcc[idx].nick, all ? "*" : chan->dname , nick);
   while (chan) {
-    if (!nick[0] && !(nick = getnick(u->handle, chan))) {
+    if (!nick[0] && !(nick = getnick(dcc[idx].nick, chan))) {
       if (all) goto next;
       dprintf(idx, "Usage: voice <nick> [channel|*]\n");
       return;
@@ -363,7 +364,7 @@ static void cmd_voice(struct userrec *u, int idx, char *par)
   }
 }
 
-static void cmd_devoice(struct userrec *u, int idx, char *par)
+static void cmd_devoice(int idx, char *par)
 {
   struct chanset_t *chan = NULL;
   char *nick = NULL, s[UHOSTLEN] = "";
@@ -383,7 +384,7 @@ static void cmd_devoice(struct userrec *u, int idx, char *par)
     chan = chanset;
   putlog(LOG_CMDS, "*", "#%s# (%s) devoice %s", dcc[idx].nick, all ? "*" : chan->dname, nick);
   while (chan) {
-  if (!nick[0] && !(nick = getnick(u->handle, chan))) {
+  if (!nick[0] && !(nick = getnick(dcc[idx].nick, chan))) {
     if (all) goto next;
     dprintf(idx, "Usage: devoice <nick> [channel|*]\n");
     return;
@@ -430,7 +431,7 @@ static void cmd_devoice(struct userrec *u, int idx, char *par)
 
 }
 
-static void cmd_op(struct userrec *u, int idx, char *par)
+static void cmd_op(int idx, char *par)
 {
   struct chanset_t *chan = NULL;
   char *nick = NULL, s[UHOSTLEN] = "";
@@ -451,8 +452,10 @@ static void cmd_op(struct userrec *u, int idx, char *par)
   putlog(LOG_CMDS, "*", "#%s# (%s) op %s", dcc[idx].nick, all ? "*" : chan->dname, nick);
 
   while (chan) {
+    struct userrec *u = NULL;
+
   get_user_flagrec(dcc[idx].user, &user, chan->dname);
-  if (!nick[0] && !(nick = getnick(u->handle, chan))) {
+  if (!nick[0] && !(nick = getnick(dcc[idx].nick, chan))) {
     if (all) goto next;
     dprintf(idx, "Usage: op <nick> [channel|*]\n");
     return;
@@ -513,7 +516,7 @@ static void cmd_op(struct userrec *u, int idx, char *par)
 
 }
 
-void cmd_mdop(struct userrec *u, int idx, char *par)
+static void cmd_mdop(int idx, char *par)
 {
   char *p = NULL, *chname = NULL;
   int force_bots = 0,
@@ -775,7 +778,7 @@ void mdop_request(char *botnick, char *code, char *par)
   tputs(serv, work, strlen(work));
 }
 
-static void cmd_deop(struct userrec *u, int idx, char *par)
+static void cmd_deop(int idx, char *par)
 {
   struct chanset_t *chan = NULL;
   char *nick = NULL, s[UHOSTLEN] = "";
@@ -797,9 +800,10 @@ static void cmd_deop(struct userrec *u, int idx, char *par)
   putlog(LOG_CMDS, "*", "#%s# (%s) deop %s", dcc[idx].nick, all ? "*" : chan->dname, nick);
 
   while (chan) {
+    struct userrec *u = NULL;
 
     get_user_flagrec(dcc[idx].user, &user, chan->dname);
-    if (!nick[0] && !(nick = getnick(u->handle, chan))) {
+    if (!nick[0] && !(nick = getnick(dcc[idx].nick, chan))) {
       if (all) goto next;  
       dprintf(idx, "Usage: deop <nick> [channel|*]\n");
       return;
@@ -861,7 +865,7 @@ static void cmd_deop(struct userrec *u, int idx, char *par)
   }
 }
 
-static void cmd_kick(struct userrec *u, int idx, char *par)
+static void cmd_kick(int idx, char *par)
 {
   struct chanset_t *chan = NULL;
   char *chname = NULL, *nick = NULL, s[UHOSTLEN] = "";
@@ -898,6 +902,7 @@ static void cmd_kick(struct userrec *u, int idx, char *par)
   if (all)
     chan = chanset;
   while (chan) {
+    struct userrec *u = NULL;
 
     get_user_flagrec(dcc[idx].user, &user, chan->dname);
 
@@ -959,7 +964,7 @@ static void cmd_kick(struct userrec *u, int idx, char *par)
   }
 }
 
-static void cmd_getkey(struct userrec *u, int idx, char *par)
+static void cmd_getkey(int idx, char *par)
 {
   struct chanset_t *chan = NULL;
 
@@ -994,7 +999,7 @@ static void cmd_getkey(struct userrec *u, int idx, char *par)
   dprintf(idx, "\n");
 }
 
-static void cmd_mop(struct userrec *u, int idx, char *par)
+static void cmd_mop(int idx, char *par)
 {
   struct chanset_t *chan = NULL;
   int found = 0, all = 0;
@@ -1047,7 +1052,7 @@ static void cmd_mop(struct userrec *u, int idx, char *par)
           sprintf(s, "%s!%s", m->nick, m->userhost);
           m->user = get_user_by_host(s);
         }
-        if (m->user && u_pass_match(u, "-"))
+        if (m->user && u_pass_match(dcc[idx].user, "-"))
           continue;		/* dont op users without a pass */
         get_user_flagrec(m->user, &victim, chan->dname);
         if (!chan_hasop(m) && !glob_bot(victim) && chk_op(victim, chan)) {
@@ -1072,7 +1077,7 @@ static void cmd_mop(struct userrec *u, int idx, char *par)
 }
 
 
-static void cmd_find(struct userrec *u, int idx, char *par)
+static void cmd_find(int idx, char *par)
 {
   struct chanset_t *chan = NULL, **cfound = NULL;
   memberlist *m = NULL, **found = NULL;
@@ -1150,7 +1155,7 @@ static void cmd_find(struct userrec *u, int idx, char *par)
   dprintf(idx, "--- Found %d matches.\n", fcount);
 }
 
-static void cmd_invite(struct userrec *u, int idx, char *par)
+static void cmd_invite(int idx, char *par)
 {
   struct chanset_t *chan = NULL;
   memberlist *m = NULL;
@@ -1213,7 +1218,7 @@ static void cmd_invite(struct userrec *u, int idx, char *par)
   }
 }
 
-static void cmd_authed(struct userrec *u, int idx, char *par)
+static void cmd_authed(int idx, char *par)
 {
   int i = 0;
   
@@ -1226,7 +1231,7 @@ static void cmd_authed(struct userrec *u, int idx, char *par)
   }
 }
 
-static void cmd_channel(struct userrec *u, int idx, char *par)
+static void cmd_channel(int idx, char *par)
 {
   char handle[HANDLEN + 1] = "", s[UHOSTLEN] = "", s1[UHOSTLEN] = "", atrflag = 0, chanflag[2] = "";
   struct chanset_t *chan = NULL;
@@ -1386,7 +1391,7 @@ static void cmd_channel(struct userrec *u, int idx, char *par)
   dprintf(idx, "%s\n", IRC_ENDCHANINFO);
 }
 
-static void cmd_topic(struct userrec *u, int idx, char *par)
+static void cmd_topic(int idx, char *par)
 {
   struct chanset_t *chan = NULL;
 
@@ -1423,7 +1428,7 @@ static void cmd_topic(struct userrec *u, int idx, char *par)
   }
 }
 
-static void cmd_resetbans(struct userrec *u, int idx, char *par)
+static void cmd_resetbans(int idx, char *par)
 {
   struct chanset_t *chan = NULL;
   char *chname = newsplit(&par);
@@ -1439,7 +1444,7 @@ static void cmd_resetbans(struct userrec *u, int idx, char *par)
   resetbans(chan);
 }
 
-static void cmd_resetexempts(struct userrec *u, int idx, char *par)
+static void cmd_resetexempts(int idx, char *par)
 {
   struct chanset_t *chan = NULL;
   char *chname = newsplit(&par);
@@ -1455,7 +1460,7 @@ static void cmd_resetexempts(struct userrec *u, int idx, char *par)
   resetexempts(chan);
 }
 
-static void cmd_resetinvites(struct userrec *u, int idx, char *par)
+static void cmd_resetinvites(int idx, char *par)
 {
   struct chanset_t *chan = NULL;
   char *chname = newsplit(&par);
@@ -1470,13 +1475,14 @@ static void cmd_resetinvites(struct userrec *u, int idx, char *par)
   resetinvites(chan);
 }
 
-static void cmd_adduser(struct userrec *u, int idx, char *par)
+static void cmd_adduser(int idx, char *par)
 {
   char *nick = NULL, *hand = NULL;
   struct chanset_t *chan = NULL;
+  struct userrec *u = NULL;
   memberlist *m = NULL;
   char s[UHOSTLEN] = "", s1[UHOSTLEN] = "", s2[MAXPASSLEN + 1] = "", s3[MAXPASSLEN + 1] = "", tmp[50] = "";
-  int atr = u ? u->flags : 0;
+  int atr = dcc[idx].user ? dcc[idx].user->flags : 0;
   int statichost = 0;
   char *p1 = s1;
 
@@ -1524,8 +1530,7 @@ static void cmd_adduser(struct userrec *u, int idx, char *par)
   if (strlen(hand) > HANDLEN)
     hand[HANDLEN] = 0;
   egg_snprintf(s, sizeof s, "%s!%s", m->nick, m->userhost);
-  u = get_user_by_host(s);
-  if (u) {
+  if ((u = get_user_by_host(s))) {
     dprintf(idx, "%s is already known as %s.\n", nick, u->handle);
     return;
   }
@@ -1574,11 +1579,12 @@ static void cmd_adduser(struct userrec *u, int idx, char *par)
 
 }
 
-static void cmd_deluser(struct userrec *u, int idx, char *par)
+static void cmd_deluser(int idx, char *par)
 {
   char *nick = NULL, s[UHOSTLEN] = "";
   struct chanset_t *chan = NULL;
   memberlist *m = NULL;
+  struct userrec *u = NULL;
 
   if (!par[0]) {
     dprintf(idx, "Usage: deluser <nick>\n");
@@ -1595,10 +1601,9 @@ static void cmd_deluser(struct userrec *u, int idx, char *par)
     dprintf(idx, "%s is not on any channels I monitor\n", nick);
     return;
   }
-  get_user_flagrec(u, &user, chan->dname);
+  get_user_flagrec(dcc[idx].user, &user, chan->dname);
   egg_snprintf(s, sizeof s, "%s!%s", m->nick, m->userhost);
-  u = get_user_by_host(s);
-  if (!u) {
+  if (!(u = get_user_by_host(s))) {
     dprintf(idx, "%s is not a valid user.\n", nick);
     return;
   }
@@ -1629,7 +1634,7 @@ static void cmd_deluser(struct userrec *u, int idx, char *par)
   }
 }
 
-static void cmd_reset(struct userrec *u, int idx, char *par)
+static void cmd_reset(int idx, char *par)
 {
   struct chanset_t *chan = NULL;
 
@@ -1641,7 +1646,7 @@ static void cmd_reset(struct userrec *u, int idx, char *par)
     if (!chan || private(user, chan, PRIV_OP)) {
       dprintf(idx, "%s\n", IRC_NOMONITOR);
     } else {
-      get_user_flagrec(u, &user, par);
+      get_user_flagrec(dcc[idx].user, &user, par);
       if (!glob_master(user) && !chan_master(user)) {
 	dprintf(idx, "You are not a master on %s.\n", chan->dname);
       } else if (!channel_active(chan)) {
@@ -1652,7 +1657,7 @@ static void cmd_reset(struct userrec *u, int idx, char *par)
 	reset_chan_info(chan);
       }
     }
-  } else if (!(u->flags & USER_MASTER)) {
+  } else if (!(dcc[idx].user->flags & USER_MASTER)) {
     dprintf(idx, "You are not a Bot Master.\n");
   } else {
     putlog(LOG_CMDS, "*", "#%s# reset all", dcc[idx].nick);

src/mod/notes.mod/cmdsnote.c

@@ -4,7 +4,7 @@
  *
  */
 
-static void cmd_fwd(struct userrec *u, int idx, char *par)
+static void cmd_fwd(int idx, char *par)
 {
   char *handle = NULL;
   struct userrec *u1 = NULL;
@@ -39,7 +39,7 @@ static void cmd_fwd(struct userrec *u, int idx, char *par)
   set_user(&USERENTRY_FWD, u1, par);
 }
 
-static void cmd_notes(struct userrec *u, int idx, char *par)
+static void cmd_notes(int idx, char *par)
 {
   char *fcn = NULL;
 
@@ -71,7 +71,7 @@ static void cmd_notes(struct userrec *u, int idx, char *par)
   putlog(LOG_CMDS, "*", "#%s# notes %s %s", dcc[idx].nick, fcn, par);
 }
 
-static void cmd_note(struct userrec *u, int idx, char *par)
+static void cmd_note(int idx, char *par)
 {
   char handle[512] = "", *p = NULL;
   int echo;

src/mod/server.mod/cmdsserv.c

@@ -4,7 +4,7 @@
  *
  */
 #ifdef LEAF
-static void cmd_servers(struct userrec *u, int idx, char *par)
+static void cmd_servers(int idx, char *par)
 {
   struct server_list *x = serverlist;
   int i;
@@ -32,7 +32,7 @@ static void cmd_servers(struct userrec *u, int idx, char *par)
   }
 }
 
-static void cmd_dump(struct userrec *u, int idx, char *par)
+static void cmd_dump(int idx, char *par)
 {
   putlog(LOG_CMDS, "*", "#%s# dump %s", dcc[idx].nick, par);
   if (!isowner(dcc[idx].nick)) {
@@ -46,7 +46,7 @@ static void cmd_dump(struct userrec *u, int idx, char *par)
   dprintf(DP_SERVER, "%s\n", par);
 }
 
-static void cmd_jump(struct userrec *u, int idx, char *par)
+static void cmd_jump(int idx, char *par)
 {
   char *other = NULL;
   int port;
@@ -67,7 +67,7 @@ static void cmd_jump(struct userrec *u, int idx, char *par)
   cycle_time = 0;
 }
 
-static void cmd_clearqueue(struct userrec *u, int idx, char *par)
+static void cmd_clearqueue(int idx, char *par)
 {
   int msgs;
 

src/mod/update.mod/update.c

@@ -441,7 +441,7 @@ void update_report(int idx, int details)
 }
 
 #ifdef HUB
-static void cmd_bupdate(struct userrec *u, int idx, char *par)
+static void cmd_bupdate(int idx, char *par)
 {
   int i;