Dropped typedefs from union DBKey and struct DBData

Signed-off-by: Haru <haru@dotalux.com>

28 files changed, 116 insertions, 96 deletions

diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 78d935ddc..fbd8d6517 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -5282,8 +5282,8 @@ ACMD(skillid) {
 	int i, found = 0;
 	size_t skillen;
 	DBIterator* iter;
-	DBKey key;
-	DBData *data;
+	union DBKey key;
+	struct DBData *data;
 	char partials[MAX_SKILLID_PARTIAL_RESULTS][MAX_SKILLID_PARTIAL_RESULTS_LEN];
 
 	if (!*message) {
@@ -9057,8 +9057,8 @@ ACMD(channel) {
 	} else if (strcmpi(subcmd,"banlist") == 0) {
 		// sub1 = channel name; sub2 = unused; sub3 = unused
 		DBIterator *iter = NULL;
-		DBKey key;
-		DBData *data;
+		union DBKey key;
+		struct DBData *data;
 		bool isA = pc_has_permission(sd, PC_PERM_HCHSYS_ADMIN)?true:false;
 		if (sub1[0] != '#') {
 			clif->message(fd, msg_fd(fd,1405));// Channel name must start with a '#'
@@ -10222,7 +10222,8 @@ bool atcommand_hp_add(char *name, AtCommandFunc func) {
 /**
  * @see DBApply
  */
-int atcommand_db_clear_sub(DBKey key, DBData *data, va_list args) {
+int atcommand_db_clear_sub(union DBKey key, struct DBData *data, va_list args)
+{
 	AtCommandInfo *cmd = DB->data2ptr(data);
 	aFree(cmd->at_groups);
 	aFree(cmd->char_groups);
diff --git a/src/map/atcommand.h b/src/map/atcommand.h
index a4f9afce7..40db16bbf 100644
--- a/src/map/atcommand.h
+++ b/src/map/atcommand.h
@@ -135,7 +135,7 @@ struct atcommand_interface {
 	/* */
 	void (*commands_sub) (struct map_session_data* sd, const int fd, AtCommandType type);
 	void (*cmd_db_clear) (void);
-	int (*cmd_db_clear_sub) (DBKey key, DBData *data, va_list args);
+	int (*cmd_db_clear_sub) (union DBKey key, struct DBData *data, va_list args);
 	void (*doload) (void);
 	void (*base_commands) (void);
 	bool (*add) (char *name, AtCommandFunc func, bool replace);
diff --git a/src/map/battleground.c b/src/map/battleground.c
index 311690ec3..629122c87 100644
--- a/src/map/battleground.c
+++ b/src/map/battleground.c
@@ -279,7 +279,8 @@ bool bg_send_message(struct map_session_data *sd, const char *mes, int len) {
 /**
  * @see DBApply
  */
-int bg_send_xy_timer_sub(DBKey key, DBData *data, va_list ap) {
+int bg_send_xy_timer_sub(union DBKey key, struct DBData *data, va_list ap)
+{
 	struct battleground_data *bgd = DB->data2ptr(data);
 	struct map_session_data *sd;
 	int i;
@@ -925,7 +926,8 @@ void do_init_battleground(bool minimal) {
 /**
  * @see DBApply
  */
-int bg_team_db_final(DBKey key, DBData *data, va_list ap) {
+int bg_team_db_final(union DBKey key, struct DBData *data, va_list ap)
+{
 	struct battleground_data* bgd = DB->data2ptr(data);
 
 	HPM->data_store_destroy(&bgd->hdata);
diff --git a/src/map/battleground.h b/src/map/battleground.h
index bb77db125..05458a9b1 100644
--- a/src/map/battleground.h
+++ b/src/map/battleground.h
@@ -131,10 +131,10 @@ struct battleground_interface {
 	int (*create) (unsigned short map_index, short rx, short ry, const char *ev, const char *dev);
 	int (*team_get_id) (struct block_list *bl);
 	bool (*send_message) (struct map_session_data *sd, const char *mes, int len);
-	int (*send_xy_timer_sub) (DBKey key, DBData *data, va_list ap);
+	int (*send_xy_timer_sub) (union DBKey key, struct DBData *data, va_list ap);
 	int (*send_xy_timer) (int tid, int64 tick, int id, intptr_t data);
 	int (*afk_timer) (int tid, int64 tick, int id, intptr_t data);
-	int (*team_db_final) (DBKey key, DBData *data, va_list ap);
+	int (*team_db_final) (union DBKey key, struct DBData *data, va_list ap);
 	/* */
 	enum bg_queue_types (*str2teamtype) (const char *str);
 	/* */
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 70339c378..52af1137e 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -471,7 +471,8 @@ void chrif_connectack(int fd) {
 /**
  * @see DBApply
  */
-int chrif_reconnect(DBKey key, DBData *data, va_list ap) {
+int chrif_reconnect(union DBKey key, struct DBData *data, va_list ap)
+{
 	struct auth_node *node = DB->data2ptr(data);
 
 	nullpo_ret(node);
@@ -681,7 +682,8 @@ void chrif_authfail(int fd) {/* HELLO WORLD. ip in RFIFOL 15 is not being used (
  * This can still happen (client times out while waiting for char to confirm auth data)
  * @see DBApply
  */
-int auth_db_cleanup_sub(DBKey key, DBData *data, va_list ap) {
+int auth_db_cleanup_sub(union DBKey key, struct DBData *data, va_list ap)
+{
 	struct auth_node *node = DB->data2ptr(data);
 
 	nullpo_retr(1, node);
@@ -1617,7 +1619,8 @@ void chrif_del_scdata_single(int account_id, int char_id, short type)
 /**
  * @see DBApply
  */
-int auth_db_final(DBKey key, DBData *data, va_list ap) {
+int auth_db_final(union DBKey key, struct DBData *data, va_list ap)
+{
 	struct auth_node *node = DB->data2ptr(data);
 
 	nullpo_ret(node);
diff --git a/src/map/chrif.h b/src/map/chrif.h
index 6a5ec36b6..dc946b1c1 100644
--- a/src/map/chrif.h
+++ b/src/map/chrif.h
@@ -133,10 +133,10 @@ struct chrif_interface {
 	int (*check_connect_char_server) (int tid, int64 tick, int id, intptr_t data);
 	bool (*auth_logout) (struct map_session_data *sd, enum sd_state state);
 	void (*save_ack) (int fd);
-	int (*reconnect) (DBKey key, DBData *data, va_list ap);
-	int (*auth_db_cleanup_sub) (DBKey key, DBData *data, va_list ap);
+	int (*reconnect) (union DBKey key, struct DBData *data, va_list ap);
+	int (*auth_db_cleanup_sub) (union DBKey key, struct DBData *data, va_list ap);
 	bool (*char_ask_name_answer) (int acc, const char* player_name, uint16 type, uint16 answer);
-	int (*auth_db_final) (DBKey key, DBData *data, va_list ap);
+	int (*auth_db_final) (union DBKey key, struct DBData *data, va_list ap);
 	int (*send_usercount_tochar) (int tid, int64 tick, int id, intptr_t data);
 	int (*auth_db_cleanup) (int tid, int64 tick, int id, intptr_t data);
 
diff --git a/src/map/guild.c b/src/map/guild.c
index 13acfc0db..0ceaff518 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -282,7 +282,8 @@ void guild_makemember(struct guild_member *m,struct map_session_data *sd)
  * Server cache to be flushed to inter the Guild EXP
  * @see DBApply
  */
-int guild_payexp_timer_sub(DBKey key, DBData *data, va_list ap) {
+int guild_payexp_timer_sub(union DBKey key, struct DBData *data, va_list ap)
+{
 	int i;
 	struct guild_expcache *c;
 	struct guild *g;
@@ -318,7 +319,7 @@ int guild_payexp_timer(int tid, int64 tick, int id, intptr_t data) {
  * Taken from party_send_xy_timer_sub. [Skotlex]
  * @see DBApply
  */
-int guild_send_xy_timer_sub(DBKey key, DBData *data, va_list ap)
+int guild_send_xy_timer_sub(union DBKey key, struct DBData *data, va_list ap)
 {
 	struct guild *g = DB->data2ptr(data);
 	int i;
@@ -423,7 +424,7 @@ int guild_npc_request_info(int guild_id,const char *event)
 	if( event && *event )
 	{
 		struct eventlist *ev;
-		DBData prev;
+		struct DBData prev;
 		ev=(struct eventlist *)aCalloc(sizeof(struct eventlist),1);
 		memcpy(ev->name,event,strlen(event));
 		//The one in the db (if present) becomes the next event from this.
@@ -481,7 +482,7 @@ int guild_recv_info(const struct guild *sg)
 {
 	struct guild *g,before;
 	int i,bm,m;
-	DBData data;
+	struct DBData data;
 	struct map_session_data *sd;
 	bool guild_new = false;
 	struct channel_data *aChSysSave = NULL;
@@ -1262,7 +1263,7 @@ int guild_emblem_changed(int len,int guild_id,int emblem_id,const char *data)
 /**
  * @see DBCreateData
  */
-DBData create_expcache(DBKey key, va_list args)
+struct DBData create_expcache(union DBKey key, va_list args)
 {
 	struct guild_expcache *c;
 	struct map_session_data *sd = va_arg(args, struct map_session_data*);
@@ -1720,7 +1721,7 @@ int guild_allianceack(int guild_id1,int guild_id2,int account_id1,int account_id
  * Notification for the guild disbanded
  * @see DBApply
  */
-int guild_broken_sub(DBKey key, DBData *data, va_list ap)
+int guild_broken_sub(union DBKey key, struct DBData *data, va_list ap)
 {
 	struct guild *g = DB->data2ptr(data);
 	int guild_id=va_arg(ap,int);
@@ -1746,7 +1747,7 @@ int guild_broken_sub(DBKey key, DBData *data, va_list ap)
  * Invoked on Castles when a guild is broken. [Skotlex]
  * @see DBApply
  */
-int castle_guild_broken_sub(DBKey key, DBData *data, va_list ap)
+int castle_guild_broken_sub(union DBKey key, struct DBData *data, va_list ap)
 {
 	struct guild_castle *gc = DB->data2ptr(data);
 	int guild_id = va_arg(ap, int);
@@ -2222,7 +2223,8 @@ void guild_flag_remove(struct npc_data *nd) {
 /**
  * @see DBApply
  */
-int eventlist_db_final(DBKey key, DBData *data, va_list ap) {
+int eventlist_db_final(union DBKey key, struct DBData *data, va_list ap)
+{
 	struct eventlist *next = NULL;
 	struct eventlist *current = DB->data2ptr(data);
 	while (current != NULL) {
@@ -2236,7 +2238,8 @@ int eventlist_db_final(DBKey key, DBData *data, va_list ap) {
 /**
  * @see DBApply
  */
-int guild_expcache_db_final(DBKey key, DBData *data, va_list ap) {
+int guild_expcache_db_final(union DBKey key, struct DBData *data, va_list ap)
+{
 	ers_free(guild->expcache_ers, DB->data2ptr(data));
 	return 0;
 }
@@ -2244,7 +2247,8 @@ int guild_expcache_db_final(DBKey key, DBData *data, va_list ap) {
 /**
  * @see DBApply
  */
-int guild_castle_db_final(DBKey key, DBData *data, va_list ap) {
+int guild_castle_db_final(union DBKey key, struct DBData *data, va_list ap)
+{
 	struct guild_castle* gc = DB->data2ptr(data);
 	if( gc->temp_guardians )
 		aFree(gc->temp_guardians);
diff --git a/src/map/guild.h b/src/map/guild.h
index cd796adb3..c0191469b 100644
--- a/src/map/guild.h
+++ b/src/map/guild.h
@@ -166,15 +166,15 @@ struct guild_interface {
 	struct map_session_data *(*sd_check) (int guild_id, int account_id, int char_id);
 	bool (*read_guildskill_tree_db) (char* split[], int columns, int current);
 	bool (*read_castledb) (char* str[], int columns, int current);
-	int (*payexp_timer_sub) (DBKey key, DBData *data, va_list ap);
-	int (*send_xy_timer_sub) (DBKey key, DBData *data, va_list ap);
+	int (*payexp_timer_sub) (union DBKey key, struct DBData *data, va_list ap);
+	int (*send_xy_timer_sub) (union DBKey key, struct DBData *data, va_list ap);
 	int (*send_xy_timer) (int tid, int64 tick, int id, intptr_t data);
-	DBData (*create_expcache) (DBKey key, va_list args);
-	int (*eventlist_db_final) (DBKey key, DBData *data, va_list ap);
-	int (*expcache_db_final) (DBKey key, DBData *data, va_list ap);
-	int (*castle_db_final) (DBKey key, DBData *data, va_list ap);
-	int (*broken_sub) (DBKey key, DBData *data, va_list ap);
-	int (*castle_broken_sub) (DBKey key, DBData *data, va_list ap);
+	struct DBData (*create_expcache) (union DBKey key, va_list args);
+	int (*eventlist_db_final) (union DBKey key, struct DBData *data, va_list ap);
+	int (*expcache_db_final) (union DBKey key, struct DBData *data, va_list ap);
+	int (*castle_db_final) (union DBKey key, struct DBData *data, va_list ap);
+	int (*broken_sub) (union DBKey key, struct DBData *data, va_list ap);
+	int (*castle_broken_sub) (union DBKey key, struct DBData *data, va_list ap);
 	void (*makemember) (struct guild_member *m,struct map_session_data *sd);
 	int (*check_member) (const struct guild *g);
 	int (*get_alliance_count) (struct guild *g,int flag);
diff --git a/src/map/intif.c b/src/map/intif.c
index 4b3e913e1..8106c6558 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -302,8 +302,8 @@ int intif_wis_message_to_gm(char *wisp_name, int permission, char *mes)
 //Request for saving registry values.
 int intif_saveregistry(struct map_session_data *sd) {
 	DBIterator *iter;
-	DBKey key;
-	DBData *data;
+	union DBKey key;
+	struct DBData *data;
 	int plen = 0;
 	size_t len;
 
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index ce6232965..38913249b 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -49,7 +49,7 @@ struct itemdb_interface *itemdb;
  * name = item alias, so we should find items aliases first. if not found then look for "jname" (full name)
  * @see DBApply
  */
-int itemdb_searchname_sub(DBKey key, DBData *data, va_list ap)
+int itemdb_searchname_sub(union DBKey key, struct DBData *data, va_list ap)
 {
 	struct item_data *item = DB->data2ptr(data), **dst, **dst2;
 	char *str;
@@ -112,7 +112,7 @@ struct item_data* itemdb_name2id(const char *str) {
 /**
  * @see DBMatcher
  */
-int itemdb_searchname_array_sub(DBKey key, DBData data, va_list ap)
+int itemdb_searchname_array_sub(union DBKey key, struct DBData data, va_list ap)
 {
 	struct item_data *item = DB->data2ptr(&data);
 	char *str;
@@ -170,10 +170,10 @@ int itemdb_searchname_array(struct item_data** data, int size, const char *str,
 	// search in the db
 	if( count < size )
 	{
-		DBData *db_data[MAX_SEARCH];
+		struct 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);
+		db_count = itemdb->other->getall(itemdb->other, (struct 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;
@@ -2094,7 +2094,7 @@ uint64 itemdb_unique_id(struct map_session_data *sd) {
  */
 void itemdb_read(bool minimal) {
 	int i;
-	DBData prev;
+	struct DBData prev;
 
 	const char *filename[] = {
 		DBPATH"item_db.conf",
@@ -2171,7 +2171,7 @@ void destroy_item_data(struct item_data* self, int free_self)
 /**
  * @see DBApply
  */
-int itemdb_final_sub(DBKey key, DBData *data, va_list ap)
+int itemdb_final_sub(union DBKey key, struct DBData *data, va_list ap)
 {
 	struct item_data *id = DB->data2ptr(data);
 
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index 47446d617..58d19db05 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -612,8 +612,8 @@ struct itemdb_interface {
 	int (*group_item) (struct item_group *group);
 	int (*chain_item) (unsigned short chain_id, int *rate);
 	void (*package_item) (struct map_session_data *sd, struct item_package *package);
-	int (*searchname_sub) (DBKey key, DBData *data, va_list ap);
-	int (*searchname_array_sub) (DBKey key, DBData data, va_list ap);
+	int (*searchname_sub) (union DBKey key, struct DBData *data, va_list ap);
+	int (*searchname_array_sub) (union DBKey key, struct DBData data, va_list ap);
 	int (*searchrandomid) (struct item_group *group);
 	const char* (*typename) (int type);
 	void (*jobmask2mapid) (uint64 *bclass, uint64 jobmask);
@@ -647,7 +647,7 @@ struct itemdb_interface {
 	uint64 (*unique_id) (struct map_session_data *sd);
 	void (*read) (bool minimal);
 	void (*destroy_item_data) (struct item_data *self, int free_self);
-	int (*final_sub) (DBKey key, DBData *data, va_list ap);
+	int (*final_sub) (union DBKey key, struct DBData *data, va_list ap);
 	void (*clear) (bool total);
 	struct item_combo * (*id2combo) (unsigned short id);
 	bool (*is_item_usable) (struct item_data *item);
diff --git a/src/map/map.c b/src/map/map.c
index a93fb3fd3..1ae094c75 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1658,7 +1658,7 @@ int map_addflooritem(const struct block_list *bl, struct item *item_data, int am
 /**
  * @see DBCreateData
  */
-DBData create_charid2nick(DBKey key, va_list args)
+struct DBData create_charid2nick(union DBKey key, va_list args)
 {
 	struct charid2nick *p;
 	CREATE(p, struct charid2nick, 1);
@@ -1695,7 +1695,7 @@ void map_delnickdb(int charid, const char* name)
 {
 	struct charid2nick* p;
 	struct charid_request* req;
-	DBData data;
+	struct DBData data;
 
 	if (!map->nick_db->remove(map->nick_db, DB->i2key(charid), &data) || (p = DB->data2ptr(&data)) == NULL)
 		return;
@@ -3069,7 +3069,7 @@ void map_iwall_remove(const char *wall_name)
 /**
  * @see DBCreateData
  */
-DBData create_map_data_other_server(DBKey key, va_list args)
+struct DBData create_map_data_other_server(union DBKey key, va_list args)
 {
 	struct map_data_other_server *mdos;
 	unsigned short map_index = (unsigned short)key.ui;
@@ -3104,7 +3104,7 @@ int map_setipport(unsigned short map_index, uint32 ip, uint16 port)
  * Delete all the other maps server management
  * @see DBApply
  */
-int map_eraseallipport_sub(DBKey key, DBData *data, va_list va)
+int map_eraseallipport_sub(union DBKey key, struct DBData *data, va_list va)
 {
 	struct map_data_other_server *mdos = DB->data2ptr(data);
 	if(mdos->cell == NULL) {
@@ -5446,7 +5446,8 @@ bool map_remove_questinfo(int m, struct npc_data *nd) {
 /**
  * @see DBApply
  */
-int map_db_final(DBKey key, DBData *data, va_list ap) {
+int map_db_final(union DBKey key, struct DBData *data, va_list ap)
+{
 	struct map_data_other_server *mdos = DB->data2ptr(data);
 
 	if(mdos && iMalloc->verify_ptr(mdos) && mdos->cell == NULL)
@@ -5458,7 +5459,7 @@ int map_db_final(DBKey key, DBData *data, va_list ap) {
 /**
  * @see DBApply
  */
-int nick_db_final(DBKey key, DBData *data, va_list args)
+int nick_db_final(union DBKey key, struct DBData *data, va_list args)
 {
 	struct charid2nick* p = DB->data2ptr(data);
 	struct charid_request* req;
@@ -5505,7 +5506,8 @@ int cleanup_sub(struct block_list *bl, va_list ap) {
 /**
  * @see DBApply
  */
-int cleanup_db_sub(DBKey key, DBData *data, va_list va) {
+int cleanup_db_sub(union DBKey key, struct DBData *data, va_list va)
+{
 	return map->cleanup_sub(DB->data2ptr(data), va);
 }
 
diff --git a/src/map/map.h b/src/map/map.h
index e61c64f2d..9df2dd586 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -1167,7 +1167,7 @@ END_ZEROED_BLOCK;
 	int (*freeblock_timer) (int tid, int64 tick, int id, intptr_t data);
 	int (*searchrandfreecell) (int16 m, const struct block_list *bl, int16 *x, int16 *y, int stack);
 	int (*count_sub) (struct block_list *bl, va_list ap);
-	DBData (*create_charid2nick) (DBKey key, va_list args);
+	struct DBData (*create_charid2nick) (union DBKey key, va_list args);
 	int (*removemobs_sub) (struct block_list *bl, va_list ap);
 	struct mapcell (*gat2cell) (int gat);
 	int (*cell2gat) (struct mapcell cell);
@@ -1176,8 +1176,8 @@ END_ZEROED_BLOCK;
 	int (*sub_getcellp) (struct map_data *m, const struct block_list *bl, int16 x, int16 y, cell_chk cellchk);
 	void (*sub_setcell) (int16 m, int16 x, int16 y, cell_t cell, bool flag);
 	void (*iwall_nextxy) (int16 x, int16 y, int8 dir, int pos, int16 *x1, int16 *y1);
-	DBData (*create_map_data_other_server) (DBKey key, va_list args);
-	int (*eraseallipport_sub) (DBKey key, DBData *data, va_list va);
+	struct DBData (*create_map_data_other_server) (union DBKey key, va_list args);
+	int (*eraseallipport_sub) (union DBKey key, struct DBData *data, va_list va);
 	char* (*init_mapcache) (FILE *fp);
 	int (*readfromcache) (struct map_data *m, char *buffer);
 	int (*addmap) (const char *mapname);
@@ -1198,9 +1198,9 @@ END_ZEROED_BLOCK;
 	unsigned short (*zone_str2skillid) (const char *name);
 	enum bl_type (*zone_bl_type) (const char *entry, enum map_zone_skill_subtype *subtype);
 	void (*read_zone_db) (void);
-	int (*db_final) (DBKey key, DBData *data, va_list ap);
-	int (*nick_db_final) (DBKey key, DBData *data, va_list args);
-	int (*cleanup_db_sub) (DBKey key, DBData *data, va_list va);
+	int (*db_final) (union DBKey key, struct DBData *data, va_list ap);
+	int (*nick_db_final) (union DBKey key, struct DBData *data, va_list args);
+	int (*cleanup_db_sub) (union DBKey key, struct DBData *data, va_list va);
 	int (*abort_sub) (struct map_session_data *sd, va_list ap);
 	void (*update_cell_bl) (struct block_list *bl, bool increase);
 	int (*get_new_bonus_id) (void);
diff --git a/src/map/mapreg.h b/src/map/mapreg.h
index dfe1dfb2d..d19b2bb80 100644
--- a/src/map/mapreg.h
+++ b/src/map/mapreg.h
@@ -59,7 +59,7 @@ struct mapreg_interface {
 	void (*load) (void);
 	void (*save) (void);
 	int (*save_timer) (int tid, int64 tick, int id, intptr_t data);
-	int (*destroyreg) (DBKey key, DBData *data, va_list ap);
+	int (*destroyreg) (union DBKey key, struct DBData *data, va_list ap);
 	void (*reload) (void);
 	bool (*config_read) (const char *w1, const char *w2);
 };
diff --git a/src/map/mapreg_sql.c b/src/map/mapreg_sql.c
index f3ab36950..d9d8755c2 100644
--- a/src/map/mapreg_sql.c
+++ b/src/map/mapreg_sql.c
@@ -277,7 +277,8 @@ int script_autosave_mapreg(int tid, int64 tick, int id, intptr_t data) {
  *
  * @see DBApply
  */
-int mapreg_destroyreg(DBKey key, DBData *data, va_list ap) {
+int mapreg_destroyreg(union DBKey key, struct DBData *data, va_list ap)
+{
 	struct mapreg_save *m = NULL;
 
 	if (data->type != DB_DATA_PTR) // Sanity check
diff --git a/src/map/npc.c b/src/map/npc.c
index 7fad5dd7c..68bb81031 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -367,7 +367,7 @@ int npc_event_dequeue(struct map_session_data* sd)
 /**
  * @see DBCreateData
  */
-DBData npc_event_export_create(DBKey key, va_list args)
+struct DBData npc_event_export_create(union DBKey key, va_list args)
 {
 	struct linkdb_node** head_ptr;
 	CREATE(head_ptr, struct linkdb_node*, 1);
@@ -2224,7 +2224,7 @@ int npc_remove_map(struct npc_data* nd) {
 /**
  * @see DBApply
  */
-int npc_unload_ev(DBKey key, DBData *data, va_list ap)
+int npc_unload_ev(union DBKey key, struct DBData *data, va_list ap)
 {
 	struct event_data* ev = DB->data2ptr(data);
 	char* npcname = va_arg(ap, char *);
@@ -2239,7 +2239,7 @@ int npc_unload_ev(DBKey key, DBData *data, va_list ap)
 /**
  * @see DBApply
  */
-int npc_unload_ev_label(DBKey key, DBData *data, va_list ap)
+int npc_unload_ev_label(union DBKey key, struct DBData *data, va_list ap)
 {
 	struct linkdb_node **label_linkdb = DB->data2ptr(data);
 	struct npc_data* nd = va_arg(ap, struct npc_data *);
@@ -3626,7 +3626,7 @@ int npc_do_atcmd_event(struct map_session_data* sd, const char* command, const c
 const char *npc_parse_function(const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval)
 {
 	DBMap* func_db;
-	DBData old_data;
+	struct DBData old_data;
 	struct script_code *scriptroot;
 	const char* end;
 	const char* script_start;
@@ -4572,8 +4572,8 @@ void npc_read_event_script(void)
 	for (i = 0; i < NPCE_MAX; i++)
 	{
 		DBIterator* iter;
-		DBKey key;
-		DBData *data;
+		union DBKey key;
+		struct DBData *data;
 
 		char name[64]="::";
 		safestrncpy(name+2,config[i].event_name,62);
@@ -4616,7 +4616,7 @@ void npc_read_event_script(void)
 /**
  * @see DBApply
  */
-int npc_path_db_clear_sub(DBKey key, DBData *data, va_list args)
+int npc_path_db_clear_sub(union DBKey key, struct DBData *data, va_list args)
 {
 	struct npc_path_data *npd = DB->data2ptr(data);
 	if (npd->path)
@@ -4627,7 +4627,7 @@ int npc_path_db_clear_sub(DBKey key, DBData *data, va_list args)
 /**
  * @see DBApply
  */
-int npc_ev_label_db_clear_sub(DBKey key, DBData *data, va_list args)
+int npc_ev_label_db_clear_sub(union DBKey key, struct DBData *data, va_list args)
 {
 	struct linkdb_node **label_linkdb = DB->data2ptr(data);
 	linkdb_final(label_linkdb); // linked data (struct event_data*) is freed when clearing ev_db
diff --git a/src/map/npc.h b/src/map/npc.h
index 965a34f94..5b4707d00 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -203,7 +203,7 @@ struct npc_interface {
 	int (*enable) (const char *name, int flag);
 	struct npc_data* (*name2id) (const char *name);
 	int (*event_dequeue) (struct map_session_data *sd);
-	DBData (*event_export_create) (DBKey key, va_list args);
+	struct DBData (*event_export_create) (union DBKey key, va_list args);
 	int (*event_export) (struct npc_data *nd, int i);
 	int (*event_sub) (struct map_session_data *sd, struct event_data *ev, const char *eventname);
 	void (*event_doall_sub) (void *key, void *data, va_list ap);
@@ -239,8 +239,8 @@ struct npc_interface {
 	int (*selllist_sub) (struct map_session_data *sd, struct itemlist *item_list, struct npc_data *nd);
 	int (*selllist) (struct map_session_data *sd, struct itemlist *item_list);
 	int (*remove_map) (struct npc_data *nd);
-	int (*unload_ev) (DBKey key, DBData *data, va_list ap);
-	int (*unload_ev_label) (DBKey key, DBData *data, va_list ap);
+	int (*unload_ev) (union DBKey key, struct DBData *data, va_list ap);
+	int (*unload_ev_label) (union DBKey key, struct DBData *data, va_list ap);
 	int (*unload_dup_sub) (struct npc_data *nd, va_list args);
 	void (*unload_duplicates) (struct npc_data *nd);
 	int (*unload) (struct npc_data *nd, bool single);
@@ -282,8 +282,8 @@ struct npc_interface {
 	int (*parsesrcfile) (const char *filepath, bool runOnInit);
 	int (*script_event) (struct map_session_data *sd, enum npce_event type);
 	void (*read_event_script) (void);
-	int (*path_db_clear_sub) (DBKey key, DBData *data, va_list args);
-	int (*ev_label_db_clear_sub) (DBKey key, DBData *data, va_list args);
+	int (*path_db_clear_sub) (union DBKey key, struct DBData *data, va_list args);
+	int (*ev_label_db_clear_sub) (union DBKey key, struct DBData *data, va_list args);
 	int (*reload) (void);
 	bool (*unloadfile) (const char *filepath);
 	void (*do_clear_npc) (void);
diff --git a/src/map/party.c b/src/map/party.c
index 77f3c2b0b..049c42b1f 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -122,7 +122,8 @@ struct map_session_data *party_sd_check(int party_id, int account_id, int char_i
 
 	return sd;
 }
-int party_db_final(DBKey key, DBData *data, va_list ap) {
+int party_db_final(union DBKey key, struct DBData *data, va_list ap)
+{
 	struct party_data *p;
 
 	if ((p = DB->data2ptr(data))) {
diff --git a/src/map/party.h b/src/map/party.h
index b66a9770c..750f7d07f 100644
--- a/src/map/party.h
+++ b/src/map/party.h
@@ -145,7 +145,7 @@ struct party_interface {
 	struct map_session_data *(*sd_check) (int party_id, int account_id, int char_id);
 	void (*check_state) (struct party_data *p);
 	struct party_booking_ad_info* (*create_booking_data) (void);
-	int (*db_final) (DBKey key, DBData *data, va_list ap);
+	int (*db_final) (union DBKey key, struct DBData *data, va_list ap);
 };
 
 #ifdef HERCULES_CORE
diff --git a/src/map/pc.c b/src/map/pc.c
index 4b70a49f3..57b2fe19a 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -8991,7 +8991,7 @@ char* pc_readregstr(struct map_session_data* sd, int64 reg) {
 void pc_setregstr(struct map_session_data* sd, int64 reg, const char* str) {
 	struct script_reg_str *p = NULL;
 	unsigned int index = script_getvaridx(reg);
-	DBData prev;
+	struct DBData prev;
 
 	if( str[0] ) {
 		p = ers_alloc(pc->str_reg_ers, struct script_reg_str);
@@ -9114,7 +9114,7 @@ int pc_setregistry(struct map_session_data *sd, int64 reg, int val) {
 		if( !pc->reg_load )
 			p->flag.update = 1;/* either way, it will require either delete or replace */
 	} else if( val ) {
-		DBData prev;
+		struct DBData prev;
 
 		if( index )
 			script->array_update(&sd->regs, reg, false);
@@ -9167,7 +9167,7 @@ int pc_setregistry_str(struct map_session_data *sd, int64 reg, const char *val)
 		if( !pc->reg_load )
 			p->flag.update = 1;/* either way, it will require either delete or replace */
 	} else if( val[0] ) {
-		DBData prev;
+		struct DBData prev;
 
 		if( index )
 			script->array_update(&sd->regs, reg, false);
@@ -11475,7 +11475,8 @@ void pc_autotrade_populate(struct map_session_data *sd) {
 /**
  * @see DBApply
  */
-int pc_autotrade_final(DBKey key, DBData *data, va_list ap) {
+int pc_autotrade_final(union DBKey key, struct DBData *data, va_list ap)
+{
 	struct autotrade_vending* at_v = DB->data2ptr(data);
 	HPM->data_store_destroy(&at_v->hdata);
 	return 0;
diff --git a/src/map/pc.h b/src/map/pc.h
index 5c5ec131d..728d02734 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -33,8 +33,9 @@
 #include "map/status.h" // enum sc_type, OPTION_*
 #include "map/unit.h" // struct unit_data, struct view_data
 #include "map/vending.h" // struct s_vending
-#include "common/hercules.h"
+#include "common/db.h"
 #include "common/ers.h" // struct eri
+#include "common/hercules.h"
 #include "common/mmo.h" // JOB_*, MAX_FAME_LIST, struct fame_list, struct mmo_charstatus, NEW_CARTS
 
 /**
@@ -1084,7 +1085,7 @@ END_ZEROED_BLOCK; /* End */
 	void (*autotrade_start) (struct map_session_data *sd);
 	void (*autotrade_prepare) (struct map_session_data *sd);
 	void (*autotrade_populate) (struct map_session_data *sd);
-	int (*autotrade_final) (DBKey key, DBData *data, va_list ap);
+	int (*autotrade_final) (union DBKey key, struct DBData *data, va_list ap);
 
 	int (*check_job_name) (const char *name);
 	void (*update_idle_time) (struct map_session_data* sd, enum e_battle_config_idletime type);
diff --git a/src/map/pc_groups.c b/src/map/pc_groups.c
index b325a8ed7..5b12a45dd 100644
--- a/src/map/pc_groups.c
+++ b/src/map/pc_groups.c
@@ -465,7 +465,7 @@ void do_init_pc_groups(void) {
 /**
  * @see DBApply
  */
-static int group_db_clear_sub(DBKey key, DBData *data, va_list args)
+static int group_db_clear_sub(union DBKey key, struct DBData *data, va_list args)
 {
 	GroupSettings *group = DB->data2ptr(data);
 	if (group->name)
diff --git a/src/map/script.c b/src/map/script.c
index aeff221d4..bb6651ca5 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -3052,7 +3052,8 @@ unsigned int script_array_highest_key(struct script_state *st, struct map_sessio
 	}
 	return 0;
 }
-int script_free_array_db(DBKey key, DBData *data, va_list ap) {
+int script_free_array_db(union DBKey key, struct DBData *data, va_list ap)
+{
 	struct script_array *sa = DB->data2ptr(data);
 	aFree(sa->members);
 	ers_free(script->array_ers, sa);
@@ -4595,7 +4596,7 @@ int script_config_read(char *cfgName) {
 /**
  * @see DBApply
  */
-int db_script_free_code_sub(DBKey key, DBData *data, va_list ap)
+int db_script_free_code_sub(union DBKey key, struct DBData *data, va_list ap)
 {
 	struct script_code *code = DB->data2ptr(data);
 	if (code)
@@ -4671,7 +4672,8 @@ void script_setarray_pc(struct map_session_data* sd, const char* varname, uint32
 /**
  * Clears persistent variables from memory
  **/
-int script_reg_destroy(DBKey key, DBData *data, va_list ap) {
+int script_reg_destroy(union DBKey key, struct DBData *data, va_list ap)
+{
 	struct script_reg_state *src;
 
 	if( data->type != DB_DATA_PTR )/* got no need for those! */
@@ -5130,7 +5132,8 @@ void script_clear_translations(bool reload) {
 /**
  *
  **/
-int script_translation_db_destroyer(DBKey key, DBData *data, va_list ap) {
+int script_translation_db_destroyer(union DBKey key, struct DBData *data, va_list ap)
+{
 	DBMap *string_db = DB->data2ptr(data);
 
 	if( db_size(string_db) ) {
diff --git a/src/map/script.h b/src/map/script.h
index e5a8d3edd..368247c63 100644
--- a/src/map/script.h
+++ b/src/map/script.h
@@ -751,7 +751,7 @@ struct script_interface {
 	void (*op_1) (struct script_state *st, int op);
 	void (*check_buildin_argtype) (struct script_state *st, int func);
 	void (*detach_state) (struct script_state *st, bool dequeue_event);
-	int (*db_free_code_sub) (DBKey key, DBData *data, va_list ap);
+	int (*db_free_code_sub) (union DBKey key, struct DBData *data, va_list ap);
 	void (*add_autobonus) (const char *autobonus);
 	int (*menu_countoptions) (const char *str, int max_count, int *total);
 	int (*buildin_areawarp_sub) (struct block_list *bl, va_list ap);
@@ -794,11 +794,11 @@ struct script_interface {
 	void (*array_add_member) (struct script_array *sa, unsigned int idx);
 	unsigned int (*array_size) (struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref);
 	unsigned int (*array_highest_key) (struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref);
-	int (*array_free_db) (DBKey key, DBData *data, va_list ap);
+	int (*array_free_db) (union DBKey key, struct DBData *data, va_list ap);
 	void (*array_ensure_zero) (struct script_state *st, struct map_session_data *sd, int64 uid, struct reg_db *ref);
 	/* */
 	void (*reg_destroy_single) (struct map_session_data *sd, int64 reg, struct script_reg_state *data);
-	int (*reg_destroy) (DBKey key, DBData *data, va_list ap);
+	int (*reg_destroy) (union DBKey key, struct DBData *data, va_list ap);
 	/* */
 	void (*generic_ui_array_expand) (unsigned int plus);
 	unsigned int *(*array_cpy_list) (struct script_array *sa);
@@ -808,7 +808,7 @@ struct script_interface {
 	int (*string_dup) (char *str);
 	void (*load_translations) (void);
 	void (*load_translation) (const char *file, uint8 lang_id, uint32 *total);
-	int (*translation_db_destroyer) (DBKey key, DBData *data, va_list ap);
+	int (*translation_db_destroyer) (union DBKey key, struct DBData *data, va_list ap);
 	void (*clear_translations) (bool reload);
 	int (*parse_cleanup_timer) (int tid, int64 tick, int id, intptr_t data);
 	uint8 (*add_language) (const char *name);
diff --git a/src/map/skill.c b/src/map/skill.c
index 13418fece..31be52ae3 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -16554,7 +16554,8 @@ int skill_unit_timer_sub_onplace(struct block_list* bl, va_list ap) {
 /**
  * @see DBApply
  */
-int skill_unit_timer_sub(DBKey key, DBData *data, va_list ap) {
+int skill_unit_timer_sub(union DBKey key, struct DBData *data, va_list ap)
+{
 	struct skill_unit* su = DB->data2ptr(data);
 	struct skill_unit_group* group = su->group;
 	int64 tick = va_arg(ap,int64);
diff --git a/src/map/skill.h b/src/map/skill.h
index fb2acfb62..2f8525654 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -2031,7 +2031,7 @@ struct skill_interface {
 	int (*blockmerc_end) (int tid, int64 tick, int id, intptr_t data);
 	int (*split_atoi) (char *str, int *val);
 	int (*unit_timer) (int tid, int64 tick, int id, intptr_t data);
-	int (*unit_timer_sub) (DBKey key, DBData *data, va_list ap);
+	int (*unit_timer_sub) (union DBKey key, struct DBData *data, va_list ap);
 	void (*init_unit_layout) (void);
 	bool (*parse_row_skilldb) (char* split[], int columns, int current);
 	bool (*parse_row_requiredb) (char* split[], int columns, int current);
diff --git a/src/map/storage.c b/src/map/storage.c
index b8ec1e31e..91b37eb19 100644
--- a/src/map/storage.c
+++ b/src/map/storage.c
@@ -79,7 +79,7 @@ void storage_sortitem(struct item* items, unsigned int size)
  * Parses storage and saves 'dirty' ones upon reconnect. [Skotlex]
  * @see DBApply
  */
-int storage_reconnect_sub(DBKey key, DBData *data, va_list ap)
+int storage_reconnect_sub(union DBKey key, struct DBData *data, va_list ap)
 {
 	struct guild_storage *stor = DB->data2ptr(data);
 	if (stor->dirty && stor->storage_status == 0) //Save closed storages.
@@ -366,7 +366,7 @@ void storage_storage_quit(struct map_session_data* sd, int flag) {
 /**
  * @see DBCreateData
  */
-DBData create_guildstorage(DBKey key, va_list args)
+struct DBData create_guildstorage(union DBKey key, va_list args)
 {
 	struct guild_storage *gs = NULL;
 	gs = (struct guild_storage *) aCalloc(sizeof(struct guild_storage), 1);
diff --git a/src/map/storage.h b/src/map/storage.h
index bddd03770..2c7ee4ffe 100644
--- a/src/map/storage.h
+++ b/src/map/storage.h
@@ -52,7 +52,7 @@ struct storage_interface {
 	void (*pc_quit) (struct map_session_data *sd, int flag);
 	int (*comp_item) (const void *i1_, const void *i2_);
 	void (*sortitem) (struct item* items, unsigned int size);
-	int (*reconnect_sub) (DBKey key, DBData *data, va_list ap);
+	int (*reconnect_sub) (union DBKey key, struct DBData *data, va_list ap);
 };
 
 struct guild_storage_interface {
@@ -75,7 +75,7 @@ struct guild_storage_interface {
 	int (*pc_quit) (struct map_session_data *sd,int flag);
 	int (*save) (int account_id, int guild_id, int flag);
 	int (*saved) (int guild_id); //Ack from char server that guild store was saved.
-	DBData (*create) (DBKey key, va_list args);
+	struct DBData (*create) (union DBKey key, va_list args);
 };
 
 #ifdef HERCULES_CORE