projects
/
ircu2.10.12-pk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Author: Kev <klmitch@mit.edu>
[ircu2.10.12-pk.git]
/
ircd
/
m_names.c
diff --git
a/ircd/m_names.c
b/ircd/m_names.c
index c04cf5c11069340e9d1f8ff48d9a1621b23ed459..f36a7672c39793cf14a8f1645d71763f4a69efef 100644
(file)
--- a/
ircd/m_names.c
+++ b/
ircd/m_names.c
@@
-149,7
+149,7
@@
void do_names(struct Client* sptr, struct Channel* chptr, int filter)
/* Iterate over all channel members, and build up the list. */
/* Iterate over all channel members, and build up the list. */
- mlen = strlen(
me.name) + 10 + strlen(sptr->name
);
+ mlen = strlen(
cli_name(&me)) + 10 + strlen(cli_name(sptr)
);
for (member = chptr->members; member; member = member->next_member)
{
for (member = chptr->members; member; member = member->next_member)
{
@@
-181,8
+181,8
@@
void do_names(struct Client* sptr, struct Channel* chptr, int filter)
strcat(buf, "+");
idx++;
}
strcat(buf, "+");
idx++;
}
- strcat(buf, c
2ptr->name
);
- idx += strlen(c
2ptr->name
) + 1;
+ strcat(buf, c
li_name(c2ptr)
);
+ idx += strlen(c
li_name(c2ptr)
) + 1;
flag = 1;
if (mlen + idx + NICKLEN + 5 > BUFSIZE)
/* space, modifier, nick, \r \n \0 */
flag = 1;
if (mlen + idx + NICKLEN + 5 > BUFSIZE)
/* space, modifier, nick, \r \n \0 */
@@
-251,7
+251,7
@@
int m_names(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
struct Channel *ch3ptr;
char buf[BUFSIZE];
struct Channel *ch3ptr;
char buf[BUFSIZE];
- mlen = strlen(
me.name) + 10 + strlen(sptr->name
);
+ mlen = strlen(
cli_name(&me)) + 10 + strlen(cli_name(sptr)
);
/* List all visible channels/visible members */
/* List all visible channels/visible members */
@@
-274,14
+274,14
@@
int m_names(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
idx = 5;
flag = 0;
idx = 5;
flag = 0;
- for (c2ptr = GlobalClientList; c2ptr; c2ptr = c
2ptr->next
)
+ for (c2ptr = GlobalClientList; c2ptr; c2ptr = c
li_next(c2ptr)
)
{
int showflag = 0;
if (!IsUser(c2ptr) || (sptr != c2ptr && IsInvisible(c2ptr)))
continue;
{
int showflag = 0;
if (!IsUser(c2ptr) || (sptr != c2ptr && IsInvisible(c2ptr)))
continue;
- member = c
2ptr->user->channel;
+ member = c
li_user(c2ptr)->channel;
while (member)
{
while (member)
{
@@
-296,9
+296,9
@@
int m_names(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
if (showflag) /* Have we already shown them? */
continue;
if (showflag) /* Have we already shown them? */
continue;
- strcat(buf, c
2ptr->name
);
+ strcat(buf, c
li_name(c2ptr)
);
strcat(buf, " ");
strcat(buf, " ");
- idx += strlen(c
2ptr->name
) + 1;
+ idx += strlen(c
li_name(c2ptr)
) + 1;
flag = 1;
if (mlen + idx + NICKLEN + 3 > BUFSIZE) /* space, \r\n\0 */
flag = 1;
if (mlen + idx + NICKLEN + 3 > BUFSIZE) /* space, \r\n\0 */
@@
-392,7
+392,7
@@
int ms_names(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
struct Channel *ch3ptr;
char buf[BUFSIZE];
struct Channel *ch3ptr;
char buf[BUFSIZE];
- mlen = strlen(
me.name) + 10 + strlen(sptr->name
);
+ mlen = strlen(
cli_name(&me)) + 10 + strlen(cli_name(sptr)
);
/* List all visible channels/visible members */
/* List all visible channels/visible members */
@@
-415,14
+415,14
@@
int ms_names(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
idx = 5;
flag = 0;
idx = 5;
flag = 0;
- for (c2ptr = GlobalClientList; c2ptr; c2ptr = c
2ptr->next
)
+ for (c2ptr = GlobalClientList; c2ptr; c2ptr = c
li_next(c2ptr)
)
{
int showflag = 0;
if (!IsUser(c2ptr) || (sptr != c2ptr && IsInvisible(c2ptr)))
continue;
{
int showflag = 0;
if (!IsUser(c2ptr) || (sptr != c2ptr && IsInvisible(c2ptr)))
continue;
- member = c
2ptr->user
->channel;
+ member = c
li_user(c2ptr)
->channel;
while (member)
{
while (member)
{
@@
-437,9
+437,9
@@
int ms_names(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
if (showflag) /* Have we already shown them? */
continue;
if (showflag) /* Have we already shown them? */
continue;
- strcat(buf, c
2ptr->name
);
+ strcat(buf, c
li_name(c2ptr)
);
strcat(buf, " ");
strcat(buf, " ");
- idx += strlen(c
2ptr->name
) + 1;
+ idx += strlen(c
li_name(c2ptr)
) + 1;
flag = 1;
if (mlen + idx + NICKLEN + 3 > BUFSIZE) /* space, \r\n\0 */
flag = 1;
if (mlen + idx + NICKLEN + 3 > BUFSIZE) /* space, \r\n\0 */