Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=8e4af263f69d4c434d9e98f207d9db4229d58dec
commit 8e4af263f69d4c434d9e98f207d9db4229d58dec Author: Michel Hermier <[email protected]> Date: Thu Oct 31 13:09:45 2013 +0100 libpacman: Extract _pacman_localdb_close and _pacman_syncdb_close of _pacman_db_close. diff --git a/lib/libpacman/be_files.c b/lib/libpacman/be_files.c index ceaa87e..8e08a65 100644 --- a/lib/libpacman/be_files.c +++ b/lib/libpacman/be_files.c @@ -103,12 +103,30 @@ int _pacman_localdb_open(pmdb_t *db) } static +void _pacman_localdb_close(pmdb_t *db) +{ + if(db->handle) { + closedir(db->handle); + db->handle = NULL; + } +} + +static pmlist_t *_pacman_syncdb_test(pmdb_t *db) { /* testing sync dbs is not supported */ return _pacman_list_new(); } +static +void _pacman_syncdb_close(pmdb_t *db) +{ + if(db->handle) { + archive_read_finish(db->handle); + db->handle = NULL; + } +} + pmlist_t *_pacman_db_test(pmdb_t *db) { ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, NULL)); @@ -161,13 +179,10 @@ void _pacman_db_close(pmdb_t *db) return; } - if(db->handle) { - if (islocal(db)) - closedir(db->handle); - else - archive_read_finish(db->handle); - db->handle = NULL; - } + if (islocal(db)) + _pacman_localdb_close(db); + else + _pacman_syncdb_close(db); } void _pacman_db_rewind(pmdb_t *db) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
