Fix -Wformat errors found in ircd-ratbox.

[solanum.git] / src / s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index ccae53f44f7efe0df2d8f4b5433a3aefb1a1461f..ce282f2e1e6014f2abfa09f6f87036d5f93024f1 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -152,7 +152,8 @@ show_lusers(struct Client *source_p)
 
        sendto_one_numeric(source_p, RPL_LUSERCLIENT, form_str(RPL_LUSERCLIENT),
                           (Count.total - Count.invisi),
-                          Count.invisi, rb_dlink_list_length(&global_serv_list));
+                          Count.invisi,
+                          (int)rb_dlink_list_length(&global_serv_list));
 
        if(rb_dlink_list_length(&oper_list) > 0)
                sendto_one_numeric(source_p, RPL_LUSEROP, 
@@ -161,7 +162,7 @@ show_lusers(struct Client *source_p)
        if(rb_dlink_list_length(&unknown_list) > 0)
                sendto_one_numeric(source_p, RPL_LUSERUNKNOWN, 
                                   form_str(RPL_LUSERUNKNOWN),
-                                  rb_dlink_list_length(&unknown_list));
+                                  (int)rb_dlink_list_length(&unknown_list));
 
        if(rb_dlink_list_length(&global_channel_list) > 0)
                sendto_one_numeric(source_p, RPL_LUSERCHANNELS, 
@@ -169,14 +170,14 @@ show_lusers(struct Client *source_p)
                                   rb_dlink_list_length(&global_channel_list));
 
        sendto_one_numeric(source_p, RPL_LUSERME, form_str(RPL_LUSERME),
-                          rb_dlink_list_length(&lclient_list),
-                          rb_dlink_list_length(&serv_list));
+                          (int)rb_dlink_list_length(&lclient_list),
+                          (int)rb_dlink_list_length(&serv_list));
 
        sendto_one_numeric(source_p, RPL_LOCALUSERS, 
                           form_str(RPL_LOCALUSERS),
-                          rb_dlink_list_length(&lclient_list),
+                          (int)rb_dlink_list_length(&lclient_list),
                           Count.max_loc,
-                          rb_dlink_list_length(&lclient_list),
+                          (int)rb_dlink_list_length(&lclient_list),
                           Count.max_loc);
 
        sendto_one_numeric(source_p, RPL_GLOBALUSERS, form_str(RPL_GLOBALUSERS),
@@ -1451,8 +1452,13 @@ change_nick_user_host(struct Client *target_p,   const char *nick, const char *use
 
                        *mptr = '\0';
 
-                       sendto_channel_local_butone(target_p, ALL_MEMBERS, chptr, ":%s!%s@%s JOIN :%s",
-                                       nick, user, host, chptr->chname);
+                       sendto_channel_local_with_capability_butone(target_p, ALL_MEMBERS, NOCAPS, CLICAP_EXTENDED_JOIN, chptr,
+                                                                   ":%s!%s@%s JOIN %s", nick, user, host, chptr->chname);
+                       sendto_channel_local_with_capability_butone(target_p, ALL_MEMBERS, CLICAP_EXTENDED_JOIN, NOCAPS, chptr,
+                                                                   ":%s!%s@%s JOIN %s %s :%s", nick, user, host, chptr->chname,
+                                                                   EmptyString(target_p->user->suser) ? "*" : target_p->user->suser,
+                                                                   target_p->info);
+
                        if(*mode)
                                sendto_channel_local_butone(target_p, ALL_MEMBERS, chptr,
                                                ":%s MODE %s +%s %s",