From 33369a948f2d6ba2059f81816ea7b16e486090ba Mon Sep 17 00:00:00 2001 From: gepard1984 Date: Fri, 9 Mar 2012 14:31:15 +0000 Subject: Code cleanup: replaced `DBIterator` function calls with macros where possible. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15668 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/guild.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/map/guild.c') diff --git a/src/map/guild.c b/src/map/guild.c index 70f5361bb..deb603473 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -187,14 +187,14 @@ struct guild* guild_search(int guild_id) struct guild* guild_searchname(char* str) { struct guild* g; + DBIterator *iter = db_iterator(guild_db); - DBIterator* iter = guild_db->iterator(guild_db); - for( g = (struct guild*)iter->first(iter,NULL); iter->exists(iter); g = (struct guild*)iter->next(iter,NULL) ) + for( g = dbi_first(iter); dbi_exists(iter); g = dbi_next(iter) ) { if( strcmpi(g->name, str) == 0 ) break; } - iter->destroy(iter); + dbi_destroy(iter); return g; } @@ -209,14 +209,14 @@ struct guild_castle* guild_castle_search(int gcid) struct guild_castle* guild_mapindex2gc(short mapindex) { struct guild_castle* gc; + DBIterator *iter = db_iterator(castle_db); - DBIterator* iter = castle_db->iterator(castle_db); - for( gc = (struct guild_castle*)iter->first(iter,NULL); iter->exists(iter); gc = (struct guild_castle*)iter->next(iter,NULL) ) + for( gc = dbi_first(iter); dbi_exists(iter); gc = dbi_next(iter) ) { if( gc->mapindex == mapindex ) break; } - iter->destroy(iter); + dbi_destroy(iter); return gc; } -- cgit v1.2.3-60-g2f50