Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaced some free's with aFree

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@1208 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
celest 2005-03-07 16:01:20 +00:00
parent fb073b6c49
commit b5d12d7ea8
9 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/core.c
View File

@ -131,7 +131,7 @@ static void sig_dump(int sn)
fprintf(fp,"End of stack trace\n"); fprintf(fp,"End of stack trace\n");
fclose(fp); fclose(fp);
free(stack); aFree(stack);
} }
#endif #endif
// When pass the signal to the system's default handler // When pass the signal to the system's default handler

8
src/common/db.c
View File

@ -364,12 +364,12 @@ void db_free_unlock(struct dbt *table) {
for(i = 0; i < table->free_count ; i++) { for(i = 0; i < table->free_count ; i++) {
db_rebalance_erase(table->free_list[i].z,table->free_list[i].root); db_rebalance_erase(table->free_list[i].z,table->free_list[i].root);
if(table->cmp == strdb_cmp) { if(table->cmp == strdb_cmp) {
free(table->free_list[i].z->key); aFree(table->free_list[i].z->key);
} }
#ifdef MALLOC_DBN #ifdef MALLOC_DBN
free_dbn(table->free_list[i].z); free_dbn(table->free_list[i].z);
#else #else
free(table->free_list[i].z); aFree(table->free_list[i].z);
#endif #endif
table->item_count--; table->item_count--;
} }
@ -406,7 +406,7 @@ struct dbn* db_insert(struct dbt *table,void* key,void* data)
} else { } else {
table->free_count--; table->free_count--;
if(table->cmp == strdb_cmp) { if(table->cmp == strdb_cmp) {
free(p->key); aFree(p->key);
} }
} }
} }
@ -593,7 +593,7 @@ void db_final(struct dbt *table,int (*func)(void*,void*,va_list),...)
} }
} }
db_free_unlock(table); db_free_unlock(table);
free(table->free_list); aFree(table->free_list);
aFree(table); aFree(table);
va_end(ap); va_end(ap);
} }

2
src/map/log.h
View File

@ -29,6 +29,8 @@ extern struct Log_Config {
int branch, drop, mvpdrop, present, produce, refine, trade, vend, zeny, gm, npc; int branch, drop, mvpdrop, present, produce, refine, trade, vend, zeny, gm, npc;
char log_branch[32], log_drop[32], log_mvpdrop[32], log_present[32], log_produce[32], log_refine[32], log_trade[32], log_vend[32], log_gm[32], log_npc[32]; char log_branch[32], log_drop[32], log_mvpdrop[32], log_present[32], log_produce[32], log_refine[32], log_trade[32], log_vend[32], log_gm[32], log_npc[32];
char log_branch_db[32], log_drop_db[32], log_mvpdrop_db[32], log_present_db[32], log_produce_db[32], log_refine_db[32], log_trade_db[32], log_vend_db[32], log_gm_db[32], log_npc_db[32]; char log_branch_db[32], log_drop_db[32], log_mvpdrop_db[32], log_present_db[32], log_produce_db[32], log_refine_db[32], log_trade_db[32], log_vend_db[32], log_gm_db[32], log_npc_db[32];
int uptime;
char log_uptime[32];
} log_config; } log_config;
#endif #endif

28
src/map/map.c
View File

