bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

changed alpm_db_register() prototype

Browse source
This commit is contained in:
Aurelien Foret 2005-03-29 20:52:22 +00:00
parent d16c8be8a0
commit cca46deb6f
2 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
lib/libalpm/alpm.c
View file

@ -141,36 +141,37 @@ int alpm_get_option(unsigned char parm, long *data)
* Databases * Databases
*/ */
int alpm_db_register(char *treename, PM_DB **db) PM_DB *alpm_db_register(char *treename)
{ {
pmdb_t *db;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, NULL));
ASSERT(treename != NULL && strlen(treename) != 0, RET_ERR(PM_ERR_WRONG_ARGS, -1)); ASSERT(treename != NULL && strlen(treename) != 0, RET_ERR(PM_ERR_WRONG_ARGS, NULL));
ASSERT(db != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
/* ORE /* ORE
check if the db if already registered */ check if the db if already registered */
*db = db_open(handle->root, handle->dbpath, treename); db = db_open(handle->root, handle->dbpath, treename);
if(*db == NULL) { if(db == NULL) {
/* couldn't open the db directory - try creating it */ /* couldn't open the db directory - try creating it */
if(db_create(handle->root, handle->dbpath, treename) == -1) { if(db_create(handle->root, handle->dbpath, treename) == -1) {
RET_ERR(PM_ERR_DB_CREATE, -1); RET_ERR(PM_ERR_DB_CREATE, NULL);
} }
*db = db_open(handle->root, handle->dbpath, treename); db = db_open(handle->root, handle->dbpath, treename);
if(*db == NULL) { if(db == NULL) {
/* couldn't open the db directory, try creating it */ /* couldn't open the db directory */
RET_ERR(PM_ERR_DB_OPEN, -1); RET_ERR(PM_ERR_DB_OPEN, NULL);
} }
} }
if(strcmp(treename, "local") == 0) { if(strcmp(treename, "local") == 0) {
handle->db_local = *db; handle->db_local = db;
} else { } else {
handle->dbs_sync = pm_list_add(handle->dbs_sync, *db); handle->dbs_sync = pm_list_add(handle->dbs_sync, db);
} }
return(0); return(db);
} }
int alpm_db_unregister(PM_DB *db) int alpm_db_unregister(PM_DB *db)

2
lib/libalpm/alpm.h
View file

@ -93,7 +93,7 @@ int alpm_get_option(unsigned char parm, long *data);
* Databases * Databases
*/ */
int alpm_db_register(char *treename, PM_DB **db); PM_DB *alpm_db_register(char *treename);
int alpm_db_unregister(PM_DB *db); int alpm_db_unregister(PM_DB *db);
int alpm_db_getlastupdate(PM_DB *db, char *ts); int alpm_db_getlastupdate(PM_DB *db, char *ts);