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
/
DBHelper.c
diff --git
a/src/DBHelper.c
b/src/DBHelper.c
index 69bdf44fdd79b1e3f8de6fbccfd9e571a40656c9..6e2f84385c99a44abcd9b7f5c32b754ea66832ee 100644
(file)
--- a/
src/DBHelper.c
+++ b/
src/DBHelper.c
@@
-27,6
+27,7
@@
#include "ClientSocket.h"
#include "bots.h"
#include "ConfigParser.h"
#include "ClientSocket.h"
#include "bots.h"
#include "ConfigParser.h"
+#include "log.h"
void _loadUserSettings(struct UserNode *user) {
SYNCHRONIZE(cache_sync);
void _loadUserSettings(struct UserNode *user) {
SYNCHRONIZE(cache_sync);
@@
-298,7
+299,7
@@
static void event_user_registered(struct UserNode *user, char *new_mask) {
if ((row = mysql_fetch_row(res)) != NULL) {
struct event_user_registered_cache *cache = malloc(sizeof(*cache));
if (!cache) {
if ((row = mysql_fetch_row(res)) != NULL) {
struct event_user_registered_cache *cache = malloc(sizeof(*cache));
if (!cache) {
- p
error("malloc() failed"
);
+ p
rintf_log("main", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__
);
return;
}
cache->user = user;
return;
}
cache->user = user;