From b5be01c5baca2d51da4ec9a138e3bb57eea7cbb4 Mon Sep 17 00:00:00 2001 From: FlavioJS Date: Thu, 8 Nov 2007 14:08:32 +0000 Subject: * Changed EXIT_SUCCESS back to 0 in console.c to avoid an unnecessary include. * Fixed gm_account_db not being deallocated in login-converter.c. * Refactoring names and documentation in db.h/db.c: - changed 'struct dbt' to 'struct DBMap' and 'DB' to 'DBMap*' - changed 'struct db' to 'struct DBMap_impl' and 'DB_impl' to 'DBMap_impl*' - changed COUNT to DB_COUNTSTAT and made it's existence not depend on DB_ENABLE_STATS - removed some @see links and corrected small typos in the documentation git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11698 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/char/inter.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/char/inter.c') diff --git a/src/char/inter.c b/src/char/inter.c index 9856c13b2..85b4793f7 100644 --- a/src/char/inter.c +++ b/src/char/inter.c @@ -30,7 +30,7 @@ char accreg_txt[1024] = "save/accreg.txt"; char inter_log_filename[1024] = "log/inter.log"; char main_chat_nick[16] = "Main"; -static struct dbt *accreg_db = NULL; +static DBMap* accreg_db = NULL; // int account_id -> struct accreg* unsigned int party_share_level = 10; @@ -66,7 +66,7 @@ struct WisData { unsigned long tick; unsigned char src[24], dst[24], msg[1024]; }; -static struct dbt * wis_db = NULL; +static DBMap* wis_db = NULL; // int wis_id -> struct WisData* static int wis_dellist[WISDELLIST_MAX], wis_delnum; @@ -109,7 +109,7 @@ int inter_accreg_init(void) { int c = 0; struct accreg *reg; - accreg_db = db_alloc(__FILE__,__LINE__,DB_INT,DB_OPT_RELEASE_DATA,sizeof(int)); + accreg_db = idb_alloc(DB_OPT_RELEASE_DATA); if( (fp = fopen(accreg_txt, "r")) == NULL) return 1; @@ -259,7 +259,7 @@ int inter_init_txt(const char *file) { inter_config_read(file); #ifndef TXT_SQL_CONVERT - wis_db = db_alloc(__FILE__,__LINE__,DB_INT,DB_OPT_RELEASE_DATA,sizeof(int)); + wis_db = idb_alloc(DB_OPT_RELEASE_DATA); inter_party_init(); inter_guild_init(); -- cgit v1.2.3-70-g09d2