diff options
| author | Dan McGee <dan@archlinux.org> | 2011-07-03 21:44:57 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-07-03 21:44:57 +0200 |
| commit | 1ce7f39ad73c5c96870c6036014afad3d49a8edf (patch) | |
| tree | 616b3259a2a6c4bcad5a5433a02985352c60699d /src/util | |
| parent | c839415e3fb4bcde11de3cb7595cec93501bed13 (diff) | |
| parent | afc96f2ab3d05f14a73e81f871164f01423b5572 (diff) | |
| download | pacman-1ce7f39ad73c5c96870c6036014afad3d49a8edf.tar.gz pacman-1ce7f39ad73c5c96870c6036014afad3d49a8edf.tar.xz | |
Merge remote-tracking branch 'allan/ALPM'
Conflicts:
lib/libalpm/be_local.c
lib/libalpm/be_package.c
lib/libalpm/conflict.c
lib/libalpm/diskspace.c
lib/libalpm/dload.c
lib/libalpm/remove.c
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/cleanupdelta.c | 6 | ||||
| -rw-r--r-- | src/util/testdb.c | 4 | ||||
| -rw-r--r-- | src/util/testpkg.c | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index 70fb7607..08d8a557 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -43,9 +43,9 @@ static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) { if(strlen(fmt)) { switch(level) { - case PM_LOG_ERROR: printf("error: "); break; - case PM_LOG_WARNING: printf("warning: "); break; - //case PM_LOG_DEBUG: printf("debug: "); break; + case ALPM_LOG_ERROR: printf("error: "); break; + case ALPM_LOG_WARNING: printf("warning: "); break; + //case ALPM_LOG_DEBUG: printf("debug: "); break; default: return; } vprintf(fmt, args); diff --git a/src/util/testdb.c b/src/util/testdb.c index b8ab33ca..642890b6 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -45,8 +45,8 @@ static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) { if(strlen(fmt)) { switch(level) { - case PM_LOG_ERROR: printf("error: "); break; - case PM_LOG_WARNING: printf("warning: "); break; + case ALPM_LOG_ERROR: printf("error: "); break; + case ALPM_LOG_WARNING: printf("warning: "); break; default: return; } vprintf(fmt, args); diff --git a/src/util/testpkg.c b/src/util/testpkg.c index a745984d..03234ed5 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -30,8 +30,8 @@ static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) return; } switch(level) { - case PM_LOG_ERROR: printf("error: "); break; - case PM_LOG_WARNING: printf("warning: "); break; + case ALPM_LOG_ERROR: printf("error: "); break; + case ALPM_LOG_WARNING: printf("warning: "); break; default: return; /* skip other messages */ } vprintf(fmt, args); @@ -62,11 +62,11 @@ int main(int argc, char *argv[]) || pkg == NULL) { err = alpm_errno(handle); switch(err) { - case PM_ERR_PKG_OPEN: + case ALPM_ERR_PKG_OPEN: printf("Cannot open the given file.\n"); break; - case PM_ERR_LIBARCHIVE: - case PM_ERR_PKG_INVALID: + case ALPM_ERR_LIBARCHIVE: + case ALPM_ERR_PKG_INVALID: printf("Package is invalid.\n"); break; default: |