diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-07 16:49:03 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-07 16:49:03 +0000 |
| commit | b795233e374987f4c427f59922f271810f937eef (patch) | |
| tree | 047fafbeb99c4b12bcaadf046854af54e85dcad0 /src/map/guild.c | |
| parent | f4a6909849243c3e4776ddee4de962224e80ac9a (diff) | |
| download | hercules-b795233e374987f4c427f59922f271810f937eef.tar.gz hercules-b795233e374987f4c427f59922f271810f937eef.tar.bz2 hercules-b795233e374987f4c427f59922f271810f937eef.tar.xz hercules-b795233e374987f4c427f59922f271810f937eef.zip | |
Undid the memset->malloc_set replacement
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9626 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/guild.c')
| -rw-r--r-- | src/map/guild.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/guild.c b/src/map/guild.c index fc9defdbc..49d5dd0db 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -93,7 +93,7 @@ int guild_read_guildskill_tree_db(void) FILE *fp; char line[1024],*p; - malloc_set(guild_skill_tree,0,sizeof(guild_skill_tree)); + memset(guild_skill_tree,0,sizeof(guild_skill_tree)); sprintf(line, "%s/guild_skill_tree.txt", db_path); if( (fp=fopen(line,"r"))==NULL){ ShowError("can't read %s\n", line); @@ -169,7 +169,7 @@ static int guild_read_castledb(void) while(fgets(line,1020,fp)){ if(line[0]=='/' && line[1]=='/') continue; - malloc_tsetdword(str,0,sizeof(str)); + memset(str,0,sizeof(str)); for(j=0,p=line;j<6 && p;j++){ str[j]=p; p=strchr(p,','); @@ -321,7 +321,7 @@ void guild_makemember(struct guild_member *m,struct map_session_data *sd) { nullpo_retv(sd); - malloc_set(m,0,sizeof(struct guild_member)); + memset(m,0,sizeof(struct guild_member)); m->account_id =sd->status.account_id; m->char_id =sd->status.char_id; m->hair =sd->status.hair; @@ -840,7 +840,7 @@ int guild_member_leaved(int guild_id,int account_id,int char_id,int flag, else clif_guild_expulsion(online_member_sd, name, mes, account_id); - malloc_set(&g->member[i],0,sizeof(struct guild_member)); + memset(&g->member[i],0,sizeof(struct guild_member)); clif_guild_memberlist(online_member_sd); if(sd != NULL && sd->status.guild_id == guild_id) { |