projects
/
umurmur.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle protobuf unpacking errors. Unhandled errors caused segfault when old client...
[umurmur.git]
/
src
/
channel.c
diff --git
a/src/channel.c
b/src/channel.c
index c308dc4d403959ab02ce68bc22ce05c2d8573ba3..c3ddda8377ed939b211778e153b3094498643a70 100644
(file)
--- a/
src/channel.c
+++ b/
src/channel.c
@@
-254,7
+254,7
@@
void Chan_addChannel(channel_t *parent, channel_t *ch)
}
}
-int Chan_
play
erLeave(client_t *client)
+int Chan_
us
erLeave(client_t *client)
{
channel_t *leaving = NULL;
int leaving_id = -1;
{
channel_t *leaving = NULL;
int leaving_id = -1;
@@
-270,20
+270,20
@@
int Chan_playerLeave(client_t *client)
return leaving_id;
}
return leaving_id;
}
-int Chan_
play
erJoin(channel_t *ch, client_t *client)
+int Chan_
us
erJoin(channel_t *ch, client_t *client)
{
int leaving_id;
{
int leaving_id;
- Log_debug("Add
player %s to channel %s", client->playerN
ame, ch->name);
+ Log_debug("Add
user %s to channel %s", client->usern
ame, ch->name);
/* Only allowed in one channel at a time */
/* Only allowed in one channel at a time */
- leaving_id = Chan_
play
erLeave(client);
+ leaving_id = Chan_
us
erLeave(client);
list_add_tail(&client->chan_node, &ch->clients);
client->channel = (void *)ch;
return leaving_id;
}
list_add_tail(&client->chan_node, &ch->clients);
client->channel = (void *)ch;
return leaving_id;
}
-int Chan_
play
erJoin_id(int channelid, client_t *client)
+int Chan_
us
erJoin_id(int channelid, client_t *client)
{
channel_t *ch_itr = NULL;
do {
{
channel_t *ch_itr = NULL;
do {
@@
-294,10
+294,10
@@
int Chan_playerJoin_id(int channelid, client_t *client)
return -1;
}
else
return -1;
}
else
- return Chan_
playerJoin(ch_itr, client);
+ return Chan_
userJoin(ch_itr, client);
}
}
-bool_t Chan_
play
erJoin_id_test(int channelid)
+bool_t Chan_
us
erJoin_id_test(int channelid)
{
channel_t *ch_itr = NULL;
do {
{
channel_t *ch_itr = NULL;
do {