[pacman-dev] [PATCH] Removed multiple definitions of pkgfrom_t

[Dan McGee]

On Sun, Aug 28, 2011 at 8:51 PM, Diogo Sousa <diogogsousa at gmail.com> wrote:
> 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 at gmail.com>
Thanks.
> ---
>  README                |    2 +-
>  lib/libalpm/alpm.h    |    6 ++++++
>  lib/libalpm/package.h |    6 ------
>  src/pacman/package.c  |    2 +-
>  src/pacman/package.h  |    9 +--------
>  5 files changed, 9 insertions(+), 16 deletions(-)
>
> diff --git a/README b/README
> index d5071a9..fbd40d2 100644
> --- a/README
> +++ b/README
> @@ -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 c94cdf7..2f62565 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 707405d..5962b1d 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 a8c15eb..f7065d5 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 6f71d20..4bbc2ba 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);
> --
> 1.7.6.1
>
>
>