Enhanced `DBMap` implementation to allow storing integer type data in addition to void pointers.

 - Added enum for data: `int`, `unsigned int` and `void*`
 - Replaced generic `void*` data with `DBData` struct to hold `int`, `unsigned int` or `void*` (member of `DBNode`)
 - Added `db_i2data`, `db_ui2data` and `db_ptr2data` functions to cast from `int`/`uint`/`void*` to `DBData` (used in `DBMap::put()`)
 - Added `db_data2i`, `db_data2ui` and `db_data2ptr` functions to get `int`/`uint`/`void*` from `DBData`
 - Enabled statistics for new functions in `db_stats` struct
 - `DBCreateData` functions (used in `DBMap::ensure()`) now return `DBData` instead of `void*`
 - `DBApply` functions (used in `DBMap::foreach()` and `DBMap::destroy()`) now take `DBData*` as a parameter instead of `void*`
 - `DBMatcher` functions (used in `DBMap::getall()`) now take `DBData` as a parameter instead of `void*`
 - `DBReleaser` functions now take `DBData` as parameter instead of `void*`
 - Default releasers release data if it is `void*` (`DB_DATA_PTR`) type
 - `DBIterator` functions: `first()`, `last()`, `next()` and `prev()` now return `DBData*` instead of `void*`
 - `DBIterator::remove()` now returns `int` (1 if node was found and removed, 0 otherwise) instead of `void*` and takes an extra `DBData*` parameter for the data of removed entry
 - `DBMap::get()` and `DBMap::ensure()` now return `DBData*` instead of `void*`
 - `DBMap::remove()` and `DBMap::put()` now return `int` (1 if node already existed, 0 otherwise) instead of `void*` and take an extra `DBData*` parameter for the data of removed entry
 - `DBMap::put()` now takes `DBData` as parameter instead of `void*`
 - `DBMap::getall()` now puts data into `DBData**` buffer instead of `void**` buffer
 - Updated macros:
   - (`i`/`ui`/`str`)`db_get` and (`i`/`ui`/`str`)`db_ensure` were wrapped with `db_data2ptr` to extract data from `DBData*` that is now returned by `DBMap::get()`
   - added (`i`/`ui`/`str`)`db_iget` and (`i`/`ui`/`str`)`db_uiget` that get `DBData` from `DBMap` and extract `int`/`unsigned int` from it (with `db_data2i`/`db_data2ui`)
   - `db_put`, `idb_put`, `uidb_put` and `strdb_put` data params were wrapped with `db_ptr2data` to match new signature of `DBMap::put()` (`DBData` instead of `void*`)
   - added (`i`/`ui`/`str`)`db_iput` and (`i`/`ui`/`str`)`db_uiput` that put `int`/`unsigned int` into `DBMap` (first wrapping it with `DBData`)
   - added `NULL` in place of extra parameter for removed data in `db_remove` macros
   - `dbi_first`, `dbi_last`, `dbi_next` and `dbi_prev` were wrapped with `db_data2ptr` to extract data from `DBData*` that is now returned by these `DBIterator` functions
 - Updated `DBMap` documentation, and fixed a dozen of typos in it.
 - Updated rest of rA code to reflect `DBMap` changes (mostly required signature changes of `DBCreateData` and `DBApply` functions).
 - Fixed a bug where `DBMap::put()` would return data of a deleted entry.
 - Removed some unnecessary pointer casts.
 - Increased `showmsg.c` static buffer size to fit entire DBMap stats report.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15682 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 24 insertions, 17 deletions

diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index e25c50a40..8da198c59 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -23,13 +23,14 @@ static struct item_group itemgroup_db[MAX_ITEMGROUP];
 
 struct item_data dummy_item; //This is the default dummy item used for non-existant items. [Skotlex]
 
-/*==========================================
+/**
  * 名前で検索用
- *------------------------------------------*/
-// name = item alias, so we should find items aliases first. if not found then look for "jname" (full name)
-static int itemdb_searchname_sub(DBKey key,void *data,va_list ap)
+ * name = item alias, so we should find items aliases first. if not found then look for "jname" (full name)
+ * @see DBApply
+ */
+static int itemdb_searchname_sub(DBKey key, DBData *data, va_list ap)
 {
-	struct item_data *item=(struct item_data *)data,**dst,**dst2;
+	struct item_data *item = db_data2ptr(data), **dst, **dst2;
 	char *str;
 	str=va_arg(ap,char *);
 	dst=va_arg(ap,struct item_data **);
@@ -77,9 +78,12 @@ struct item_data* itemdb_searchname(const char *str)
 	return item?item:item2;
 }
 
-static int itemdb_searchname_array_sub(DBKey key,void * data,va_list ap)
+/**
+ * @see DBMatcher
+ */
+static int itemdb_searchname_array_sub(DBKey key, DBData data, va_list ap)
 {
-	struct item_data *item=(struct item_data *)data;
+	struct item_data *item = db_data2ptr(&data);
 	char *str;
 	str=va_arg(ap,char *);
 	if (item == &dummy_item)
@@ -116,17 +120,17 @@ int itemdb_searchname_array(struct item_data** data, int size, const char *str)
 	}
 
 	// search in the db
-	if( count >= size )
+	if( count < size )
 	{
-		data = NULL;
-		size = 0;
-	}
-	else
-	{
-		data -= count;
+		DBData *db_data[MAX_SEARCH];
+		int db_count = 0;
 		size -= count;
+		db_count = itemdb_other->getall(itemdb_other, (DBData**)&db_data, size, itemdb_searchname_array_sub, str);
+		for (i = 0; i < db_count; i++)
+			data[count++] = db_data2ptr(db_data[i]);
+		count += db_count;
 	}
-	return count + itemdb_other->getall(itemdb_other,(void**)data,size,itemdb_searchname_array_sub,str);
+	return count;
 }
 
 
@@ -1075,9 +1079,12 @@ static void destroy_item_data(struct item_data* self, int free_self)
 		aFree(self);
 }
 
-static int itemdb_final_sub(DBKey key,void *data,va_list ap)
+/**
+ * @see DBApply
+ */
+static int itemdb_final_sub(DBKey key, DBData *data, va_list ap)
 {
-	struct item_data *id = (struct item_data *)data;
+	struct item_data *id = db_data2ptr(data);
 
 	if( id != &dummy_item )
 		destroy_item_data(id, 1);