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/int_storage.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/char/int_storage.c') diff --git a/src/char/int_storage.c b/src/char/int_storage.c index daee13134..cba4a28a9 100644 --- a/src/char/int_storage.c +++ b/src/char/int_storage.c @@ -24,8 +24,8 @@ char storage_txt[1024]="save/storage.txt"; char guild_storage_txt[1024]="save/g_storage.txt"; #ifndef TXT_SQL_CONVERT -static struct dbt *storage_db; -static struct dbt *guild_storage_db; +static DBMap* storage_db; // int account_id -> struct storage* +static DBMap* guild_storage_db; // int guild_id -> struct guild_storage* // 倉庫データを文字列に変換 int storage_tostr(char *str,struct storage *p) @@ -198,7 +198,7 @@ int inter_storage_init() struct guild_storage *gs; FILE *fp; - storage_db = db_alloc(__FILE__,__LINE__,DB_INT,DB_OPT_RELEASE_DATA,sizeof(int)); + storage_db = idb_alloc(DB_OPT_RELEASE_DATA); fp=fopen(storage_txt,"r"); if(fp==NULL){ @@ -227,7 +227,7 @@ int inter_storage_init() fclose(fp); c = 0; - guild_storage_db = db_alloc(__FILE__,__LINE__,DB_INT,DB_OPT_RELEASE_DATA,sizeof(int)); + guild_storage_db = idb_alloc(DB_OPT_RELEASE_DATA); fp=fopen(guild_storage_txt,"r"); if(fp==NULL){ -- cgit v1.2.3-60-g2f50