Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2011-06-28 13:54:04 +1000
committerAllan McRae <allan@archlinux.org>2011-06-28 13:54:04 +1000
commit7ce674491bd854610855fe83482eda6b18273fa0 (patch)
tree9ed0c5cf4eafafefb74d909cd9b67ebfae462b52 /lib
parent9aab1440cacf143b62f05ccfac0e7917ef9d4c45 (diff)
Rename pmpkgreason_t to alpm_pkgreason_t
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/libalpm/alpm.h8
-rw-r--r--lib/libalpm/be_local.c4
-rw-r--r--lib/libalpm/db.c2
-rw-r--r--lib/libalpm/package.c4
-rw-r--r--lib/libalpm/package.h4
5 files changed, 11 insertions, 11 deletions
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index ac352131..00d21563 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -53,12 +53,12 @@ extern "C" {
* Install reasons.
* Why the package was installed.
*/
-typedef enum _pmpkgreason_t {
+typedef enum _alpm_pkgreason_t {
/** Explicitly requested by the user. */
PM_PKG_REASON_EXPLICIT = 0,
/** Installed as a dependency for another package. */
PM_PKG_REASON_DEPEND = 1
-} pmpkgreason_t;
+} alpm_pkgreason_t;
/** Types of version constraints in dependency specs. */
typedef enum _pmdepmod_t {
@@ -432,7 +432,7 @@ alpm_list_t *alpm_db_search(pmdb_t *db, const alpm_list_t* needles);
* @param reason the new install reason
* @return 0 on success, -1 on error (pm_errno is set accordingly)
*/
-int alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t reason);
+int alpm_db_set_pkgreason(pmdb_t *db, const char *name, alpm_pkgreason_t reason);
/** @} */
@@ -567,7 +567,7 @@ off_t alpm_pkg_get_isize(pmpkg_t *pkg);
* @param pkg a pointer to package
* @return an enum member giving the install reason.
*/
-pmpkgreason_t alpm_pkg_get_reason(pmpkg_t *pkg);
+alpm_pkgreason_t alpm_pkg_get_reason(pmpkg_t *pkg);
/** Returns the list of package licenses.
* @param pkg a pointer to package
diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c
index 50066883..a1e2a003 100644
--- a/lib/libalpm/be_local.c
+++ b/lib/libalpm/be_local.c
@@ -115,7 +115,7 @@ static off_t _cache_get_isize(pmpkg_t *pkg)
return pkg->isize;
}
-static pmpkgreason_t _cache_get_reason(pmpkg_t *pkg)
+static alpm_pkgreason_t _cache_get_reason(pmpkg_t *pkg)
{
LAZY_LOAD(INFRQ_DESC, -1);
return pkg->reason;
@@ -618,7 +618,7 @@ int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
if(fgets(line, sizeof(line), fp) == NULL) {
goto error;
}
- info->reason = (pmpkgreason_t)atol(_alpm_strtrim(line));
+ info->reason = (alpm_pkgreason_t)atol(_alpm_strtrim(line));
} else if(strcmp(line, "%SIZE%") == 0) {
/* NOTE: the CSIZE and SIZE fields both share the "size" field
* in the pkginfo_t struct. This can be done b/c CSIZE
diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c
index 9f37f80b..c1518101 100644
--- a/lib/libalpm/db.c
+++ b/lib/libalpm/db.c
@@ -268,7 +268,7 @@ alpm_list_t SYMEXPORT *alpm_db_search(pmdb_t *db, const alpm_list_t* needles)
}
/** Set install reason for a package in db. */
-int SYMEXPORT alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t reason)
+int SYMEXPORT alpm_db_set_pkgreason(pmdb_t *db, const char *name, alpm_pkgreason_t reason)
{
ASSERT(db != NULL, return -1);
db->handle->pm_errno = 0;
diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c
index 75ac94c7..dc890581 100644
--- a/lib/libalpm/package.c
+++ b/lib/libalpm/package.c
@@ -95,7 +95,7 @@ static const char *_pkg_get_md5sum(pmpkg_t *pkg) { return pkg->md5sum; }
static const char *_pkg_get_arch(pmpkg_t *pkg) { return pkg->arch; }
static off_t _pkg_get_size(pmpkg_t *pkg) { return pkg->size; }
static off_t _pkg_get_isize(pmpkg_t *pkg) { return pkg->isize; }
-static pmpkgreason_t _pkg_get_reason(pmpkg_t *pkg) { return pkg->reason; }
+static alpm_pkgreason_t _pkg_get_reason(pmpkg_t *pkg) { return pkg->reason; }
static int _pkg_has_scriptlet(pmpkg_t *pkg) { return pkg->scriptlet; }
static alpm_list_t *_pkg_get_licenses(pmpkg_t *pkg) { return pkg->licenses; }
@@ -246,7 +246,7 @@ off_t SYMEXPORT alpm_pkg_get_isize(pmpkg_t *pkg)
return pkg->ops->get_isize(pkg);
}
-pmpkgreason_t SYMEXPORT alpm_pkg_get_reason(pmpkg_t *pkg)
+alpm_pkgreason_t SYMEXPORT alpm_pkg_get_reason(pmpkg_t *pkg)
{
ASSERT(pkg != NULL, return -1);
pkg->handle->pm_errno = 0;
diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h
index d18020d4..fc1a7c3a 100644
--- a/lib/libalpm/package.h
+++ b/lib/libalpm/package.h
@@ -58,7 +58,7 @@ struct pkg_operations {
const char *(*get_arch) (pmpkg_t *);
off_t (*get_size) (pmpkg_t *);
off_t (*get_isize) (pmpkg_t *);
- pmpkgreason_t (*get_reason) (pmpkg_t *);
+ alpm_pkgreason_t (*get_reason) (pmpkg_t *);
int (*has_scriptlet) (pmpkg_t *);
alpm_list_t *(*get_licenses) (pmpkg_t *);
@@ -110,7 +110,7 @@ struct __pmpkg_t {
int scriptlet;
- pmpkgreason_t reason;
+ alpm_pkgreason_t reason;
pmdbinfrq_t infolevel;
pmpkgfrom_t origin;
/* origin == PKG_FROM_FILE, use pkg->origin_data.file