From 028b965e1a71aa85ba3772e20146d40d9006d8c9 Mon Sep 17 00:00:00 2001
From: Allan McRae <allan@archlinux.org>
Date: Tue, 28 Jun 2011 14:59:04 +1000
Subject: Rename pmdbinfrq_t to alpm_dbinfrq_t
Signed-off-by: Allan McRae <allan@archlinux.org>
---
lib/libalpm/be_local.c | 4 ++--
lib/libalpm/db.h | 10 +++++-----
lib/libalpm/package.h | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c
index 19b06bb5..2ee71cc0 100644
--- a/lib/libalpm/be_local.c
+++ b/lib/libalpm/be_local.c
@@ -498,7 +498,7 @@ static char *get_pkgpath(alpm_db_t *db, alpm_pkg_t *info)
}
-int _alpm_local_db_read(alpm_db_t *db, alpm_pkg_t *info, pmdbinfrq_t inforeq)
+int _alpm_local_db_read(alpm_db_t *db, alpm_pkg_t *info, alpm_dbinfrq_t inforeq)
{
FILE *fp = NULL;
char path[PATH_MAX];
@@ -742,7 +742,7 @@ int _alpm_local_db_prepare(alpm_db_t *db, alpm_pkg_t *info)
return retval;
}
-int _alpm_local_db_write(alpm_db_t *db, alpm_pkg_t *info, pmdbinfrq_t inforeq)
+int _alpm_local_db_write(alpm_db_t *db, alpm_pkg_t *info, alpm_dbinfrq_t inforeq)
{
FILE *fp = NULL;
char path[PATH_MAX];
diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h
index fe264f92..83fbcc78 100644
--- a/lib/libalpm/db.h
+++ b/lib/libalpm/db.h
@@ -33,7 +33,7 @@
#include "signing.h"
/* Database entries */
-typedef enum _pmdbinfrq_t {
+typedef enum _alpm_dbinfrq_t {
INFRQ_BASE = 1,
INFRQ_DESC = (1 << 1),
INFRQ_FILES = (1 << 2),
@@ -41,7 +41,7 @@ typedef enum _pmdbinfrq_t {
INFRQ_DSIZE = (1 << 4),
/* ALL should be info stored in the package or database */
INFRQ_ALL = 0x1F
-} pmdbinfrq_t;
+} alpm_dbinfrq_t;
/** Database status. Bitflags. */
enum _pmdbstatus_t {
@@ -87,9 +87,9 @@ alpm_db_t *_alpm_db_register_sync(alpm_handle_t *handle, const char *treename,
void _alpm_db_unregister(alpm_db_t *db);
/* be_*.c, backend specific calls */
-int _alpm_local_db_read(alpm_db_t *db, alpm_pkg_t *info, pmdbinfrq_t inforeq);
+int _alpm_local_db_read(alpm_db_t *db, alpm_pkg_t *info, alpm_dbinfrq_t inforeq);
int _alpm_local_db_prepare(alpm_db_t *db, alpm_pkg_t *info);
-int _alpm_local_db_write(alpm_db_t *db, alpm_pkg_t *info, pmdbinfrq_t inforeq);
+int _alpm_local_db_write(alpm_db_t *db, alpm_pkg_t *info, alpm_dbinfrq_t inforeq);
int _alpm_local_db_remove(alpm_db_t *db, alpm_pkg_t *info);
/* cache bullshit */
@@ -99,7 +99,7 @@ int _alpm_db_add_pkgincache(alpm_db_t *db, alpm_pkg_t *pkg);
int _alpm_db_remove_pkgfromcache(alpm_db_t *db, alpm_pkg_t *pkg);
alpm_pkghash_t *_alpm_db_get_pkgcache_hash(alpm_db_t *db);
alpm_list_t *_alpm_db_get_pkgcache(alpm_db_t *db);
-int _alpm_db_ensure_pkgcache(alpm_db_t *db, pmdbinfrq_t infolevel);
+int _alpm_db_ensure_pkgcache(alpm_db_t *db, alpm_dbinfrq_t infolevel);
alpm_pkg_t *_alpm_db_get_pkgfromcache(alpm_db_t *db, const char *target);
/* groups */
void _alpm_db_free_grpcache(alpm_db_t *db);
diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h
index 87f191bd..388a53c8 100644
--- a/lib/libalpm/package.h
+++ b/lib/libalpm/package.h
@@ -111,7 +111,7 @@ struct __alpm_pkg_t {
int scriptlet;
alpm_pkgreason_t reason;
- pmdbinfrq_t infolevel;
+ alpm_dbinfrq_t infolevel;
alpm_pkgfrom_t origin;
/* origin == PKG_FROM_FILE, use pkg->origin_data.file
* origin == PKG_FROM_*DB, use pkg->origin_data.db */
--
cgit v1.2.3-70-g09d2