#include "sprintf_irc.h"
#include "ircd.h"
#include "numeric.h"
-#include "s_log.h"
+#include "logger.h"
#include "s_stats.h"
#include "send.h"
#include "msg.h"
#include "s_conf.h"
-#include "memory.h"
#include "s_serv.h"
#include "packet.h"
struct Message *mptr;
s_assert(MyConnect(client_p));
- s_assert(client_p->localClient->fd >= 0);
+ s_assert(client_p->localClient->F->fd >= 0);
if(IsAnyDead(client_p))
return;
/* didnt find any matching client, issue a kill */
if(from == NULL)
{
- ServerStats->is_unpf++;
+ ServerStats.is_unpf++;
remove_unknown(client_p, sender, pbuffer);
return;
}
/* fake direction, hmm. */
if(from->from != client_p)
{
- ServerStats->is_wrdi++;
+ ServerStats.is_wrdi++;
cancel_clients(client_p, from, pbuffer);
return;
}
if(*ch == '\0')
{
- ServerStats->is_empt++;
+ ServerStats.is_empt++;
return;
}
{
mptr = NULL;
numeric = ch;
- ServerStats->is_num++;
+ ServerStats.is_num++;
s = ch + 3; /* I know this is ' ' from above if */
*s++ = '\0'; /* blow away the ' ', and point s to next part */
}
me.name, from->name, ch);
}
}
- ServerStats->is_unco++;
+ ServerStats.is_unco++;
return;
}
int tl; /* current length of presently being built string in t */
for (i = 2; i < (parc - 1); i++)
{
- tl = ircsprintf(t, " %s", parv[i]);
+ tl = rb_sprintf(t, " %s", parv[i]);
t += tl;
}
- ircsprintf(t, " :%s", parv[parc - 1]);
+ rb_sprintf(t, " :%s", parv[parc - 1]);
}
if((target_p = find_client(parv[1])) != NULL)
return;
}
else if((chptr = find_channel(parv[1])) != NULL)
- sendto_channel_local(ALL_MEMBERS, chptr,
- ":%s %s %s %s",
- source_p->name, numeric, chptr->chname, buffer);
+ sendto_channel_flags(client_p, ALL_MEMBERS, source_p, chptr,
+ "%s %s%s",
+ numeric, chptr->chname, buffer);
}
static void do_alias(struct alias_entry *aptr, struct Client *source_p, char *text)