update

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@821 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 14 insertions, 12 deletions

diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index 63e47a973..456fa0ac7 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -38,6 +38,7 @@
 #include "itemdb.h"
 #include "inter.h"
 #include "db.h"
+#include "malloc.h"
 
 #ifdef MEMWATCH
 #include "memwatch.h"
@@ -266,7 +267,7 @@ void read_gm_account(void) {
 	}
 	lsql_res = mysql_store_result(&lmysql_handle);
 	if (lsql_res) {
-		gm_account = calloc(sizeof(struct gm_account) * mysql_num_rows(lsql_res), 1);
+		gm_account = aCalloc(sizeof(struct gm_account) * mysql_num_rows(lsql_res), 1);
 		while ((lsql_row = mysql_fetch_row(lsql_res))) {
 			gm_account[GM_num].account_id = atoi(lsql_row[0]);
 			gm_account[GM_num].level = atoi(lsql_row[1]);
@@ -330,7 +331,7 @@ int mmo_char_tosql(int char_id, struct mmo_charstatus *p){
 	cp = numdb_search(char_db_,char_id);
 
 	if (cp == NULL) {
-		cp = (struct mmo_charstatus *) malloc(sizeof(struct mmo_charstatus));
+		cp = (struct mmo_charstatus *) aMalloc(sizeof(struct mmo_charstatus));
     		memset(cp, 0, sizeof(struct mmo_charstatus));
 		numdb_insert(char_db_, char_id,cp);
 	}
@@ -1130,7 +1131,7 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus *p, int online){
 
 	printf("char data load success]\n");	//ok. all data load successfuly!
 
-	cp = (struct mmo_charstatus *) malloc(sizeof(struct mmo_charstatus));
+	cp = (struct mmo_charstatus *) aMalloc(sizeof(struct mmo_charstatus));
     	memcpy(cp, p, sizeof(struct mmo_charstatus));
 	numdb_insert(char_db_, char_id,cp);
 
@@ -2804,8 +2805,8 @@ int parse_char(int fd) {
 int parse_console(char *buf) {
     char *type,*command;
 
-    type = (char *)malloc(64);
-    command = (char *)malloc(64);
+    type = (char *)aMalloc(64);
+    command = (char *)aMalloc(64);
 
     memset(type,0,64);
     memset(command,0,64);
diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c
index a30b9eb07..44ccdffbd 100644
--- a/src/char_sql/int_guild.c
+++ b/src/char_sql/int_guild.c
@@ -13,6 +13,7 @@
 #include "mmo.h"
 #include "socket.h"
 #include "db.h"
+#include "malloc.h"
 
 #include <string.h>
 #include <stdio.h>
@@ -332,7 +333,7 @@ struct guild * inter_guild_fromsql(int guild_id)
 	if (g != NULL)
 		return g;
 	
-	g = (struct guild *) malloc(sizeof(struct guild));
+	g = (struct guild *) aMalloc(sizeof(struct guild));
 	memset(g,0,sizeof(struct guild));
 	
 //	printf("Retrieve guild information from sql ......\n");
@@ -528,7 +529,7 @@ int inter_guildcastle_tosql(struct guild_castle *gc)
 
 	gcopy = numdb_search(castle_db_,gc->castle_id);
 	if (gcopy == NULL) {
-	  gcopy = (struct guild_castle *) malloc(sizeof(struct guild_castle));
+	  gcopy = (struct guild_castle *) aMalloc(sizeof(struct guild_castle));
 	  numdb_insert(castle_db_, gc->castle_id, gcopy);
 	} else {
             if ((gc->guild_id  == gcopy->guild_id ) && (  gc->economy  == gcopy->economy ) && ( gc->defense  == gcopy->defense ) && ( gc->triggerE  == gcopy->triggerE ) && ( gc->triggerD  == gcopy->triggerD ) && ( gc->nextTime  == gcopy->nextTime ) && ( gc->payTime  == gcopy->payTime ) && ( gc->createTime  == gcopy->createTime ) && ( gc->visibleC  == gcopy->visibleC ) && ( gc->visibleG0  == gcopy->visibleG0 ) && ( gc->visibleG1  == gcopy->visibleG1 ) && ( gc->visibleG2  == gcopy->visibleG2 ) && ( gc->visibleG3  == gcopy->visibleG3 ) && ( gc->visibleG4  == gcopy->visibleG4 ) && ( gc->visibleG5  == gcopy->visibleG5 ) && ( gc->visibleG6  == gcopy->visibleG6 ) && ( gc->visibleG7  == gcopy->visibleG7 ) && ( gc->Ghp0  == gcopy->Ghp0 ) && ( gc->Ghp1  == gcopy->Ghp1 ) && ( gc->Ghp2  == gcopy->Ghp2 ) && ( gc->Ghp3  == gcopy->Ghp3 ) && ( gc->Ghp4  == gcopy->Ghp4 ) && ( gc->Ghp5  == gcopy->Ghp5 ) && ( gc->Ghp6  == gcopy->Ghp6 ) && ( gc->Ghp7 == gcopy->Ghp7 ))
@@ -578,7 +579,7 @@ int inter_guildcastle_fromsql(int castle_id,struct guild_castle *gc)
 
 	gcopy = numdb_search(castle_db_,gc->castle_id);
 	if (gcopy == NULL) {
-	  gcopy = (struct guild_castle *) malloc(sizeof(struct guild_castle));
+	  gcopy = (struct guild_castle *) aMalloc(sizeof(struct guild_castle));
 	  numdb_insert(castle_db_, gc->castle_id, gcopy);
 	} else {
 	  memcpy(gc, gcopy, sizeof(struct guild_castle));
@@ -678,9 +679,9 @@ int inter_guild_sql_init()
         guild_castleinfoevent_db_=numdb_init();
 	
 	printf("interserver guild memory initialize.... (%d byte)\n",sizeof(struct guild));
-	guild_pt = calloc(sizeof(struct guild), 1);
-	guild_pt2= calloc(sizeof(struct guild), 1);
-	guildcastle_pt=calloc(sizeof(struct guild_castle), 1);
+	guild_pt = aCalloc(sizeof(struct guild), 1);
+	guild_pt2= aCalloc(sizeof(struct guild), 1);
+	guildcastle_pt=aCalloc(sizeof(struct guild_castle), 1);
 	
 	inter_guild_readdb(); // Read exp
 	
@@ -1096,7 +1097,7 @@ int mapif_guild_castle_alldataload(int fd) {
 
                         gcopy = numdb_search(castle_db_,gc->castle_id);
                         if (gcopy == NULL) {
-                            gcopy = (struct guild_castle *) malloc(sizeof(struct guild_castle));
+                            gcopy = (struct guild_castle *) aMalloc(sizeof(struct guild_castle));
                             numdb_insert(castle_db_, gc->castle_id, gcopy);
                         }
                         memcpy(gcopy, gc, sizeof(struct guild_castle));