moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-11-12 04:15:06 -05:00
Code Issues Releases Wiki Activity

Remove some db abstraction crap.

Browse Source 
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:
Xavier Chantry 2009-01-19 20:45:12 +01:00
parent eab9684837
commit 14230869e6
3 changed files with 8 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/libalpm/be_files.c
View File

@ -214,36 +214,6 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db)
return(0); 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) 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 dirent *ent = NULL;
struct stat sbuf; struct stat sbuf;
char path[PATH_MAX]; char path[PATH_MAX];
DIR *dbdir;
ALPM_LOG_FUNC; ALPM_LOG_FUNC;
ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
rewinddir(db->handle); dbdir = opendir(db->path);
while((ent = readdir(db->handle)) != NULL) { if(dbdir == NULL) {
RET_ERR(PM_ERR_DB_OPEN, -1);
}
while((ent = readdir(dbdir)) != NULL) {
const char *name = ent->d_name; const char *name = ent->d_name;
pmpkg_t *pkg; pmpkg_t *pkg;
@ -311,6 +285,7 @@ int _alpm_db_populate(pmdb_t *db)
pkg = _alpm_pkg_new(); pkg = _alpm_pkg_new();
if(pkg == NULL) { if(pkg == NULL) {
closedir(dbdir);
return(-1); return(-1);
} }
/* split the db entry name */ /* split the db entry name */
@ -336,6 +311,7 @@ int _alpm_db_populate(pmdb_t *db)
count++; count++;
} }
closedir(dbdir);
db->pkgcache = alpm_list_msort(db->pkgcache, count, _alpm_pkg_cmp); db->pkgcache = alpm_list_msort(db->pkgcache, count, _alpm_pkg_cmp);
return(count); return(count);
} }

15
lib/libalpm/db.c
View File

@ -85,9 +85,6 @@ static void _alpm_db_unregister(pmdb_t *db)
return; 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_log(PM_LOG_DEBUG, "unregistering database '%s'\n", db->treename);
_alpm_db_free(db); _alpm_db_free(db);
} }
@ -466,12 +463,6 @@ pmdb_t *_alpm_db_register_local(void)
RET_ERR(PM_ERR_DB_CREATE, NULL); 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; handle->db_local = db;
return(db); return(db);
} }
@ -522,12 +513,6 @@ pmdb_t *_alpm_db_register_sync(const char *treename)
RET_ERR(PM_ERR_DB_CREATE, NULL); 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); handle->dbs_sync = alpm_list_add(handle->dbs_sync, db);
return(db); return(db);
} }

3
lib/libalpm/db.h
View File

@ -41,7 +41,6 @@ typedef enum _pmdbinfrq_t {
struct __pmdb_t { struct __pmdb_t {
char *path; char *path;
char *treename; char *treename;
void *handle;
unsigned short pkgcache_loaded; unsigned short pkgcache_loaded;
alpm_list_t *pkgcache; alpm_list_t *pkgcache;
unsigned short grpcache_loaded; unsigned short grpcache_loaded;
@ -58,8 +57,6 @@ pmdb_t *_alpm_db_register_local(void);
pmdb_t *_alpm_db_register_sync(const char *treename); pmdb_t *_alpm_db_register_sync(const char *treename);
/* be.c, backend specific calls */ /* 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_populate(pmdb_t *db);
int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq); int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq);
int _alpm_db_prepare(pmdb_t *db, pmpkg_t *info); int _alpm_db_prepare(pmdb_t *db, pmpkg_t *info);