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>
This commit is contained in:
parent
2cfcc874b9
commit
3a458783a2
2
README
2
README
|
@ -435,7 +435,7 @@ API CHANGES BETWEEN 3.5 AND 4.0
|
||||||
- structs:
|
- structs:
|
||||||
alpm_backup_t, alpm_file_t, alpm_filelist_t
|
alpm_backup_t, alpm_file_t, alpm_filelist_t
|
||||||
- enums:
|
- enums:
|
||||||
alpm_siglevel_t, alpm_sigstatus_t, alpm_sigvalidity_t
|
alpm_siglevel_t, alpm_sigstatus_t, alpm_sigvalidity_t, alpm_pkgfrom_t
|
||||||
- error codes:
|
- error codes:
|
||||||
ALPM_ERR_DB_INVALID, ALPM_ERR_DB_INVALID_SIG, ALPM_ERR_GPGME,
|
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,
|
ALPM_ERR_PKG_INVALID_CHECKSUM, ALPM_ERR_PKG_INVALID_SIG, ALPM_ERR_SIG_INVALID,
|
||||||
|
|
|
@ -60,6 +60,12 @@ typedef enum _alpm_pkgreason_t {
|
||||||
ALPM_PKG_REASON_DEPEND = 1
|
ALPM_PKG_REASON_DEPEND = 1
|
||||||
} alpm_pkgreason_t;
|
} 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. */
|
/** Types of version constraints in dependency specs. */
|
||||||
typedef enum _alpm_depmod_t {
|
typedef enum _alpm_depmod_t {
|
||||||
/** No version constraint */
|
/** No version constraint */
|
||||||
|
|
|
@ -34,12 +34,6 @@
|
||||||
#include "db.h"
|
#include "db.h"
|
||||||
#include "signing.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
|
/** Package operations struct. This struct contains function pointers to
|
||||||
* all methods used to access data in a package to allow for things such
|
* 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
|
* as lazy package intialization (such as used by the file backend). Each
|
||||||
|
|
|
@ -61,7 +61,7 @@ static void deplist_display(const char *title,
|
||||||
* @param from the type of package we are dealing with
|
* @param from the type of package we are dealing with
|
||||||
* @param extra should we show extra information
|
* @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;
|
const char *reason;
|
||||||
time_t bdate, idate;
|
time_t bdate, idate;
|
||||||
|
|
|
@ -22,14 +22,7 @@
|
||||||
|
|
||||||
#include <alpm.h>
|
#include <alpm.h>
|
||||||
|
|
||||||
/* TODO it would be nice if we didn't duplicate a backend type */
|
void dump_pkg_full(alpm_pkg_t *pkg, alpm_pkgfrom_t from, int extra);
|
||||||
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_backups(alpm_pkg_t *pkg);
|
void dump_pkg_backups(alpm_pkg_t *pkg);
|
||||||
void dump_pkg_files(alpm_pkg_t *pkg, int quiet);
|
void dump_pkg_files(alpm_pkg_t *pkg, int quiet);
|
||||||
|
|
Loading…
Reference in New Issue