*/
#include "stdinc.h"
-#include "tools.h"
#include "client.h"
#include "msg.h"
#include "parse.h"
tmp = LOCAL_COPY(nicks);
- for(name = strtoken(&p, tmp, ","); name; name = strtoken(&p, NULL, ","))
+ for(name = rb_strtok_r(tmp, ",", &p); name; name = rb_strtok_r(NULL, ",", &p))
{
if(EmptyString(name) || strlen(name) > NICKLEN-1)
continue;
- if(dlink_list_length(&client_p->localClient->monitor_list) >=
+ if(rb_dlink_list_length(&client_p->localClient->monitor_list) >=
ConfigFileEntry.max_monitor)
{
char buf[100];
sendto_one(client_p, "%s", offbuf);
if(p)
- snprintf(buf, sizeof(buf), "%s,%s", name, p);
+ rb_snprintf(buf, sizeof(buf), "%s,%s", name, p);
else
- snprintf(buf, sizeof(buf), "%s", name);
+ rb_snprintf(buf, sizeof(buf), "%s", name);
sendto_one(client_p, form_str(ERR_MONLISTFULL),
me.name, client_p->name,
monptr = find_monitor(name, 1);
/* already monitoring this nick */
- if(dlinkFind(client_p, &monptr->users))
+ if(rb_dlinkFind(client_p, &monptr->users))
continue;
- dlinkAddAlloc(client_p, &monptr->users);
- dlinkAddAlloc(monptr, &client_p->localClient->monitor_list);
+ rb_dlinkAddAlloc(client_p, &monptr->users);
+ rb_dlinkAddAlloc(monptr, &client_p->localClient->monitor_list);
if((target_p = find_named_person(name)) != NULL)
{
char *tmp;
char *p;
- if(!dlink_list_length(&client_p->localClient->monitor_list))
+ if(!rb_dlink_list_length(&client_p->localClient->monitor_list))
return;
tmp = LOCAL_COPY(nicks);
- for(name = strtoken(&p, tmp, ","); name; name = strtoken(&p, NULL, ","))
+ for(name = rb_strtok_r(tmp, ",", &p); name; name = rb_strtok_r(NULL, ",", &p))
{
if(EmptyString(name))
continue;
if((monptr = find_monitor(name, 0)) == NULL)
continue;
- dlinkFindDestroy(client_p, &monptr->users);
- dlinkFindDestroy(monptr, &client_p->localClient->monitor_list);
+ rb_dlinkFindDestroy(client_p, &monptr->users);
+ rb_dlinkFindDestroy(monptr, &client_p->localClient->monitor_list);
}
}
char buf[BUFSIZE];
struct monitor *monptr;
char *nbuf;
- dlink_node *ptr;
+ rb_dlink_node *ptr;
int mlen, arglen, cur_len;
- if(!dlink_list_length(&client_p->localClient->monitor_list))
+ if(!rb_dlink_list_length(&client_p->localClient->monitor_list))
{
sendto_one(client_p, form_str(RPL_ENDOFMONLIST),
me.name, client_p->name);
me.name, client_p->name, "");
nbuf = buf + mlen;
- DLINK_FOREACH(ptr, client_p->localClient->monitor_list.head)
+ RB_DLINK_FOREACH(ptr, client_p->localClient->monitor_list.head)
{
monptr = ptr->data;
char *onptr, *offptr;
int cur_onlen, cur_offlen;
int mlen, arglen;
- dlink_node *ptr;
+ rb_dlink_node *ptr;
mlen = cur_onlen = sprintf(onbuf, form_str(RPL_MONONLINE),
me.name, client_p->name, "");
onptr = onbuf + mlen;
offptr = offbuf + mlen;
- DLINK_FOREACH(ptr, client_p->localClient->monitor_list.head)
+ RB_DLINK_FOREACH(ptr, client_p->localClient->monitor_list.head)
{
monptr = ptr->data;