diff options
| author | shennetsind <ind@henn.et> | 2013-06-08 17:31:28 -0300 |
|---|---|---|
| committer | Euphy <euphy@rathena.org> | 2013-06-15 15:43:22 -0400 |
| commit | 6f77eb8e69c475ac35f9ca4264eb417da6b60e55 (patch) | |
| tree | 2f2f1a8a31142a23d3b877d10a583965bec37614 /src/map/map.c | |
| parent | 130ec104a8e8742df4d7ead13c42ee803c55f52b (diff) | |
| download | hercules-6f77eb8e69c475ac35f9ca4264eb417da6b60e55.tar.gz hercules-6f77eb8e69c475ac35f9ca4264eb417da6b60e55.tar.bz2 hercules-6f77eb8e69c475ac35f9ca4264eb417da6b60e55.tar.xz hercules-6f77eb8e69c475ac35f9ca4264eb417da6b60e55.zip | |
Follow up d73783f22b2bb881aab74524d153d89a5932a199
Adjusting db.c interface name to adhere with the rest (pretty much we try to make it as short as we can, and being there were no conflicts we saw no reason to maintain the 'i')
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/map/map.c b/src/map/map.c index bb1ea4fb4..44b328d05 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -1490,7 +1490,7 @@ static DBData create_charid2nick(DBKey key, va_list args) { struct charid2nick *p; CREATE(p, struct charid2nick, 1); - return iDB->ptr2data(p); + return DB->ptr2data(p); } /// Adds(or replaces) the nick of charid to nick_db and fullfils pending requests. @@ -1526,7 +1526,7 @@ void map_delnickdb(int charid, const char* name) struct map_session_data* sd; DBData data; - if (!nick_db->remove(nick_db, iDB->i2key(charid), &data) || (p = iDB->data2ptr(&data)) == NULL) + if (!nick_db->remove(nick_db, DB->i2key(charid), &data) || (p = DB->data2ptr(&data)) == NULL) return; while( p->requests ) { @@ -2751,7 +2751,7 @@ static DBData create_map_data_other_server(DBKey key, va_list args) mdos=(struct map_data_other_server *)aCalloc(1,sizeof(struct map_data_other_server)); mdos->index = mapindex; memcpy(mdos->name, mapindex_id2name(mapindex), MAP_NAME_LENGTH); - return iDB->ptr2data(mdos); + return DB->ptr2data(mdos); } /*========================================== @@ -2781,7 +2781,7 @@ int map_setipport(unsigned short mapindex, uint32 ip, uint16 port) */ int map_eraseallipport_sub(DBKey key, DBData *data, va_list va) { - struct map_data_other_server *mdos = iDB->data2ptr(data); + struct map_data_other_server *mdos = DB->data2ptr(data); if(mdos->cell == NULL) { db_remove(map_db,key); aFree(mdos); @@ -4961,7 +4961,7 @@ void read_map_zone_db(void) { * @see DBApply */ int map_db_final(DBKey key, DBData *data, va_list ap) { - struct map_data_other_server *mdos = iDB->data2ptr(data); + struct map_data_other_server *mdos = DB->data2ptr(data); if(mdos && iMalloc->verify_ptr(mdos) && mdos->cell == NULL) aFree(mdos); @@ -4974,7 +4974,7 @@ int map_db_final(DBKey key, DBData *data, va_list ap) { */ int nick_db_final(DBKey key, DBData *data, va_list args) { - struct charid2nick* p = iDB->data2ptr(data); + struct charid2nick* p = DB->data2ptr(data); struct charid_request* req; if( p == NULL ) @@ -5021,7 +5021,7 @@ int cleanup_sub(struct block_list *bl, va_list ap) { */ static int cleanup_db_sub(DBKey key, DBData *data, va_list va) { - return iMap->cleanup_sub(iDB->data2ptr(data), va); + return iMap->cleanup_sub(DB->data2ptr(data), va); } /*========================================== |