@ -1544,14 +1544,14 @@ int map_quit(struct map_session_data *sd) {
void *p = numdb_search(charid_db,sd->status.char_id); void *p = numdb_search(charid_db,sd->status.char_id);
if(p) { if(p) {
numdb_erase(charid_db,sd->status.char_id); numdb_erase(charid_db,sd->status.char_id);
free(p); aFree(p);
} }
} }
strdb_erase(nick_db,sd->status.name); strdb_erase(nick_db,sd->status.name);
numdb_erase(charid_db,sd->status.char_id); numdb_erase(charid_db,sd->status.char_id);
numdb_erase(id_db,sd->bl.id); numdb_erase(id_db,sd->bl.id);
free(sd->reg); aFree(sd->reg);
free(sd->regstr); aFree(sd->regstr);
return 0; return 0;
} }
@ -1953,7 +1953,7 @@ int map_setipport(char *name,unsigned long ip,int port) {
} else { } else {
// 読み込んでいるので置き換える // 読み込んでいるので置き換える
md = mdos->map; md = mdos->map;
free(mdos); aFree(mdos);
strdb_insert(map_db,md->name,md); strdb_insert(map_db,md->name,md);
} }
} else { } else {
@ -1973,7 +1973,7 @@ int map_eraseallipport_sub(void *key,void *data,va_list va) {
struct map_data_other_server *mdos = (struct map_data_other_server*)data; struct map_data_other_server *mdos = (struct map_data_other_server*)data;
if(mdos->gat == NULL && mdos->map == NULL) { if(mdos->gat == NULL && mdos->map == NULL) {
strdb_erase(map_db,key); strdb_erase(map_db,key);
free(mdos); aFree(mdos);
} }
return 0; return 0;
} }
@ -2005,7 +2005,7 @@ int map_eraseipport(char *name,unsigned long ip,int port)
return 1; // 呼び出し元で chrif_sendmap() をする return 1; // 呼び出し元で chrif_sendmap() をする
} else { } else {
strdb_erase(map_db,name); strdb_erase(map_db,name);
free(mdos); aFree(mdos);
} }
// if(battle_config.etc_log) // if(battle_config.etc_log)
// printf("erase map %s %d.%d.%d.%d:%d\n",name,p[0],p[1],p[2],p[3],port); // printf("erase map %s %d.%d.%d.%d:%d\n",name,p[0],p[1],p[2],p[3],port);
@ -2179,7 +2179,7 @@ int map_cache_read(struct map_data *m)
return 1; return 1;
} else { } else {
// なぜかファイル後半が欠けてるので読み直し // なぜかファイル後半が欠けてるので読み直し
m->xs = 0; m->ys = 0; m->gat = NULL; free(m->gat); m->xs = 0; m->ys = 0; m->gat = NULL; aFree(m->gat);
return 0; return 0;
} }
} else if(map_cache.map[i].compressed == 1) { } else if(map_cache.map[i].compressed == 1) {
@ -2195,19 +2195,19 @@ int map_cache_read(struct map_data *m)
if(fread(buf,1,size_compress,map_cache.fp) != size_compress) { if(fread(buf,1,size_compress,map_cache.fp) != size_compress) {
// なぜかファイル後半が欠けてるので読み直し // なぜかファイル後半が欠けてるので読み直し
printf("fread error\n"); printf("fread error\n");
free(m->gat); m->xs = 0; m->ys = 0; m->gat = NULL; aFree(m->gat); m->xs = 0; m->ys = 0; m->gat = NULL;
free(buf); aFree(buf);
return 0; return 0;
} }
dest_len = m->xs * m->ys; dest_len = m->xs * m->ys;
decode_zip(m->gat,&dest_len,buf,size_compress); decode_zip(m->gat,&dest_len,buf,size_compress);
if(dest_len != map_cache.map[i].xs * map_cache.map[i].ys) { if(dest_len != map_cache.map[i].xs * map_cache.map[i].ys) {
// 正常に解凍が出来てない // 正常に解凍が出来てない
free(m->gat); m->xs = 0; m->ys = 0; m->gat = NULL; aFree(m->gat); m->xs = 0; m->ys = 0; m->gat = NULL;
free(buf); aFree(buf);
return 0; return 0;
} }
free(buf); aFree(buf);
return 1; return 1;
} }
} }
@ -2262,7 +2262,7 @@ static int map_cache_write(struct map_data *m)
map_cache.map[i].water_height = map_waterheight(m->name); map_cache.map[i].water_height = map_waterheight(m->name);
map_cache.dirty = 1; map_cache.dirty = 1;
if(map_read_flag == 2) { if(map_read_flag == 2) {
free(write_buf); aFree(write_buf);
} }
return 0; return 0;
} }
@ -2293,7 +2293,7 @@ static int map_cache_write(struct map_data *m)
map_cache.head.filesize += len_new; map_cache.head.filesize += len_new;
map_cache.dirty = 1; map_cache.dirty = 1;
if(map_read_flag == 2) { if(map_read_flag == 2) {
free(write_buf); aFree(write_buf);
} }
return 0; return 0;
} }

2
src/map/npc.c
View File

@ -1889,7 +1889,7 @@ static int npc_parse_script(char *w1,char *w2,char *w3,char *w4,char *first_line
ev2 = strdb_search(ev_db,buf); ev2 = strdb_search(ev_db,buf);
if(ev2 != NULL) { if(ev2 != NULL) {
printf("npc_parse_script : duplicate event %s\n",buf); printf("npc_parse_script : duplicate event %s\n",buf);
free(ev2); aFree(ev2);
} }
strdb_insert(ev_db,buf,ev); strdb_insert(ev_db,buf,ev);
} }

4
src/map/pc.c
View File

@ -5849,7 +5849,7 @@ int pc_deleventtimer(struct map_session_data *sd,const char *name)
delete_timer(sd->eventtimer[i],pc_eventtimer); delete_timer(sd->eventtimer[i],pc_eventtimer);
sd->eventtimer[i]=-1; sd->eventtimer[i]=-1;
sd->eventcount--; sd->eventcount--;
free(p); aFree(p);
break; break;
} }
} }
@ -5895,7 +5895,7 @@ int pc_cleareventtimer(struct map_session_data *sd)
char *p = (char *)(get_timer(sd->eventtimer[i])->data); char *p = (char *)(get_timer(sd->eventtimer[i])->data);
delete_timer(sd->eventtimer[i],pc_eventtimer); delete_timer(sd->eventtimer[i],pc_eventtimer);
sd->eventtimer[i]=-1; sd->eventtimer[i]=-1;
free(p); aFree(p);
} }
return 0; return 0;

2
src/map/pet.c
View File

@ -1682,7 +1682,7 @@ int do_final_pet(void) {
int i; int i;
for(i = 0;i < MAX_PET_DB; i++) { for(i = 0;i < MAX_PET_DB; i++) {
if(pet_db[i].script) { if(pet_db[i].script) {
free(pet_db[i].script); aFree(pet_db[i].script);
} }
} }
return 0; return 0;

2
src/map/script.c
View File

@ -6333,7 +6333,7 @@ int buildin_select(struct script_state *st)
strcat(buf,":"); strcat(buf,":");
} }
clif_scriptmenu(script_rid2sd(st),st->oid,buf); clif_scriptmenu(script_rid2sd(st),st->oid,buf);
free(buf); aFree(buf);
} else if(sd->npc_menu==0xff){ // cansel } else if(sd->npc_menu==0xff){ // cansel
sd->state.menu_or_input=0; sd->state.menu_or_input=0;
st->state=END; st->state=END;

2
src/map/skill.c
View File

@ -8565,7 +8565,7 @@ int skill_unit_move_unit_group( struct skill_unit_group *group, int m,int dx,int
&unit1->bl,tick,1); &unit1->bl,tick,1);
} }
} }
free(m_flag); aFree(m_flag);
return 0; return 0;
} }