projects
/
NeonServV5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'development'
[NeonServV5.git]
/
src
/
ChanUser.c
diff --git
a/src/ChanUser.c
b/src/ChanUser.c
index 63777258e1b5e133582f8223d08e4ed7145b0f3e..e18ce4dd57590d7a718f13cebfda8edfadd02243 100644
(file)
--- a/
src/ChanUser.c
+++ b/
src/ChanUser.c
@@
-19,15
+19,13
@@
#include "ChanNode.h"
#include "ModeNode.h"
#include "UserNode.h"
#include "ChanNode.h"
#include "ModeNode.h"
#include "UserNode.h"
+#include "log.h"
struct ChanUser* addChanUser(struct ChanNode *chan, struct UserNode *user) {
struct ChanUser* addChanUser(struct ChanNode *chan, struct UserNode *user) {
- if(isUserOnChan(user, chan)) {
- putlog(LOGLEVEL_ERROR, "CACHE FAIL");
- }
struct ChanUser *chanuser = malloc(sizeof(*chanuser));
if (!chanuser)
{
struct ChanUser *chanuser = malloc(sizeof(*chanuser));
if (!chanuser)
{
- p
error("malloc() failed"
);
+ p
rintf_log("main", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__
);
return NULL;
}
chanuser->flags = 0;
return NULL;
}
chanuser->flags = 0;
@@
-56,7
+54,7
@@
struct ChanUser* addInvisibleChanUser(struct ChanNode *chan, struct UserNode *us
struct ChanUser *chanuser = malloc(sizeof(*chanuser));
if (!chanuser)
{
struct ChanUser *chanuser = malloc(sizeof(*chanuser));
if (!chanuser)
{
- p
error("malloc() failed"
);
+ p
rintf_log("main", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__
);
return NULL;
}
chanuser->flags = CHANUSERFLAG_INVISIBLE;
return NULL;
}
chanuser->flags = CHANUSERFLAG_INVISIBLE;