* Removed a ton of unused paramaters

svn: 1217

Makefile.in

@@ -40,8 +40,11 @@ CFLGS = -fno-strict-aliasing -W -Wformat -Winline \
 -Wshadow -Wnested-externs -Wno-format-y2k \
 -Wlarger-than-2048 -Wpointer-arith -Wcast-align \
 -Waggrepate-return -Wlong-long -Wbad-function-cast \
+-Wunused-parameter \
 -Wmissing-noreturn @GCC3@
 
+#-Wunused-parameter
+
 #-Wwrite-strings
 #-Wconversion
 #-Wtraditional

src/botcmd.c

@@ -1004,7 +1004,7 @@ static void bot_join(int idx, char *par)
     touch_laston(u, TBUF, now);
   }
   i = addparty(bot, nick, chan, y[0], sock, par, &i2);
-  botnet_send_join_party(idx, linking, i2, i);
+  botnet_send_join_party(idx, linking, i2);
   if (i != chan) {
     if (i >= 0) {
       chanout_but(-1, i, "*** (%s) %s %s %s.\n", bot, nick, NET_LEFTTHE, i ? "channel" : "party line");

src/botmsg.c

@@ -460,7 +460,7 @@ void botnet_send_away(int idx, char *bot, int sock, char *msg, int linking)
   }
 }
 
-void botnet_send_join_idx(int useridx, int oldchan)
+void botnet_send_join_idx(int useridx)
 {
   size_t len;
 
@@ -473,7 +473,7 @@ void botnet_send_join_idx(int useridx, int oldchan)
   }
 }
 
-void botnet_send_join_party(int idx, int linking, int useridx, int oldchan)
+void botnet_send_join_party(int idx, int linking, int useridx)
 {
   size_t len;
 

src/botnet.c

@@ -1365,7 +1365,7 @@ static void eof_dcc_relay(int idx)
     chanout_but(-1, dcc[j].u.chat->channel, "*** %s %s.\n",
 		dcc[j].nick, BOT_PARTYREJOINED);
     if (dcc[j].u.chat->channel < GLOBAL_CHANS)
-      botnet_send_join_idx(j, -1);
+      botnet_send_join_idx(j);
   }
   check_bind_chon(dcc[j].nick, j);
   killsock(dcc[idx].sock);
@@ -1447,7 +1447,7 @@ static void dcc_relaying(int idx, char *buf, int j)
     chanout_but(-1, dcc[idx].u.relay->chat->channel,
 		"*** %s joined the party line.\n", dcc[idx].nick);
     if (dcc[idx].u.relay->chat->channel < GLOBAL_CHANS)
-      botnet_send_join_idx(idx, -1);
+      botnet_send_join_idx(idx);
   }
   ci = dcc[idx].u.relay->chat;
   free(dcc[idx].u.relay);

src/cfg.c

