diff --git b/src/alpm-query.c a/src/alpm-query.c
index 34f840d..735d0ff 100644
--- b/src/alpm-query.c
+++ a/src/alpm-query.c
@@ -117,7 +117,7 @@ static int parse_configfile (alpm_list_t **dbs, const char *configfile, int reg)
}
if (reg)
{
- if ((db = alpm_db_register_sync(config.handle, ptr, ALPM_SIG_USE_DEFAULT)) == NULL)
+ if ((db = alpm_register_syncdb(config.handle, ptr, ALPM_SIG_USE_DEFAULT)) == NULL)
{
fprintf(stderr,
"could not register '%s' database (%s)\n", ptr,
@@ -221,7 +221,7 @@ static int filter (alpm_pkg_t *pkg, unsigned int _filter)
}
}
if (_filter & F_UPGRADES)
- if (!alpm_sync_newversion (pkg, alpm_option_get_syncdbs(config.handle)))
+ if (!alpm_sync_newversion (pkg, alpm_get_syncdbs(config.handle)))
return 0;
if (_filter & F_GROUP)
if (!alpm_pkg_get_groups (pkg))
@@ -351,7 +351,7 @@ int list_grp (alpm_db_t *db, alpm_list_t *targets)
for (t=targets; t; t = alpm_list_next (t))
{
const char *grp_name = t->data;
- grp = alpm_db_readgroup (db, grp_name);
+ grp = alpm_db_get_group (db, grp_name);
if (grp)
{
alpm_list_t *i;
@@ -396,7 +396,7 @@ int alpm_search_local (unsigned short _filter, const char *format,
alpm_pkg_t *pkg;
int ret=0;

- for(i = alpm_db_get_pkgcache(alpm_option_get_localdb(config.handle));
+ for(i = alpm_db_get_pkgcache(alpm_get_localdb(config.handle));
i; i = alpm_list_next(i))
{
pkg = i->data;
@@ -436,7 +436,7 @@ alpm_pkg_t *get_sync_pkg_by_name (const char *pkgname)
{
alpm_pkg_t *sync_pkg = NULL;
alpm_list_t *i;
- for (i=alpm_option_get_syncdbs(config.handle); i; i = alpm_list_next (i))
+ for (i=alpm_get_syncdbs(config.handle); i; i = alpm_list_next (i))
{
sync_pkg = alpm_db_get_pkg (i->data, pkgname);
if (sync_pkg) break;
@@ -619,7 +619,7 @@ const char *alpm_local_pkg_get_str (const char *pkg_name, unsigned char c)
}
info = NULL;
if (!pkg_name) return NULL;
- pkg = alpm_db_get_pkg(alpm_option_get_localdb(config.handle), pkg_name);
+ pkg = alpm_db_get_pkg(alpm_get_localdb(config.handle), pkg_name);
if (!pkg) return NULL;
switch (c)
{
diff --git b/src/package-query.c a/src/package-query.c
index 75b7bb6..7e3b3a8 100644
--- b/src/package-query.c
+++ a/src/package-query.c
@@ -482,19 +482,19 @@ int main (int argc, char **argv)
/*printf ("%d, aur %d, local %d, sync %d\n", i, config.aur, config.db_local, config.db_sync);*/
if (config.db_sync == i)
{
- for(t = alpm_option_get_syncdbs(config.handle); t; t = alpm_list_next(t))
+ for(t = alpm_get_syncdbs(config.handle); t; t = alpm_list_next(t))
ret += deal_db (t->data);
if (!ret && config.op == OP_INFO_P)
{
config.op = OP_QUERY;
config.query = OP_Q_PROVIDES;
- for(t = alpm_option_get_syncdbs(config.handle); t; t = alpm_list_next(t))
+ for(t = alpm_get_syncdbs(config.handle); t; t = alpm_list_next(t))
ret += deal_db (t->data);
config.op = OP_INFO_P;
}
}
else if (config.db_local == i)
- ret += deal_db (alpm_option_get_localdb(config.handle));
+ ret += deal_db (alpm_get_localdb(config.handle));
else if (config.aur == i)
switch (config.op)
{
@@ -518,7 +518,7 @@ int main (int argc, char **argv)
ret += aur_info (&targets);
if (config.db_local)
/* -AQm */
- ret += search_pkg_by_name (alpm_option_get_localdb(config.handle), &targets);
+ ret += search_pkg_by_name (alpm_get_localdb(config.handle), &targets);
}
else if (config.filter & F_UPGRADES)
{
diff --git b/src/util.c a/src/util.c
index d9cafcb..5188450 100644
--- b/src/util.c
+++ a/src/util.c
@@ -82,7 +82,7 @@ static time_t results_installdate (const results_t *r)
time_t idate=0;
if (r->type==R_AUR_PKG) return 0;
r_name = results_name (r);
- pkg = alpm_db_get_pkg(alpm_option_get_localdb(config.handle), r_name);
+ pkg = alpm_db_get_pkg(alpm_get_localdb(config.handle), r_name);
if (pkg) idate = alpm_pkg_get_installdate(pkg);
return idate;
}