summaryrefslogtreecommitdiff
path: root/src/common/malloc.c
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-07-01 10:19:43 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-07-01 10:19:43 +0000
commit85f4d70c7d6f06bbce93360cb05308de2901a683 (patch)
treea399cb6da72f091864c9a9ded6c33f8f8e4dd46c /src/common/malloc.c
parent601e50bee37d39f293b63ea0f1e0a5572cb67cdb (diff)
downloadhercules-85f4d70c7d6f06bbce93360cb05308de2901a683.tar.gz
hercules-85f4d70c7d6f06bbce93360cb05308de2901a683.tar.bz2
hercules-85f4d70c7d6f06bbce93360cb05308de2901a683.tar.xz
hercules-85f4d70c7d6f06bbce93360cb05308de2901a683.zip
* TXT->SQL converter fixup
- Added missing char_id insert which totally messed up the conversion - Fixed login converter ignoring many columns (although it had the data) - Pointed out that Login-stored account variable conversion is MISSING! - Pointed out that Status, Homunculus and Mapreg conversion is MISSING! - Blocked the config functions from exiting server when file not found - Finally added VS8 project files for this thing git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10835 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common/malloc.c')
-rw-r--r--src/common/malloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/malloc.c b/src/common/malloc.c
index eda8c3fdb..ff71a2c5e 100644
--- a/src/common/malloc.c
+++ b/src/common/malloc.c
@@ -289,7 +289,7 @@ void* _mmalloc(size_t size, const char *file, int line, const char *func )
ShowFatalError("Memory manager::memmgr_malloc() serious error (allocating %d+%d bytes at %s:%d)\n", sizeof(struct unit_head_large), size, file, line);
memmgr_info();
exit(1);
- return NULL;
+ //return NULL;
};
void* _mcalloc(size_t num, size_t size, const char *file, int line, const char *func )