@@ -41,7 +41,7 @@ static void chanset_describe(struct cfg_entry * entry, int idx) {
 #endif /* HUB */
 
 #ifdef LEAF
-static void chanset_changed(struct cfg_entry *entry, char *olddata, int *valid) {
+static void chanset_changed(struct cfg_entry *entry, int *valid) {
   if (entry->ldata)
     strncpyz(cfg_glob_chanset, (char *) entry->ldata, 512);
   else if (entry->gdata)
@@ -65,7 +65,7 @@ static void servport_describe(struct cfg_entry * entry, int idx) {
 #endif /* HUB */
 
 #ifdef LEAF
-static void servport_changed(struct cfg_entry *entry, char *olddata, int *valid) {
+static void servport_changed(struct cfg_entry *entry, int *valid) {
   if (entry->ldata)
     default_port = atoi(entry->ldata);
   else if (entry->gdata)
@@ -151,7 +151,7 @@ static void cmdprefix_describe(struct cfg_entry *entry, int idx) {
 #endif /* HUB */
 
 #ifdef LEAF
-static void cmdprefix_changed(struct cfg_entry *entry, char *olddata, int *valid) {
+static void cmdprefix_changed(struct cfg_entry *entry, int *valid) {
   if (entry->ldata)
     cmdprefix = entry->ldata[0];
   else if (entry->gdata)
@@ -264,14 +264,14 @@ static void misc_describe(struct cfg_entry *cfgent, int idx)
 }
 #endif /* HUB */
 
-static void fork_lchanged(struct cfg_entry * cfgent, char * oldval, int * valid) {
+static void fork_lchanged(struct cfg_entry * cfgent, int * valid) {
   if (!cfgent->ldata)
     return;
   if (atoi(cfgent->ldata) <= 0)
     *valid = 0;
 }
 
-static void fork_gchanged(struct cfg_entry * cfgent, char * oldval, int * valid) {
+static void fork_gchanged(struct cfg_entry * cfgent, int * valid) {
   if (!cfgent->gdata)
     return;
   if (atoi(cfgent->gdata) <= 0)
@@ -292,7 +292,7 @@ struct cfg_entry CFG_FORKINTERVAL = {
 #endif /* HUB */
 };
 
-static void detect_lchanged(struct cfg_entry * cfgent, char * oldval, int * valid) {
+static void detect_lchanged(struct cfg_entry * cfgent, int * valid) {
   char *p = NULL;
 
   if (!(p = (char *) cfgent->ldata))
@@ -301,7 +301,7 @@ static void detect_lchanged(struct cfg_entry * cfgent, char * oldval, int * vali
     *valid = 0;
 }
 
-static void detect_gchanged(struct cfg_entry * cfgent, char * oldval, int * valid) {
+static void detect_gchanged(struct cfg_entry * cfgent, int * valid) {
   char *p = (char *) cfgent->ldata;
   if (!p)
     *valid=1;
@@ -354,7 +354,7 @@ struct cfg_entry CFG_PROCESSLIST = {
 };
 
 #ifdef LEAF
-static void servers_changed(struct cfg_entry * entry, char * olddata, int * valid) {
+static void servers_changed(struct cfg_entry * entry, int * valid) {
   char *slist = NULL, *p = NULL;
 
   if (!strcmp(entry->name, "servers")) {
@@ -404,7 +404,7 @@ struct cfg_entry CFG_SERVERS6 = {
 };
 
 #ifdef LEAF
-static void nick_changed(struct cfg_entry * entry, char * olddata, int * valid) {
+static void nick_changed(struct cfg_entry * entry, int * valid) {
   char *p = NULL;
 
   if (entry->ldata)
@@ -444,7 +444,7 @@ static void realname_describe(struct cfg_entry * entry, int idx) {
 #endif /* HUB */
 
 #ifdef LEAF
-static void realname_changed(struct cfg_entry * entry, char * olddata, int * valid) {
+static void realname_changed(struct cfg_entry * entry, int * valid) {
   if (entry->ldata)
     strncpyz(botrealname, (char *) entry->ldata, 121);
   else if (entry->gdata)
@@ -487,7 +487,7 @@ static void getin_describe(struct cfg_entry *cfgent, int idx)
 }
 #endif /* HUB */
 
-static void getin_changed(struct cfg_entry *cfgent, char *oldval, int *valid)
+static void getin_changed(struct cfg_entry *cfgent, int *valid)
 {
   int i;
 
@@ -675,7 +675,8 @@ void set_cfg_str(char *target, char *entryname, char *data)
       if (entry->localchanged) {
         int valid = 1;
 
-        entry->localchanged(entry, olddata, &valid);
+        /* entry->localchanged(entry, olddata, &valid); */
+        entry->localchanged(entry, &valid);
         if (!valid) {
           if (entry->ldata)
             free(entry->ldata);
@@ -703,7 +704,8 @@ void set_cfg_str(char *target, char *entryname, char *data)
     if (entry->globalchanged) {
       int valid = 1;
 
-      entry->globalchanged(entry, olddata, &valid);
+      /* entry->globalchanged(entry, olddata, &valid); */
+      entry->globalchanged(entry, &valid);
       if (!valid) {
         if (entry->gdata)
           free(entry->gdata);

src/cfg.h

@@ -13,8 +13,8 @@ typedef struct cfg_entry {
   int flags;
   char *gdata;
   char *ldata;
-  void (*globalchanged) (struct cfg_entry *, char *oldval, int *valid);
-  void (*localchanged) (struct cfg_entry *, char *oldval, int *valid);
+  void (*globalchanged) (struct cfg_entry *, int *valid);
+  void (*localchanged) (struct cfg_entry *, int *valid);
 #ifdef HUB
   void (*describe) (struct cfg_entry *, int idx);
 #endif /* HUB */

src/cmds.c

@@ -889,7 +889,7 @@ static void cmd_whois(struct userrec *u, int idx, char *par)
     return;
   }
   putlog(LOG_CMDS, "*", "#%s# whois %s", dcc[idx].nick, par);
-  tell_user_ident(idx, par, u ? (u->flags & USER_MASTER) : 0);
+  tell_user_ident(idx, par);
 }
 
 static void match(struct userrec *u, int idx, char *par, int isbot)
@@ -917,7 +917,7 @@ static void match(struct userrec *u, int idx, char *par, int isbot)
     } else
       limit = atoi(s1);
   }
-  tell_users_match(idx, s, start, limit, u ? (u->flags & USER_MASTER) : 0, chname, isbot);
+  tell_users_match(idx, s, start, limit, chname, isbot);
 }
 
 static void cmd_matchbot(struct userrec *u, int idx, char *par)
@@ -2253,7 +2253,7 @@ int check_dcc_attrs(struct userrec *u, flag_t oatr)
       if ((dcc[i].type == &DCC_CHAT) &&
 	  ((u->flags & (USER_OP | USER_MASTER | USER_OWNER))
 	   != (oatr & (USER_OP | USER_MASTER | USER_OWNER)))) {
-	botnet_send_join_idx(i, -1);
+	botnet_send_join_idx(i);
       }
       if ((oatr & USER_MASTER) && !(u->flags & USER_MASTER)) {
 	struct flag_record fr = {FR_CHAN | FR_ANYWH, 0, 0, 0 };
@@ -2355,7 +2355,7 @@ int check_dcc_chanattrs(struct userrec *u, char *chname, flag_t chflags, flag_t
       if ((dcc[i].type == &DCC_CHAT) &&
 	  ((chflags & (USER_OP | USER_MASTER | USER_OWNER))
 	   != (ochatr & (USER_OP | USER_MASTER | USER_OWNER))))
-	botnet_send_join_idx(i, -1);
+	botnet_send_join_idx(i);
       if ((ochatr & USER_MASTER) && !(chflags & USER_MASTER)) {
 	if (!(atr & USER_MASTER))
 	  dcc[i].u.chat->con_flags &= ~(LOG_MISC | LOG_CMDS);
@@ -2565,7 +2565,7 @@ static void cmd_chattr(struct userrec *u, int idx, char *par)
     }
     if (chan) {
       ocf = user.chan;
-      user.chan = chan_sanity_check((user.chan | pls.chan) & ~mns.chan, user.global);
+      user.chan = chan_sanity_check((user.chan | pls.chan) & ~mns.chan);
     }
     set_user_flagrec(u2, &user, par);
   }
@@ -2704,7 +2704,7 @@ static void cmd_chat(struct userrec *u, int idx, char *par)
 	chanout_but(-1, newchan, "*** %s joined the channel.\n", dcc[idx].nick);
       }
       if (newchan < GLOBAL_CHANS)
-	botnet_send_join_idx(idx, oldchan);
+	botnet_send_join_idx(idx);
       else if (oldchan < GLOBAL_CHANS)
 	botnet_send_part_idx(idx, "");
     }
@@ -4171,7 +4171,7 @@ static void cmd_quit(struct userrec *u, int idx, char *text)
 		dcc_chatter(idx);
 
 		if (dcc[idx].u.chat->channel < GLOBAL_CHANS && dcc[idx].u.chat->channel >= 0) {
-			botnet_send_join_idx(idx, -1);
+			botnet_send_join_idx(idx);
 		}
 	} else if ((dcc[idx].sock != STDOUT) || backgrd) {
 		killsock(dcc[idx].sock);

src/dcc.c

@@ -677,7 +677,7 @@ dcc_chat_secpass(int idx, char *buf, int atr)
       dcc[idx].u.chat->su_nick = NULL;
       dcc[idx].type = &DCC_CHAT;
       if (dcc[idx].u.chat->channel < GLOBAL_CHANS)
-        botnet_send_join_idx(idx, -1);
+        botnet_send_join_idx(idx);
       chanout_but(-1, dcc[idx].u.chat->channel, DCC_JOIN, dcc[idx].nick);
     } else {
       killsock(dcc[idx].sock);
@@ -739,7 +739,7 @@ dcc_chat_pass(int idx, char *buf, int atr)
       dcc[idx].u.chat->su_nick = NULL;
       dcc[idx].type = &DCC_CHAT;
       if (dcc[idx].u.chat->channel < GLOBAL_CHANS)
-        botnet_send_join_idx(idx, -1);
+        botnet_send_join_idx(idx);
       chanout_but(-1, dcc[idx].u.chat->channel, DCC_JOIN, dcc[idx].nick);
     } else {
       killsock(dcc[idx].sock);

src/dccutil.c

@@ -285,7 +285,7 @@ void dcc_chatter(int idx)
 
       if (dcc[idx].u.chat->channel >= 0) {
 	if (dcc[idx].u.chat->channel < GLOBAL_CHANS) {
-	  botnet_send_join_idx(idx, -1);
+	  botnet_send_join_idx(idx);
 	}
       }
     }

src/flags.c

@@ -72,7 +72,7 @@ sanity_check(flag_t atr, int bot)
 /* Sanity check on channel attributes
  */
 flag_t
-chan_sanity_check(flag_t chatr, flag_t atr)
+chan_sanity_check(flag_t chatr)
 {
   /* admin for chan does shit.. */
   if (chatr & USER_ADMIN)
@@ -319,7 +319,7 @@ set_user_flagrec(struct userrec *u, struct flag_record *fr, const char *chname)
     if (!noshare) {
       fr->match = FR_GLOBAL;
       build_flags(buffer, fr, NULL);
-      shareout(NULL, "a %s %s\n", u->handle, buffer);
+      shareout("a %s %s\n", u->handle, buffer);
     }
   }
 
@@ -340,7 +340,7 @@ set_user_flagrec(struct userrec *u, struct flag_record *fr, const char *chname)
       if (!noshare) {
         fr->match = FR_CHAN;
         build_flags(buffer, fr, NULL);
-        shareout(ch, "a %s %s %s\n", u->handle, buffer, chname);
+        shareout("a %s %s %s\n", u->handle, buffer, chname);
       }
     }
   }

src/flags.h

@@ -132,7 +132,7 @@ int build_flags(char *, struct flag_record *, struct flag_record *);
 int flagrec_eq(struct flag_record *, struct flag_record *);
 int flagrec_ok(struct flag_record *, struct flag_record *);
 flag_t sanity_check(flag_t, int);
-flag_t chan_sanity_check(flag_t, flag_t);
+flag_t chan_sanity_check(flag_t);
 char geticon(int);
 
 inline int private(struct flag_record, struct chanset_t *, int);

src/mod/channels.mod/userchan.c

@@ -32,7 +32,7 @@ struct chanuserrec *add_chanrec(struct userrec *u, char *chname)
     strncpy(ch->channel, chname, 81);
     ch->channel[80] = 0;
     if (!noshare)
-      shareout(findchan_by_dname(chname), "+cr %s %s\n", u->handle, chname);
+      shareout("+cr %s %s\n", u->handle, chname);
   }
   return ch;
 }
@@ -97,7 +97,7 @@ void set_handle_chaninfo(struct userrec *bu, char *handle, char *chname, char *i
     ch->info = NULL;
   cst = findchan_by_dname(chname);
   if ((!noshare) && (bu == userlist)) {
-    shareout(cst, "chchinfo %s %s %s\n", handle, chname, info ? info : "");
+    shareout("chchinfo %s %s %s\n", handle, chname, info ? info : "");
   }
 }
 
@@ -115,7 +115,7 @@ void del_chanrec(struct userrec *u, char *chname)
 	free(ch->info);
       free(ch);
       if (!noshare)
-	shareout(findchan_by_dname(chname), "-cr %s %s\n", u->handle, chname);
+	shareout("-cr %s %s\n", u->handle, chname);
       return;
     }
     lst = ch;
@@ -172,8 +172,7 @@ int u_setsticky_mask(struct chanset_t *chan, maskrec *u, char *uhost, int sticky
 	strcpy(uhost, u->mask);
 
       if (!noshare)
-        shareout(chan, "%s %s %d %s\n", botcmd, uhost, sticky,
-                                        (chan) ? chan->dname : "");
+        shareout("%s %s %d %s\n", botcmd, uhost, sticky, (chan) ? chan->dname : "");
       return 1;
     }
 
@@ -253,9 +252,9 @@ int u_delmask(char type, struct chanset_t *c, char *who, int doit)
       if (mask) {
 	/* Distribute chan bans differently */
 	if (c)
-	  shareout(c, "-%s %s %s\n", type == 'b' ? "bc" : type == 'e' ? "ec" : "invc", c->dname, mask);
+	  shareout("-%s %s %s\n", type == 'b' ? "bc" : type == 'e' ? "ec" : "invc", c->dname, mask);
 	else
-	  shareout(NULL, "-%s %s\n", type == 'b' ? "b" : type == 'e' ? "e" : "inv", mask);
+	  shareout("-%s %s\n", type == 'b' ? "b" : type == 'e' ? "e" : "inv", mask);
 	free(mask);
       }
     }
@@ -351,13 +350,13 @@ int u_addmask(char type, struct chanset_t *chan, char *who, char *from, char *no
 
     if (mask) {
       if (!chan)
-	shareout(NULL, "+%s %s %lu %s%s %s %s\n",
+	shareout("+%s %s %lu %s%s %s %s\n",
 		 type == 'b' ? "b" : type == 'e' ? "e" : "inv",
 		 mask, expire_time - now,
 		 (flags & MASKREC_STICKY) ? "s" : "",
 		 (flags & MASKREC_PERM) ? "p" : "-", from, note);
       else
-	shareout(chan, "+%s %s %lu %s %s%s %s %s\n",
+	shareout("+%s %s %lu %s %s%s %s %s\n",
 		 type == 'b' ? "bc" : type == 'e' ? "ec" : "invc",	
 		 mask, expire_time - now,
 		 chan->dname, (flags & MASKREC_STICKY) ? "s" : "",

src/mod/console.mod/console.c

@@ -123,8 +123,8 @@ console_set(struct userrec *u, struct user_entry *e, void *buf)
     egg_snprintf(string, sizeof string, "%s %s %s %d %d %d %d %d %d %d %d", ci->channel,
                  masktype(ci->conflags), stripmasktype(ci->stripflags), ci->echoflags, ci->page, ci->conchan,
                  ci->color, ci->banner, ci->channels, ci->bots, ci->whom);
-    /* shareout(NULL, "c %s %s %s\n", e->type->name, u->handle, string); */
-    shareout(NULL, "c CONSOLE %s %s\n", u->handle, string);
+    /* shareout("c %s %s %s\n", e->type->name, u->handle, string); */
+    shareout("c CONSOLE %s %s\n", u->handle, string);
   }
   return 1;
 }
@@ -289,7 +289,7 @@ console_chon(char *handle, int idx)
 
     }
     if ((dcc[idx].u.chat->channel >= 0) && (dcc[idx].u.chat->channel < GLOBAL_CHANS)) {
-      botnet_send_join_idx(idx, -1);
+      botnet_send_join_idx(idx);
     }
     if (info_party) {
       char *p = get_user(&USERENTRY_INFO, dcc[idx].user);

src/mod/ctcp.mod/ctcp.c

@@ -653,7 +653,7 @@ static void cloak_describe(struct cfg_entry *cfgent, int idx)
 }
 #endif /* HUB */
 
-static void cloak_changed(struct cfg_entry *cfgent, char *oldval, int *valid)
+static void cloak_changed(struct cfg_entry *cfgent, int *valid)
 {
   char *p = NULL;
   int i;

src/mod/irc.mod/irc.c

@@ -341,7 +341,7 @@ getin_request(char *botnick, char *code, char *par)
       if (wild_match((*mr)->mask, host) || wild_match((*mr)->mask, ip4host) ||
           wild_match((*mr)->mask, ip6host)) {
         if (!noshare) {
-          shareout(NULL, "-b %s\n", (*mr)->mask);
+          shareout("-b %s\n", (*mr)->mask);
         }
         putlog(LOG_GETIN, "*", "inreq from %s/%s for %s - Removed permanent global ban %s", botnick, nick,
                chan->dname, (*mr)->mask);
@@ -363,7 +363,7 @@ getin_request(char *botnick, char *code, char *par)
       if (wild_match((*mr)->mask, host) || wild_match((*mr)->mask, ip4host) ||
           wild_match((*mr)->mask, ip6host)) {
         if (!noshare) {
-          shareout(NULL, "-bc %s %s\n", chan->dname, (*mr)->mask);
+          shareout("-bc %s %s\n", chan->dname, (*mr)->mask);
         }
         putlog(LOG_GETIN, "*", "inreq from %s/%s for %s - Removed permanent channel ban %s", botnick, nick,
                chan->dname, (*mr)->mask);

src/mod/share.mod/share.c

@@ -50,8 +50,7 @@ static struct delay_mode *start_delay = NULL;
 #ifdef HUB
 static void start_sending_users(int);
 #endif /* HUB */
-static void shareout_but(struct chanset_t *chan, int, const char *, ...)
-  __attribute__ ((format(printf, 3, 4)));
+static void shareout_but(int, const char *, ...)  __attribute__ ((format(printf, 2, 3)));
 static void cancel_user_xfer(int, void *);
 
 #include "share.h"
@@ -137,7 +136,7 @@ share_stick_ban(int idx, char *par)
 #endif /* LEAF */
       if (u_setsticky_ban(NULL, host, yn) > 0) {
         putlog(LOG_CMDS, "@", "%s: %s %s", dcc[idx].nick, (yn) ? "stick" : "unstick", host);
-        shareout_but(NULL, idx, "s %s %d\n", host, yn);
+        shareout_but(idx, "s %s %d\n", host, yn);
       }
 #ifdef LEAF
       for (chan = chanset; chan != NULL; chan = chan->next)
@@ -150,7 +149,7 @@ share_stick_ban(int idx, char *par)
       if ((chan != NULL) && (cr = get_chanrec(dcc[idx].user, par)))
         if (u_setsticky_ban(chan, host, yn) > 0) {
           putlog(LOG_CMDS, "@", "%s: %s %s %s", dcc[idx].nick, (yn) ? "stick" : "unstick", host, par);
-          shareout_but(chan, idx, "s %s %d %s\n", host, yn, chan->dname);
+          shareout_but(idx, "s %s %d %s\n", host, yn, chan->dname);
           noshare = 0;
           return;
         }
@@ -180,7 +179,7 @@ share_stick_exempt(int idx, char *par)
     if (!par[0]) {              /* Global exempt */
       if (u_setsticky_exempt(NULL, host, yn) > 0) {
         putlog(LOG_CMDS, "@", "%s: %s %s", dcc[idx].nick, (yn) ? "stick" : "unstick", host);
-        shareout_but(NULL, idx, "se %s %d\n", host, yn);
+        shareout_but(idx, "se %s %d\n", host, yn);
       }
     } else {
       struct chanset_t *chan = findchan_by_dname(par);
@@ -189,7 +188,7 @@ share_stick_exempt(int idx, char *par)
       if ((chan != NULL) && (cr = get_chanrec(dcc[idx].user, par)))
         if (u_setsticky_exempt(chan, host, yn) > 0) {
           putlog(LOG_CMDS, "@", "%s: stick %s %c %s", dcc[idx].nick, host, yn ? 'y' : 'n', par);
-          shareout_but(chan, idx, "se %s %d %s\n", host, yn, chan->dname);
+          shareout_but(idx, "se %s %d %s\n", host, yn, chan->dname);
           noshare = 0;
           return;
         }
@@ -215,7 +214,7 @@ share_stick_invite(int idx, char *par)
     if (!par[0]) {              /* Global invite */
       if (u_setsticky_invite(NULL, host, yn) > 0) {
         putlog(LOG_CMDS, "@", "%s: %s %s", dcc[idx].nick, (yn) ? "stick" : "unstick", host);
-        shareout_but(NULL, idx, "sInv %s %d\n", host, yn);
+        shareout_but(idx, "sInv %s %d\n", host, yn);
       }
     } else {
       struct chanset_t *chan = findchan_by_dname(par);
@@ -224,7 +223,7 @@ share_stick_invite(int idx, char *par)
       if ((chan != NULL) && (cr = get_chanrec(dcc[idx].user, par)))
         if (u_setsticky_invite(chan, host, yn) > 0) {
           putlog(LOG_CMDS, "@", "%s: %s %s %s", dcc[idx].nick, (yn) ? "stick" : "unstick", host, par);
-          shareout_but(chan, idx, "sInv %s %d %s\n", host, yn, chan->dname);
+          shareout_but(idx, "sInv %s %d %s\n", host, yn, chan->dname);
           noshare = 0;
           return;
         }
@@ -244,7 +243,7 @@ share_chhand(int idx, char *par)
     hand = newsplit(&par);
     u = get_user_by_handle(userlist, hand);
     if (u) {
-      shareout_but(NULL, idx, "h %s %s\n", hand, par);
+      shareout_but(idx, "h %s %s\n", hand, par);
       noshare = 1;
       if (change_handle(u, par))
         putlog(LOG_CMDS, "@", "%s: handle %s->%s", dcc[idx].nick, hand, par);
@@ -270,7 +269,7 @@ share_chattr(int idx, char *par)
       cst = findchan_by_dname(par);
       if (!par[0] || cst) {
         if (!(dcc[idx].status & STAT_GETTING))
-          shareout_but(cst, idx, "a %s %s %s\n", hand, atr, par);
+          shareout_but(idx, "a %s %s %s\n", hand, atr, par);
         noshare = 1;
         if (par[0] && cst) {
           fr.match = FR_CHAN;
@@ -329,7 +328,7 @@ share_pls_chrec(int idx, char *par)
     if ((u = get_user_by_handle(userlist, user))) {
       chan = findchan_by_dname(par);
       noshare = 1;
-      shareout_but(chan, idx, "+cr %s %s\n", user, par);
+      shareout_but(idx, "+cr %s %s\n", user, par);
       if (!get_chanrec(u, par)) {
         add_chanrec(u, par);
         putlog(LOG_CMDS, "@", "%s: +chrec %s %s", dcc[idx].nick, user, par);
@@ -352,7 +351,7 @@ share_mns_chrec(int idx, char *par)
       chan = findchan_by_dname(par);
       noshare = 1;
       del_chanrec(u, par);
-      shareout_but(chan, idx, "-cr %s %s\n", user, par);
+      shareout_but(idx, "-cr %s %s\n", user, par);
       noshare = 0;
       putlog(LOG_CMDS, "@", "%s: -chrec %s %s", dcc[idx].nick, user, par);
     }
@@ -383,7 +382,7 @@ share_newuser(int idx, char *par)
       break_down_flags(par, &fr, NULL);
 
       /* If user already exists, ignore command */
-      shareout_but(NULL, idx, "n %s %s %s %s\n", nick, host, pass, par);
+      shareout_but(idx, "n %s %s %s %s\n", nick, host, pass, par);
 
       noshare = 1;
       if (strlen(nick) > HANDLEN)
@@ -421,7 +420,7 @@ share_killuser(int idx, char *par)
 
     noshare = 1;
     if (deluser(par)) {
-      shareout_but(NULL, idx, "k %s\n", par);
+      shareout_but(idx, "k %s\n", par);
 #ifndef LEAF
       putlog(LOG_CMDS, "@", "%s: killuser %s", dcc[idx].nick, par);
 #endif /* LEAF */
@@ -439,7 +438,7 @@ share_pls_host(int idx, char *par)
   if (dcc[idx].status & STAT_SHARE) {
     hand = newsplit(&par);
     if ((u = get_user_by_handle(userlist, hand))) {
-      shareout_but(NULL, idx, "+h %s %s\n", hand, par);
+      shareout_but(idx, "+h %s %s\n", hand, par);
       set_user(&USERENTRY_HOSTS, u, par);
 #ifdef LEAF
       check_this_user(u->handle, 0, NULL);
@@ -460,7 +459,7 @@ share_pls_bothost(int idx, char *par)
     hand = newsplit(&par);
     u = get_user_by_handle(userlist, hand);
     if (!(dcc[idx].status & STAT_GETTING))
-      shareout_but(NULL, idx, "+bh %s %s\n", hand, par);
+      shareout_but(idx, "+bh %s %s\n", hand, par);
     /* Add bot to userlist if not there */
     if (u) {
       if (!u->bot)
@@ -485,7 +484,7 @@ share_mns_host(int idx, char *par)
   if (dcc[idx].status & STAT_SHARE) {
     hand = newsplit(&par);
     if ((u = get_user_by_handle(userlist, hand))) {
-      shareout_but(NULL, idx, "-h %s %s\n", hand, par);
+      shareout_but(idx, "-h %s %s\n", hand, par);
       noshare = 1;
       delhost_by_handle(hand, par);
       noshare = 0;
@@ -517,7 +516,7 @@ share_change(int idx, char *par)
       putlog(LOG_ERROR, "*", "Ignore ch %s from %s (unknown type)", key, dcc[idx].nick);
     else {
       if (!(dcc[idx].status & STAT_GETTING))
-        shareout_but(NULL, idx, "c %s %s %s\n", key, hand, par);
+        shareout_but(idx, "c %s %s %s\n", key, hand, par);
       noshare = 1;
       if (!u && (uet == &USERENTRY_BOTADDR)) {
         char pass[30] = "";
@@ -560,7 +559,7 @@ share_chchinfo(int idx, char *par)
     if ((u = get_user_by_handle(userlist, hand))) {
       chan = newsplit(&par);
       cst = findchan_by_dname(chan);
-      shareout_but(cst, idx, "chchinfo %s %s %s\n", hand, chan, par);
+      shareout_but(idx, "chchinfo %s %s %s\n", hand, chan, par);
       noshare = 1;
       set_handle_chaninfo(userlist, hand, chan, par);
       noshare = 0;
@@ -573,7 +572,7 @@ static void
 share_mns_ban(int idx, char *par)
 {
   if (dcc[idx].status & STAT_SHARE) {
-    shareout_but(NULL, idx, "-b %s\n", par);
+    shareout_but(idx, "-b %s\n", par);
     putlog(LOG_CMDS, "@", "%s: cancel ban %s", dcc[idx].nick, par);
     str_unescape(par, '\\');
     noshare = 1;
@@ -593,7 +592,7 @@ static void
 share_mns_exempt(int idx, char *par)
 {
   if (dcc[idx].status & STAT_SHARE) {
-    shareout_but(NULL, idx, "-e %s\n", par);
+    shareout_but(idx, "-e %s\n", par);
     putlog(LOG_CMDS, "@", "%s: cancel exempt %s", dcc[idx].nick, par);
     str_unescape(par, '\\');
     noshare = 1;
@@ -613,7 +612,7 @@ static void
 share_mns_invite(int idx, char *par)
 {
   if (dcc[idx].status & STAT_SHARE) {
-    shareout_but(NULL, idx, "-inv %s\n", par);
+    shareout_but(idx, "-inv %s\n", par);
     putlog(LOG_CMDS, "@", "%s: cancel invite %s", dcc[idx].nick, par);
     str_unescape(par, '\\');
     noshare = 1;
@@ -638,7 +637,7 @@ share_mns_banchan(int idx, char *par)
   if (dcc[idx].status & STAT_SHARE) {
     chname = newsplit(&par);
     chan = findchan_by_dname(chname);
-    shareout_but(chan, idx, "-bc %s %s\n", chname, par);
+    shareout_but(idx, "-bc %s %s\n", chname, par);
     putlog(LOG_CMDS, "@", "%s: cancel ban %s on %s", dcc[idx].nick, par, chname);
     str_unescape(par, '\\');
     noshare = 1;
@@ -662,7 +661,7 @@ share_mns_exemptchan(int idx, char *par)
   if (dcc[idx].status & STAT_SHARE) {
     chname = newsplit(&par);
     chan = findchan_by_dname(chname);
-    shareout_but(chan, idx, "-ec %s %s\n", chname, par);
+    shareout_but(idx, "-ec %s %s\n", chname, par);
     putlog(LOG_CMDS, "@", "%s: cancel exempt %s on %s", dcc[idx].nick, par, chname);
     str_unescape(par, '\\');
     noshare = 1;
@@ -687,7 +686,7 @@ share_mns_invitechan(int idx, char *par)
   if (dcc[idx].status & STAT_SHARE) {
     chname = newsplit(&par);
     chan = findchan_by_dname(chname);
-    shareout_but(chan, idx, "-invc %s %s\n", chname, par);
+    shareout_but(idx, "-invc %s %s\n", chname, par);
     putlog(LOG_CMDS, "@", "%s: cancel invite %s on %s", dcc[idx].nick, par, chname);
     str_unescape(par, '\\');
     noshare = 1;
@@ -707,7 +706,7 @@ static void
 share_mns_ignore(int idx, char *par)
 {
   if (dcc[idx].status & STAT_SHARE) {
-    shareout_but(NULL, idx, "-i %s\n", par);
+    shareout_but(idx, "-i %s\n", par);
     putlog(LOG_CMDS, "@", "%s: cancel ignore %s", dcc[idx].nick, par);
     str_unescape(par, '\\');
     noshare = 1;
@@ -729,7 +728,7 @@ share_pls_ban(int idx, char *par)
   if (dcc[idx].status & STAT_SHARE) {
     int stick = 0;
 
-    shareout_but(NULL, idx, "+b %s\n", par);
+    shareout_but(idx, "+b %s\n", par);
     noshare = 1;
     ban = newsplit(&par);
     str_unescape(ban, '\\');
@@ -770,7 +769,7 @@ share_pls_banchan(int idx, char *par)
     tm = newsplit(&par);
     chname = newsplit(&par);
     chan = findchan_by_dname(chname);
-    shareout_but(chan, idx, "+bc %s %s %s %s\n", ban, tm, chname, par);
+    shareout_but(idx, "+bc %s %s %s %s\n", ban, tm, chname, par);
     str_unescape(ban, '\\');
     from = newsplit(&par);
     if (strchr(from, 's')) {
@@ -808,7 +807,7 @@ share_pls_exempt(int idx, char *par)
 #endif /* LEAF */
     int stick = 0;
 
-    shareout_but(NULL, idx, "+e %s\n", par);
+    shareout_but(idx, "+e %s\n", par);
     noshare = 1;
     exempt = newsplit(&par);
     str_unescape(exempt, '\\');
@@ -851,7 +850,7 @@ share_pls_exemptchan(int idx, char *par)
     tm = newsplit(&par);
     chname = newsplit(&par);
     chan = findchan_by_dname(chname);
-    shareout_but(chan, idx, "+ec %s %s %s %s\n", exempt, tm, chname, par);
+    shareout_but(idx, "+ec %s %s %s %s\n", exempt, tm, chname, par);
     str_unescape(exempt, '\\');
     from = newsplit(&par);
     if (strchr(from, 's')) {
@@ -889,7 +888,7 @@ share_pls_invite(int idx, char *par)
 #endif /* LEAF */
     int stick = 0;
 
-    shareout_but(NULL, idx, "+inv %s\n", par);
+    shareout_but(idx, "+inv %s\n", par);
     noshare = 1;
     invite = newsplit(&par);
     str_unescape(invite, '\\');
@@ -932,7 +931,7 @@ share_pls_invitechan(int idx, char *par)
     tm = newsplit(&par);
     chname = newsplit(&par);
     chan = findchan_by_dname(chname);
-    shareout_but(chan, idx, "+invc %s %s %s %s\n", invite, tm, chname, par);
+    shareout_but(idx, "+invc %s %s %s %s\n", invite, tm, chname, par);
     str_unescape(invite, '\\');
     from = newsplit(&par);
     if (strchr(from, 's')) {
@@ -964,7 +963,7 @@ share_pls_ignore(int idx, char *par)
   char *ign = NULL, *from = NULL, *ts = NULL;
 
   if (dcc[idx].status & STAT_SHARE) {
-    shareout_but(NULL, idx, "+i %s\n", par);
+    shareout_but(idx, "+i %s\n", par);
     noshare = 1;
     ign = newsplit(&par);
     str_unescape(ign, '\\');
@@ -1217,7 +1216,7 @@ sharein(int idx, char *msg)
 }
 
 void
-shareout(struct chanset_t *chan, const char *format, ...)
+shareout(const char *format, ...)
 {
   int i, l;
   char s[601] = "";
@@ -1238,7 +1237,7 @@ shareout(struct chanset_t *chan, const char *format, ...)
 }
 
 static void
-shareout_but(struct chanset_t *chan, int x, const char *format, ...)
+shareout_but(int x, const char *format, ...)
 {
   int i, l;
   char s[601] = "";

src/mod/share.mod/share.h

@@ -11,7 +11,7 @@
 #define UFF_EXEMPT	BIT2	/* Send exempts in user file	    */
 
 void sharein(int, char *);
-void shareout(struct chanset_t *, const char *, ...) __attribute__((format(printf, 2, 3)));
+void shareout(const char *, ...) __attribute__((format(printf, 1, 2)));
 void finish_share(int);
 void dump_resync(int);
 void share_report(int, int);

src/net.c

@@ -421,9 +421,9 @@ int real_getsock(int options, char *fname, int line)
   return sock;
 }
 
+#ifdef HAVE_SSL
 void dropssl(register int sock)
 {
-#ifdef HAVE_SSL
   int i;
 
   if (sock < 0)
@@ -439,8 +439,8 @@ void dropssl(register int sock)
     usleep(1000 * 500);
     socklist[i].ssl = NULL;
   }
-#endif /* HAVE_SSL */
 }
+#endif /* HAVE_SSL */
 
 /* Done with a socket
  */
@@ -455,7 +455,9 @@ void real_killsock(register int sock, const char *file, int line)
 
   for (i = 0; i < MAXSOCKS; i++) {
     if ((socklist[i].sock == sock) && !(socklist[i].flags & SOCK_UNUSED)) {
+#ifdef HAVE_SSL
       dropssl(sock);
+#endif /* HAVE_SSL */
       close(socklist[i].sock);
       if (socklist[i].inbuf != NULL) {
 	free(socklist[i].inbuf);
@@ -769,9 +771,9 @@ inline int open_listen_by_af(port_t *port, int af_def)
 #endif /* USE_IPV6 */
 }
 
+#ifdef HAVE_SSL
 int ssl_link(register int sock, int state)
 {
-#ifdef HAVE_SSL
   int err = 0, i = 0, errs = 0;
 
   debug2("ssl_link(%d, %d)", sock, state);
@@ -832,9 +834,9 @@ int ssl_link(register int sock, int state)
     putlog(LOG_ERROR, "*", "SSL_link(%d, %d) failed", sock, state);
     dropssl(socklist[i].sock);
   }
-#endif /* HAVE_SSL */
   return 0;
 }
+#endif /* HAVE_SSL */
 
 
 /* Given a network-style IP address, returns the hostname. The hostname

src/net.h

@@ -125,8 +125,8 @@ typedef struct {
 unsigned long my_atoul(char *);
 #ifdef HAVE_SSL
 int ssl_cleanup();
-#endif /* HAVE_SSL */
 int ssl_link(int, int);
+#endif /* HAVE_SSL */
 char *myipstr(int);
 IP getmyip();
 void cache_my_ip();
@@ -145,7 +145,6 @@ int real_getsock(int, char *, int);
 int sockprotocol(int);
 int hostprotocol(char *);
 char *hostnamefromip(IP);
-void dropssl(int);
 void real_killsock(int, const char *, int);
 int answer(int, char *, IP *, port_t *, int);
 int findanyidx(register int);

src/tandem.h

@@ -62,8 +62,8 @@ void botnet_send_zapf(int, char *, char *, char *);
 void botnet_send_zapf_broad(int, char *, char *, char *);
 void botnet_send_away(int, char *, int, char *, int);
 void botnet_send_idle(int, char *, int, int, char *);
-void botnet_send_join_idx(int, int);
-void botnet_send_join_party(int, int, int, int);
+void botnet_send_join_idx(int);
+void botnet_send_join_party(int, int, int);
 void botnet_send_part_idx(int, char *);
 void botnet_send_part_party(int, int, char *, int);
 void botnet_send_bye();

src/userent.c

@@ -113,7 +113,7 @@ int def_set(struct userrec *u, struct user_entry *e, void *buf)
     e->u.string = NULL;
   }
   if (!noshare) {
-    shareout(NULL, "c %s %s %s\n", e->type->name, u->handle, e->u.string ? e->u.string : "");
+    shareout("c %s %s %s\n", e->type->name, u->handle, e->u.string ? e->u.string : "");
   }
   return 1;
 }
@@ -225,7 +225,7 @@ int config_set(struct userrec *u, struct user_entry *e, void *buf)
   /* we will possibly free new below, so let's send the information
    * to the botnet now */
   if (!noshare && !cfg_noshare)
-    shareout(NULL, "c CONFIG %s %s %s\n", u->handle, new->key, new->data ? new->data : "");
+    shareout("c CONFIG %s %s %s\n", u->handle, new->key, new->data ? new->data : "");
   if ((old && old != new) || !new->data || !new->data[0]) {
     list_delete((struct list_type **) (&e->u.extra), (struct list_type *) old);
 
@@ -557,7 +557,7 @@ int pass_set(struct userrec *u, struct user_entry *e, void *buf)
     e->u.extra = strdup(new);
   }
   if (!noshare)
-    shareout(NULL, "c PASS %s %s\n", u->handle, pass ? pass : "");
+    shareout("c PASS %s %s\n", u->handle, pass ? pass : "");
   return 1;
 }
 
@@ -663,8 +663,8 @@ static int laston_set(struct userrec *u, struct user_entry *e, void *buf)
   }
 
   if (!noshare) {
-    /* shareout(NULL, "c %s %s %s\n", e->type->name, u->handle, string); */
-    shareout(NULL, "c LASTON %s %s %li\n", u->handle, li->lastonplace ? li->lastonplace : "-", li->laston);
+    /* shareout("c %s %s %s\n", e->type->name, u->handle, string); */
+    shareout("c LASTON %s %s %li\n", u->handle, li->lastonplace ? li->lastonplace : "-", li->laston);
   }
 
   return 1;
@@ -792,7 +792,7 @@ static int botaddr_set(struct userrec *u, struct user_entry *e, void *buf)
   }
   Assert(u);
   if (bi && !noshare) {
-    shareout(NULL, "c BOTADDR %s %s %d %d %d %s\n",u->handle, 
+    shareout("c BOTADDR %s %s %d %d %d %s\n",u->handle, 
             (bi->address && bi->address[0]) ? bi->address : "127.0.0.1", 
             bi->telnet_port, bi->relay_port, bi->hublevel, bi->uplink);
   }

src/userrec.c

@@ -443,7 +443,7 @@ int change_handle(struct userrec *u, char *newh)
   check_bind_nkch(u->handle, newh);
   /* Yes, even send bot nick changes now: */
   if (!noshare)
-    shareout(NULL, "h %s %s\n", u->handle, newh);
+    shareout("h %s %s\n", u->handle, newh);
   strncpyz(s, u->handle, sizeof s);
   strncpyz(u->handle, newh, sizeof u->handle);
   for (i = 0; i < dcc_total; i++)
@@ -508,7 +508,7 @@ struct userrec *adduser(struct userrec *bu, char *handle, char *host, char *pass
 
     fr.global = u->flags;
     build_flags(xx, &fr, 0);
-    shareout(NULL, "n %s%s %s %s %s\n", bot ? "-" : "", handle, host && host[0] ? host : "none", pass, xx);
+    shareout("n %s%s %s %s %s\n", bot ? "-" : "", handle, host && host[0] ? host : "none", pass, xx);
   }
   if (bu == NULL)
     bu = u;
@@ -581,7 +581,7 @@ int deluser(char *handle)
   else
     prev->next = u->next;
   if (!noshare && (handle[0] != '*'))
-    shareout(NULL, "k %s\n", handle);
+    shareout("k %s\n", handle);
   for (fnd = 0; fnd < dcc_total; fnd++)
     if (dcc[fnd].user == u)
       dcc[fnd].user = 0;	/* Clear any dcc users for this entry,
@@ -635,7 +635,7 @@ int delhost_by_handle(char *handle, char *host)
   if (!qprev)
     set_user(&USERENTRY_HOSTS, u, "none");
   if (!noshare && i)
-    shareout(NULL, "-h %s %s\n", handle, host);
+    shareout("-h %s %s\n", handle, host);
   clear_chanlist();
   return i;
 }
@@ -648,9 +648,9 @@ void addhost_by_handle(char *handle, char *host)
   /* u will be cached, so really no overhead, even tho this looks dumb: */
   if (!noshare) {
     if (u->bot)
-      shareout(NULL, "+bh %s %s\n", handle, host);
+      shareout("+bh %s %s\n", handle, host);
     else
-      shareout(NULL, "+h %s %s\n", handle, host);
+      shareout("+h %s %s\n", handle, host);
   }
   clear_chanlist();
 }

src/users.c

@@ -93,7 +93,7 @@ int delignore(char *ign)
       char *mask = str_escape(temp, ':', '\\');
 
       if (mask) {
-	shareout(NULL, "-i %s\n", mask);
+	shareout("-i %s\n", mask);
 	free(mask);
       }
     }
@@ -139,7 +139,7 @@ void addignore(char *ign, char *from, char *mnote, time_t expire_time)
     char *mask = str_escape(ign, ':', '\\');
 
     if (mask) {
-      shareout(NULL, "+i %s %li %c %s %s\n", mask, expire_time - now, (p->flags & IGREC_PERM) ? 'p' : '-', from, mnote);
+      shareout("+i %s %li %c %s %s\n", mask, expire_time - now, (p->flags & IGREC_PERM) ? 'p' : '-', from, mnote);
       free(mask);
     }
   }
@@ -444,7 +444,8 @@ static void restore_ignore(char *host)
   putlog(LOG_MISC, "*", "*** Malformed ignore line.");
 }
 
-void tell_user(int idx, struct userrec *u, int master)
+static void 
+tell_user(int idx, struct userrec *u)
 {
   char s[81] = "", s1[81] = "", format[81] = "";
   int n = 0;
@@ -509,7 +510,7 @@ void tell_user(int idx, struct userrec *u, int master)
 }
 
 /* show user by ident */
-void tell_user_ident(int idx, char *id, int master)
+void tell_user_ident(int idx, char *id)
 {
   char format[81] = "";
   struct userrec *u = NULL;
@@ -532,13 +533,13 @@ void tell_user_ident(int idx, char *id, int master)
     egg_snprintf(format, sizeof format, "%%-%us PASS NOTES FLAGS           LAST\n", HANDLEN);
     dprintf(idx, format, "HANDLE");
   }
-  tell_user(idx, u, master);
+  tell_user(idx, u);
 }
 
 /* match string:
  * wildcard to match nickname or hostmasks
  * +attr to find all with attr */
-void tell_users_match(int idx, char *mtch, int start, int limit, int master, char *chname, int isbot)
+void tell_users_match(int idx, char *mtch, int start, int limit, char *chname, int isbot)
 {
   char format[81] = "";
   struct userrec *u = NULL;
@@ -582,7 +583,7 @@ void tell_users_match(int idx, char *mtch, int start, int limit, int master, cha
 	if (nomns || !flagrec_eq(&mns, &user)) {
 	  cnt++;
 	  if ((cnt <= limit) && (cnt >= start))
-	    tell_user(idx, u, master);
+	    tell_user(idx, u);
 	  if (cnt == limit + 1)
 	    dprintf(idx, MISC_TRUNCATED, limit);
 	}
@@ -590,7 +591,7 @@ void tell_users_match(int idx, char *mtch, int start, int limit, int master, cha
     } else if (wild_match(mtch, u->handle)) {
       cnt++;
       if ((cnt <= limit) && (cnt >= start))
-	tell_user(idx, u, master);
+	tell_user(idx, u);
       if (cnt == limit + 1)
 	dprintf(idx, MISC_TRUNCATED, limit);
     } else {
@@ -600,7 +601,7 @@ void tell_users_match(int idx, char *mtch, int start, int limit, int master, cha
 	  cnt++;
 	  fnd = 1;
 	  if ((cnt <= limit) && (cnt >= start)) {
-	    tell_user(idx, u, master);
+	    tell_user(idx, u);
 	  }
 	  if (cnt == limit + 1)
 	    dprintf(idx, MISC_TRUNCATED, limit);

src/users.h

@@ -173,8 +173,8 @@ int match_ignore(char *);
 void check_expired_ignores();
 void autolink_cycle(char *);
 void tell_file_stats(int, char *);
-void tell_user_ident(int, char *, int);
-void tell_users_match(int, char *, int, int, int, char *, int);
+void tell_user_ident(int, char *);
+void tell_users_match(int, char *, int, int, char *, int);
 int readuserfile(const char *, struct userrec **);
 void check_pmode();
 void link_pref_val(struct userrec *u, char *lval);