diff options
| author | Diogo Sousa <diogogsousa@gmail.com> | 2011-08-29 03:51:32 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-08-29 06:30:10 +0200 |
| commit | 3a458783a2617b7b22a756f95b5f66f3da79146f (patch) | |
| tree | fbb30be3953691a35ddf31181738ddd028aa94bd | |
| parent | 2cfcc874b9332ad207398b9e20dc8880d93e8ae4 (diff) | |
| download | pacman-3a458783a2617b7b22a756f95b5f66f3da79146f.tar.gz pacman-3a458783a2617b7b22a756f95b5f66f3da79146f.tar.xz | |
Removed multiple definitions of pkgfrom_t
libalpm now exports type alpm_pkgfrom_t in alpm.h, which may be used
by frontends.
Pacman now uses alpm_pkgfrom_t instead of replicating that type (pkg_from
as was in src/pacman/package.h)
Updated API change in README.
Signed-off-by: Diogo Sousa <diogogsousa@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | lib/libalpm/alpm.h | 6 | ||||
| -rw-r--r-- | lib/libalpm/package.h | 6 | ||||
| -rw-r--r-- | src/pacman/package.c | 2 | ||||
| -rw-r--r-- | src/pacman/package.h | 9 |
5 files changed, 9 insertions, 16 deletions
@@ -435,7 +435,7 @@ API CHANGES BETWEEN 3.5 AND 4.0 - structs: alpm_backup_t, alpm_file_t, alpm_filelist_t - enums: - alpm_siglevel_t, alpm_sigstatus_t, alpm_sigvalidity_t + alpm_siglevel_t, alpm_sigstatus_t, alpm_sigvalidity_t, alpm_pkgfrom_t - error codes: ALPM_ERR_DB_INVALID, ALPM_ERR_DB_INVALID_SIG, ALPM_ERR_GPGME, ALPM_ERR_PKG_INVALID_CHECKSUM, ALPM_ERR_PKG_INVALID_SIG, ALPM_ERR_SIG_INVALID, diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index c94cdf7f..2f625658 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -60,6 +60,12 @@ typedef enum _alpm_pkgreason_t { ALPM_PKG_REASON_DEPEND = 1 } alpm_pkgreason_t; +typedef enum _alpm_pkgfrom_t { + PKG_FROM_FILE = 1, + PKG_FROM_LOCALDB, + PKG_FROM_SYNCDB +} alpm_pkgfrom_t; + /** Types of version constraints in dependency specs. */ typedef enum _alpm_depmod_t { /** No version constraint */ diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 707405dd..5962b1d0 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -34,12 +34,6 @@ #include "db.h" #include "signing.h" -typedef enum _alpm_pkgfrom_t { - PKG_FROM_FILE = 1, - PKG_FROM_LOCALDB, - PKG_FROM_SYNCDB -} alpm_pkgfrom_t; - /** Package operations struct. This struct contains function pointers to * all methods used to access data in a package to allow for things such * as lazy package intialization (such as used by the file backend). Each diff --git a/src/pacman/package.c b/src/pacman/package.c index a8c15eb8..f7065d54 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -61,7 +61,7 @@ static void deplist_display(const char *title, * @param from the type of package we are dealing with * @param extra should we show extra information */ -void dump_pkg_full(alpm_pkg_t *pkg, enum pkg_from from, int extra) +void dump_pkg_full(alpm_pkg_t *pkg, alpm_pkgfrom_t from, int extra) { const char *reason; time_t bdate, idate; diff --git a/src/pacman/package.h b/src/pacman/package.h index 6f71d20e..4bbc2ba0 100644 --- a/src/pacman/package.h +++ b/src/pacman/package.h @@ -22,14 +22,7 @@ #include <alpm.h> -/* TODO it would be nice if we didn't duplicate a backend type */ -enum pkg_from { - PKG_FROM_FILE = 1, - PKG_FROM_LOCALDB, - PKG_FROM_SYNCDB -}; - -void dump_pkg_full(alpm_pkg_t *pkg, enum pkg_from from, int extra); +void dump_pkg_full(alpm_pkg_t *pkg, alpm_pkgfrom_t from, int extra); void dump_pkg_backups(alpm_pkg_t *pkg); void dump_pkg_files(alpm_pkg_t *pkg, int quiet); |