9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master+sjoin-deadcode' of https://github.com/attilamolnar/charybdis

Browse source
This commit is contained in:
Jilles Tjoelker 2015-01-30 17:54:13 +01:00
commit 22e4a9bc2b
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/core/m_join.c
View file

@ -529,7 +529,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
int fl; int fl;
int isnew; int isnew;
int mlen_uid; int mlen_uid;
int len_nick;
int len_uid; int len_uid;
int len; int len;
int joins = 0; int joins = 0;
@ -778,7 +777,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
mbuf = modebuf; mbuf = modebuf;
para[0] = para[1] = para[2] = para[3] = empty; para[0] = para[1] = para[2] = para[3] = empty;
pargs = 0; pargs = 0;
len_nick = len_uid = 0; len_uid = 0;
/* if theres a space, theres going to be more than one nick, change the /* if theres a space, theres going to be more than one nick, change the
* first space to \0, so s is just the first nick, and point p to the * first space to \0, so s is just the first nick, and point p to the
@ -830,13 +829,11 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
if(fl & CHFL_CHANOP) if(fl & CHFL_CHANOP)
{ {
*ptr_uid++ = '@'; *ptr_uid++ = '@';
len_nick++;
len_uid++; len_uid++;
} }
if(fl & CHFL_VOICE) if(fl & CHFL_VOICE)
{ {
*ptr_uid++ = '+'; *ptr_uid++ = '+';
len_nick++;
len_uid++; len_uid++;
} }
} }