projects
/
NeonServV5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added blackjack game
[NeonServV5.git]
/
src
/
UserNode.c
diff --git
a/src/UserNode.c
b/src/UserNode.c
index a622bae1b4954ff8e9628e975188eb49f35cd3c5..cd8735e8f5ba7716b4cb5c3996d04b1353d53c7f 100644
(file)
--- a/
src/UserNode.c
+++ b/
src/UserNode.c
@@
-1,4
+1,4
@@
-/* UserNode.c - NeonServ v5.
5
+/* UserNode.c - NeonServ v5.
6
* Copyright (C) 2011-2012 Philipp Kreil (pk910)
*
* This program is free software: you can redistribute it and/or modify
* Copyright (C) 2011-2012 Philipp Kreil (pk910)
*
* This program is free software: you can redistribute it and/or modify
@@
-20,6
+20,7
@@
#include "tools.h"
#include "IRCEvents.h"
#include "IPNode.h"
#include "tools.h"
#include "IRCEvents.h"
#include "IPNode.h"
+#include "log.h"
static struct UserNode **userList;
static struct UserNode **userList;
@@
-288,7
+289,7
@@
struct UserNode* addUser(const char *nick) {
struct UserNode *user = malloc(sizeof(*user));
if (!user)
{
struct UserNode *user = malloc(sizeof(*user));
if (!user)
{
- p
error("malloc() failed"
);
+ p
rintf_log("main", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__
);
return NULL;
}
strcpy(user->nick, nick);
return NULL;
}
strcpy(user->nick, nick);
@@
-350,7
+351,7
@@
struct UserNode* createTempUser(const char *nick) {
if(!user) {
user = malloc(sizeof(*user));
if (!user) {
if(!user) {
user = malloc(sizeof(*user));
if (!user) {
- p
error("malloc() failed"
);
+ p
rintf_log("main", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__
);
return NULL;
}
user->ident[0] = 0;
return NULL;
}
user->ident[0] = 0;
@@
-398,7
+399,7
@@
struct UserNode* createTempUserMask(const char *mask) {
if(!user) {
user = malloc(sizeof(*user));
if (!user) {
if(!user) {
user = malloc(sizeof(*user));
if (!user) {
- p
error("malloc() failed"
);
+ p
rintf_log("main", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__
);
return NULL;
}
user->ident[0] = 0;
return NULL;
}
user->ident[0] = 0;
@@
-421,7
+422,7
@@
struct UserNode* createTempUserMask(const char *mask) {
user = malloc(sizeof(*user));
if (!user)
{
user = malloc(sizeof(*user));
if (!user)
{
- p
error("malloc() failed"
);
+ p
rintf_log("main", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__
);
return NULL;
}
strcpy(user->host, cmask);
return NULL;
}
strcpy(user->host, cmask);
@@
-448,7
+449,7
@@
struct UserNode* createTempUserMask(const char *mask) {
user = malloc(sizeof(*user));
if (!user)
{
user = malloc(sizeof(*user));
if (!user)
{
- p
error("malloc() failed"
);
+ p
rintf_log("main", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__
);
return NULL;
}
strcpy(user->nick, cmask);
return NULL;
}
strcpy(user->nick, cmask);