summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2011-06-28 14:50:48 +1000
committerAllan McRae <allan@archlinux.org>2011-06-28 23:28:24 +1000
commitddad400900fbf253f6e247f51ef4aeb9d89d8643 (patch)
tree41ba168a977c3ee2b9f13b86d7d6e2b99b92aaec /src
parent1059df7486054c621423436b801681775a2596c3 (diff)
downloadpacman-ddad400900fbf253f6e247f51ef4aeb9d89d8643.tar.xz
Rename pmerrno_t to alpm_errno_t
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'src')
-rw-r--r--src/pacman/conf.c2
-rw-r--r--src/pacman/remove.c2
-rw-r--r--src/pacman/sync.c6
-rw-r--r--src/pacman/upgrade.c4
-rw-r--r--src/pacman/util.c2
-rw-r--r--src/util/cleanupdelta.c2
-rw-r--r--src/util/pactree.c2
-rw-r--r--src/util/testdb.c2
-rw-r--r--src/util/testpkg.c2
9 files changed, 12 insertions, 12 deletions
diff --git a/src/pacman/conf.c b/src/pacman/conf.c
index d3dbc9da..368e71fa 100644
--- a/src/pacman/conf.c
+++ b/src/pacman/conf.c
@@ -420,7 +420,7 @@ static int _add_mirror(alpm_db_t *db, char *value)
static int setup_libalpm(void)
{
int ret = 0;
- enum _pmerrno_t err;
+ enum _alpm_errno_t err;
alpm_handle_t *handle;
pm_printf(PM_LOG_DEBUG, "setup_libalpm called\n");
diff --git a/src/pacman/remove.c b/src/pacman/remove.c
index eab8bdfc..d48b0386 100644
--- a/src/pacman/remove.c
+++ b/src/pacman/remove.c
@@ -102,7 +102,7 @@ int pacman_remove(alpm_list_t *targets)
/* Step 2: prepare the transaction based on its type, targets and flags */
if(alpm_trans_prepare(config->handle, &data) == -1) {
- enum _pmerrno_t err = alpm_errno(config->handle);
+ enum _alpm_errno_t err = alpm_errno(config->handle);
pm_fprintf(stderr, PM_LOG_ERROR, _("failed to prepare transaction (%s)\n"),
alpm_strerror(err));
switch(err) {
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index 5b06a806..20be450c 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -615,7 +615,7 @@ static int process_pkg(alpm_pkg_t *pkg)
int ret = alpm_add_pkg(config->handle, pkg);
if(ret == -1) {
- enum _pmerrno_t err = alpm_errno(config->handle);
+ enum _alpm_errno_t err = alpm_errno(config->handle);
if(err == PM_ERR_TRANS_DUP_TARGET
|| err == PM_ERR_PKG_IGNORED) {
/* just skip duplicate or ignored targets */
@@ -763,7 +763,7 @@ static int sync_trans(alpm_list_t *targets)
/* Step 2: "compute" the transaction based on targets and flags */
if(alpm_trans_prepare(config->handle, &data) == -1) {
- enum _pmerrno_t err = alpm_errno(config->handle);
+ enum _alpm_errno_t err = alpm_errno(config->handle);
pm_fprintf(stderr, PM_LOG_ERROR, _("failed to prepare transaction (%s)\n"),
alpm_strerror(err));
switch(err) {
@@ -830,7 +830,7 @@ static int sync_trans(alpm_list_t *targets)
}
if(alpm_trans_commit(config->handle, &data) == -1) {
- enum _pmerrno_t err = alpm_errno(config->handle);
+ enum _alpm_errno_t err = alpm_errno(config->handle);
pm_fprintf(stderr, PM_LOG_ERROR, _("failed to commit transaction (%s)\n"),
alpm_strerror(err));
switch(err) {
diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c
index 7f6e0986..31536a43 100644
--- a/src/pacman/upgrade.c
+++ b/src/pacman/upgrade.c
@@ -94,7 +94,7 @@ int pacman_upgrade(alpm_list_t *targets)
/* Step 2: "compute" the transaction based on targets and flags */
/* TODO: No, compute nothing. This is stupid. */
if(alpm_trans_prepare(config->handle, &data) == -1) {
- enum _pmerrno_t err = alpm_errno(config->handle);
+ enum _alpm_errno_t err = alpm_errno(config->handle);
pm_fprintf(stderr, PM_LOG_ERROR, _("failed to prepare transaction (%s)\n"),
alpm_strerror(err));
switch(err) {
@@ -162,7 +162,7 @@ int pacman_upgrade(alpm_list_t *targets)
}
if(alpm_trans_commit(config->handle, &data) == -1) {
- enum _pmerrno_t err = alpm_errno(config->handle);
+ enum _alpm_errno_t err = alpm_errno(config->handle);
pm_fprintf(stderr, PM_LOG_ERROR, _("failed to commit transaction (%s)\n"),
alpm_strerror(err));
switch(err) {
diff --git a/src/pacman/util.c b/src/pacman/util.c
index a661b2e9..6a93f6df 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -60,7 +60,7 @@ int trans_init(alpm_transflag_t flags)
}
if(ret == -1) {
- enum _pmerrno_t err = alpm_errno(config->handle);
+ enum _alpm_errno_t err = alpm_errno(config->handle);
pm_fprintf(stderr, PM_LOG_ERROR, _("failed to init transaction (%s)\n"),
alpm_strerror(err));
if(err == PM_ERR_HANDLE_LOCK) {
diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c
index 43897730..70fb7607 100644
--- a/src/util/cleanupdelta.c
+++ b/src/util/cleanupdelta.c
@@ -96,7 +96,7 @@ static void usage(void) {
int main(int argc, char *argv[])
{
const char *dbpath = DBPATH;
- enum _pmerrno_t err;
+ enum _alpm_errno_t err;
int a = 1;
alpm_list_t *dbnames = NULL;
diff --git a/src/util/pactree.c b/src/util/pactree.c
index bdc1cb2f..7b87ac13 100644
--- a/src/util/pactree.c
+++ b/src/util/pactree.c
@@ -401,7 +401,7 @@ static void walk_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, int depth)
int main(int argc, char *argv[])
{
int freelist = 0, ret = 0;
- enum _pmerrno_t err;
+ enum _alpm_errno_t err;
const char *target_name;
alpm_pkg_t *pkg;
alpm_list_t *dblist = NULL;
diff --git a/src/util/testdb.c b/src/util/testdb.c
index c887f6d5..b8ab33ca 100644
--- a/src/util/testdb.c
+++ b/src/util/testdb.c
@@ -180,7 +180,7 @@ static void usage(void) {
int main(int argc, char *argv[])
{
int ret = 0;
- enum _pmerrno_t err;
+ enum _alpm_errno_t err;
const char *dbpath = DBPATH;
int a = 1;
alpm_list_t *dbnames = NULL;
diff --git a/src/util/testpkg.c b/src/util/testpkg.c
index 70a395e8..a745984d 100644
--- a/src/util/testpkg.c
+++ b/src/util/testpkg.c
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
{
int retval = 1; /* default = false */
alpm_handle_t *handle;
- enum _pmerrno_t err;
+ enum _alpm_errno_t err;
alpm_pkg_t *pkg = NULL;
if(argc != 2) {