mirror of
https://github.com/moparisthebest/pacman
synced 2024-08-13 17:03:46 -04:00
Remove some db abstraction crap.
These db_open and db_close looked quite useless. And they caused the db directory to be opened on a simple registering of a database. This is totally unneeded, this opening can be delayed to when we actually need it. Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
This commit is contained in:
parent
eab9684837
commit
14230869e6
@ -214,36 +214,6 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db)
|
||||
return(0);
|
||||
}
|
||||
|
||||
int _alpm_db_open(pmdb_t *db)
|
||||
{
|
||||
ALPM_LOG_FUNC;
|
||||
|
||||
if(db == NULL) {
|
||||
RET_ERR(PM_ERR_DB_NULL, -1);
|
||||
}
|
||||
|
||||
_alpm_log(PM_LOG_DEBUG, "opening database from path '%s'\n", db->path);
|
||||
db->handle = opendir(db->path);
|
||||
if(db->handle == NULL) {
|
||||
RET_ERR(PM_ERR_DB_OPEN, -1);
|
||||
}
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
||||
void _alpm_db_close(pmdb_t *db)
|
||||
{
|
||||
ALPM_LOG_FUNC;
|
||||
|
||||
if(db == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
if(db->handle) {
|
||||
closedir(db->handle);
|
||||
db->handle = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
static int splitname(const char *target, pmpkg_t *pkg)
|
||||
{
|
||||
@ -290,13 +260,17 @@ int _alpm_db_populate(pmdb_t *db)
|
||||
struct dirent *ent = NULL;
|
||||
struct stat sbuf;
|
||||
char path[PATH_MAX];
|
||||
DIR *dbdir;
|
||||
|
||||
ALPM_LOG_FUNC;
|
||||
|
||||
ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
|
||||
|
||||
rewinddir(db->handle);
|
||||
while((ent = readdir(db->handle)) != NULL) {
|
||||
dbdir = opendir(db->path);
|
||||
if(dbdir == NULL) {
|
||||
RET_ERR(PM_ERR_DB_OPEN, -1);
|
||||
}
|
||||
while((ent = readdir(dbdir)) != NULL) {
|
||||
const char *name = ent->d_name;
|
||||
pmpkg_t *pkg;
|
||||
|
||||
@ -311,6 +285,7 @@ int _alpm_db_populate(pmdb_t *db)
|
||||
|
||||
pkg = _alpm_pkg_new();
|
||||
if(pkg == NULL) {
|
||||
closedir(dbdir);
|
||||
return(-1);
|
||||
}
|
||||
/* split the db entry name */
|
||||
@ -336,6 +311,7 @@ int _alpm_db_populate(pmdb_t *db)
|
||||
count++;
|
||||
}
|
||||
|
||||
closedir(dbdir);
|
||||
db->pkgcache = alpm_list_msort(db->pkgcache, count, _alpm_pkg_cmp);
|
||||
return(count);
|
||||
}
|
||||
|
@ -85,9 +85,6 @@ static void _alpm_db_unregister(pmdb_t *db)
|
||||
return;
|
||||
}
|
||||
|
||||
_alpm_log(PM_LOG_DEBUG, "closing database '%s'\n", db->treename);
|
||||
_alpm_db_close(db);
|
||||
|
||||
_alpm_log(PM_LOG_DEBUG, "unregistering database '%s'\n", db->treename);
|
||||
_alpm_db_free(db);
|
||||
}
|
||||
@ -466,12 +463,6 @@ pmdb_t *_alpm_db_register_local(void)
|
||||
RET_ERR(PM_ERR_DB_CREATE, NULL);
|
||||
}
|
||||
|
||||
_alpm_log(PM_LOG_DEBUG, "opening database '%s'\n", db->treename);
|
||||
if(_alpm_db_open(db) == -1) {
|
||||
_alpm_db_free(db);
|
||||
RET_ERR(PM_ERR_DB_OPEN, NULL);
|
||||
}
|
||||
|
||||
handle->db_local = db;
|
||||
return(db);
|
||||
}
|
||||
@ -522,12 +513,6 @@ pmdb_t *_alpm_db_register_sync(const char *treename)
|
||||
RET_ERR(PM_ERR_DB_CREATE, NULL);
|
||||
}
|
||||
|
||||
_alpm_log(PM_LOG_DEBUG, "opening database '%s'\n", db->treename);
|
||||
if(_alpm_db_open(db) == -1) {
|
||||
_alpm_db_free(db);
|
||||
RET_ERR(PM_ERR_DB_OPEN, NULL);
|
||||
}
|
||||
|
||||
handle->dbs_sync = alpm_list_add(handle->dbs_sync, db);
|
||||
return(db);
|
||||
}
|
||||
|
@ -41,7 +41,6 @@ typedef enum _pmdbinfrq_t {
|
||||
struct __pmdb_t {
|
||||
char *path;
|
||||
char *treename;
|
||||
void *handle;
|
||||
unsigned short pkgcache_loaded;
|
||||
alpm_list_t *pkgcache;
|
||||
unsigned short grpcache_loaded;
|
||||
@ -58,8 +57,6 @@ pmdb_t *_alpm_db_register_local(void);
|
||||
pmdb_t *_alpm_db_register_sync(const char *treename);
|
||||
|
||||
/* be.c, backend specific calls */
|
||||
int _alpm_db_open(pmdb_t *db);
|
||||
void _alpm_db_close(pmdb_t *db);
|
||||
int _alpm_db_populate(pmdb_t *db);
|
||||
int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq);
|
||||
int _alpm_db_prepare(pmdb_t *db, pmpkg_t *info);
|
||||
|
Loading…
Reference in New Issue
Block a user