diff options
Diffstat (limited to 'src/char')
| -rw-r--r-- | src/char/char.c | 6 | ||||
| -rw-r--r-- | src/char/int_guild.c | 8 | ||||
| -rw-r--r-- | src/char/int_homun.c | 2 | ||||
| -rw-r--r-- | src/char/int_party.c | 2 | ||||
| -rw-r--r-- | src/char/int_pet.c | 2 | ||||
| -rw-r--r-- | src/char/int_storage.c | 4 | ||||
| -rw-r--r-- | src/char/inter.c | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/src/char/char.c b/src/char/char.c index d56c79b28..c99c1e3c4 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -1003,7 +1003,7 @@ int mmo_char_init(void) if (!char_dat) { ShowFatalError("Out of memory: mmo_char_init (realloc of char_dat).\n"); char_log("Out of memory: mmo_char_init (realloc of char_dat).\n"); - exit(1); + exit(EXIT_FAILURE); } } @@ -1227,7 +1227,7 @@ int make_new_char(struct char_session_data* sd, char* name_, int str, int agi, i if (!char_dat) { ShowFatalError("Out of memory: make_new_char (realloc of char_dat).\n"); char_log("Out of memory: make_new_char (realloc of char_dat).\n"); - exit(1); + exit(EXIT_FAILURE); } } @@ -1993,7 +1993,7 @@ int parse_fromlogin(int fd) ShowError("The server communication passwords (default s1/p1) are probably invalid.\n"); ShowInfo("Also, please make sure your accounts file (default: accounts.txt) has those values present.\n"); ShowInfo("The communication passwords can be changed in map_athena.conf and char_athena.conf\n"); - //exit(1); //fixed for server shutdown. + //exit(EXIT_FAILURE); //fixed for server shutdown. } else { ShowStatus("Connected to login-server (connection #%d).\n", fd); diff --git a/src/char/int_guild.c b/src/char/int_guild.c index 52514692c..2bf3e0a41 100644 --- a/src/char/int_guild.c +++ b/src/char/int_guild.c @@ -391,7 +391,7 @@ int inter_guild_init() { g = (struct guild *) aCalloc(sizeof(struct guild), 1); if(g == NULL){ ShowFatalError("int_guild: out of memory!\n"); - exit(0); + exit(EXIT_FAILURE); } // memset(g, 0, sizeof(struct guild)); not needed... if (inter_guild_fromstr(line, g) == 0 && g->guild_id > 0) { @@ -420,7 +420,7 @@ int inter_guild_init() { gc = (struct guild_castle *) aCalloc(sizeof(struct guild_castle), 1); if(gc == NULL){ ShowFatalError("int_guild: out of memory!\n"); - exit(0); + exit(EXIT_FAILURE); } // memset(gc, 0, sizeof(struct guild_castle)); No need... if (inter_guildcastle_fromstr(line, gc) == 0) { @@ -439,7 +439,7 @@ int inter_guild_init() { gc = (struct guild_castle *) aCalloc(sizeof(struct guild_castle), 1); if (gc == NULL) { ShowFatalError("int_guild: out of memory!\n"); - exit(0); + exit(EXIT_FAILURE); } gc->castle_id = i; idb_put(castle_db, gc->castle_id, gc); @@ -979,7 +979,7 @@ int mapif_parse_CreateGuild(int fd, int account_id, char *name, struct guild_mem if (g == NULL) { ShowFatalError("int_guild: CreateGuild: out of memory !\n"); mapif_guild_created(fd, account_id, NULL); - exit(0); + exit(EXIT_FAILURE); } // memset(g, 0, sizeof(struct guild)); Meh... g->guild_id = guild_newid++; diff --git a/src/char/int_homun.c b/src/char/int_homun.c index 35f8f9c50..62b5a78a1 100644 --- a/src/char/int_homun.c +++ b/src/char/int_homun.c @@ -127,7 +127,7 @@ int inter_homun_init() p = (struct s_homunculus*)aCalloc(sizeof(struct s_homunculus), 1); if(p==NULL){ ShowFatalError("int_homun: out of memory!\n"); - exit(0); + exit(EXIT_FAILURE); } if(inter_homun_fromstr(line,p)==0 && p->hom_id>0){ if( p->hom_id >= homun_newid) diff --git a/src/char/int_party.c b/src/char/int_party.c index 96181cd1b..4e6366807 100644 --- a/src/char/int_party.c +++ b/src/char/int_party.c @@ -194,7 +194,7 @@ int inter_party_init() { p = (struct party_data*)aCalloc(sizeof(struct party_data), 1); if (p == NULL){ ShowFatalError("int_party: out of memory!\n"); - exit(0); + exit(EXIT_FAILURE); } memset(p, 0, sizeof(struct party_data)); if (inter_party_fromstr(line, &p->party) == 0 && p->party.party_id > 0) { diff --git a/src/char/int_pet.c b/src/char/int_pet.c index e7ff2aff2..8d0f53472 100644 --- a/src/char/int_pet.c +++ b/src/char/int_pet.c @@ -97,7 +97,7 @@ int inter_pet_init() p = (struct s_pet*)aCalloc(sizeof(struct s_pet), 1); if(p==NULL){ ShowFatalError("int_pet: out of memory!\n"); - exit(0); + exit(EXIT_FAILURE); } memset(p,0,sizeof(struct s_pet)); if(inter_pet_fromstr(line,p)==0 && p->pet_id>0){ diff --git a/src/char/int_storage.c b/src/char/int_storage.c index 4d933d257..daee13134 100644 --- a/src/char/int_storage.c +++ b/src/char/int_storage.c @@ -211,7 +211,7 @@ int inter_storage_init() s = (struct storage*)aCalloc(sizeof(struct storage), 1); if(s==NULL){ ShowFatalError("int_storage: out of memory!\n"); - exit(0); + exit(EXIT_FAILURE); } // memset(s,0,sizeof(struct storage)); aCalloc does this... s->account_id=tmp_int; @@ -240,7 +240,7 @@ int inter_storage_init() gs = (struct guild_storage*)aCalloc(sizeof(struct guild_storage), 1); if(gs==NULL){ ShowFatalError("int_storage: out of memory!\n"); - exit(0); + exit(EXIT_FAILURE); } // memset(gs,0,sizeof(struct guild_storage)); aCalloc... gs->guild_id=tmp_int; diff --git a/src/char/inter.c b/src/char/inter.c index 721017188..f7287eb99 100644 --- a/src/char/inter.c +++ b/src/char/inter.c @@ -118,7 +118,7 @@ int inter_accreg_init(void) { reg = (struct accreg*)aCalloc(sizeof(struct accreg), 1); if (reg == NULL) { ShowFatalError("inter: accreg: out of memory!\n"); - exit(0); + exit(EXIT_FAILURE); } if (inter_accreg_fromstr(line, reg) == 0 && reg->account_id > 0) { idb_put(accreg_db, reg->account_id, reg); |