From ddad400900fbf253f6e247f51ef4aeb9d89d8643 Mon Sep 17 00:00:00 2001
From: Allan McRae <allan@archlinux.org>
Date: Tue, 28 Jun 2011 14:50:48 +1000
Subject: Rename pmerrno_t to alpm_errno_t
Signed-off-by: Allan McRae <allan@archlinux.org>
---
lib/libalpm/alpm.c | 4 ++--
lib/libalpm/alpm.h | 8 ++++----
lib/libalpm/error.c | 4 ++--
lib/libalpm/handle.c | 2 +-
lib/libalpm/handle.h | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
(limited to 'lib/libalpm')
diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c
index 4cafa6a3..abbc7db8 100644
--- a/lib/libalpm/alpm.c
+++ b/lib/libalpm/alpm.c
@@ -47,9 +47,9 @@
* @return a context handle on success, NULL on error, err will be set if provided
*/
alpm_handle_t SYMEXPORT *alpm_initialize(const char *root, const char *dbpath,
- enum _pmerrno_t *err)
+ enum _alpm_errno_t *err)
{
- enum _pmerrno_t myerr;
+ enum _alpm_errno_t myerr;
const char *lf = "db.lck";
size_t lockfilelen;
alpm_handle_t *myhandle = _alpm_handle_new();
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index cf040807..54a9ba42 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -983,7 +983,7 @@ char *alpm_compute_md5sum(const char *name);
/** @addtogroup alpm_api_errors Error Codes
* @{
*/
-enum _pmerrno_t {
+enum _alpm_errno_t {
PM_ERR_MEMORY = 1,
PM_ERR_SYSTEM,
PM_ERR_BADPERMS,
@@ -1048,16 +1048,16 @@ enum _pmerrno_t {
};
/** Returns the current error code from the handle. */
-enum _pmerrno_t alpm_errno(alpm_handle_t *handle);
+enum _alpm_errno_t alpm_errno(alpm_handle_t *handle);
/** Returns the string corresponding to an error number. */
-const char *alpm_strerror(enum _pmerrno_t err);
+const char *alpm_strerror(enum _alpm_errno_t err);
/* End of alpm_api_errors */
/** @} */
alpm_handle_t *alpm_initialize(const char *root, const char *dbpath,
- enum _pmerrno_t *err);
+ enum _alpm_errno_t *err);
int alpm_release(alpm_handle_t *handle);
const char *alpm_version(void);
diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c
index fb0493ff..225d8859 100644
--- a/lib/libalpm/error.c
+++ b/lib/libalpm/error.c
@@ -29,12 +29,12 @@
#include "alpm.h"
#include "handle.h"
-enum _pmerrno_t SYMEXPORT alpm_errno(alpm_handle_t *handle)
+enum _alpm_errno_t SYMEXPORT alpm_errno(alpm_handle_t *handle)
{
return handle->pm_errno;
}
-const char SYMEXPORT *alpm_strerror(enum _pmerrno_t err)
+const char SYMEXPORT *alpm_strerror(enum _alpm_errno_t err)
{
switch(err) {
/* System */
diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c
index 48b674c0..bb2ce50c 100644
--- a/lib/libalpm/handle.c
+++ b/lib/libalpm/handle.c
@@ -303,7 +303,7 @@ static char *canonicalize_path(const char *path) {
return new_path;
}
-enum _pmerrno_t _alpm_set_directory_option(const char *value,
+enum _alpm_errno_t _alpm_set_directory_option(const char *value,
char **storage, int must_exist)
{
struct stat st;
diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h
index c0078b0b..4b366193 100644
--- a/lib/libalpm/handle.h
+++ b/lib/libalpm/handle.h
@@ -72,7 +72,7 @@ struct __alpm_handle_t {
pgp_verify_t sigverify; /* Default signature verification level */
/* error code */
- enum _pmerrno_t pm_errno;
+ enum _alpm_errno_t pm_errno;
};
alpm_handle_t *_alpm_handle_new(void);
@@ -81,7 +81,7 @@ void _alpm_handle_free(alpm_handle_t *handle);
int _alpm_handle_lock(alpm_handle_t *handle);
int _alpm_handle_unlock(alpm_handle_t *handle);
-enum _pmerrno_t _alpm_set_directory_option(const char *value,
+enum _alpm_errno_t _alpm_set_directory_option(const char *value,
char **storage, int must_exist);
#endif /* _ALPM_HANDLE_H */
--
cgit v1.2.3-70-g09d2