folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rpmds is now fully opaque, eliminate _RPMDS_INTERNAL games

This commit is contained in:
Panu Matilainen 2007-10-30 13:11:13 +02:00
parent 798323c39f
commit 591cd9852b
2 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/rpmds.c
View File

@ -5,7 +5,6 @@
#include "rpmlib.h"
#define _RPMDS_INTERNAL
#include "rpmds.h"
#include "debug.h"
@ -21,6 +20,28 @@ int _rpmds_nopromote = 1;
int _rpmds_unspecified_epoch_noise = 0;
/**
* A package dependency set.
*/
struct rpmds_s {
const char * Type; /*!< Tag name. */
const char * DNEVR; /*!< Formatted dependency string. */
Header h; /*!< Header for dependency set (or NULL) */
const char ** N; /*!< Name. */
const char ** EVR; /*!< Epoch-Version-Release. */
int32_t * Flags; /*!< Bit(s) identifying context/comparison. */
uint32_t * Color; /*!< Bit(s) calculated from file color(s). */
int32_t * Refs; /*!< No. of file refs. */
int32_t BT; /*!< Package build time tie breaker. */
rpmTag tagN; /*!< Header tag. */
rpmTagType Nt, EVRt, Ft; /*!< Tag data types. */
int32_t Count; /*!< No. of elements */
int i; /*!< Element index. */
unsigned l; /*!< Low element (bsearch). */
unsigned u; /*!< High element (bsearch). */
int nopromote; /*!< Don't promote Epoch: in rpmdsCompare()? */
int nrefs; /*!< Reference count. */
};
rpmds XrpmdsUnlink(rpmds ds, const char * msg, const char * fn, unsigned ln)
{
if (ds == NULL) return NULL;

25
lib/rpmds.h
View File

@ -21,31 +21,6 @@ extern int _rpmds_debug;
*/
extern int _rpmds_nopromote;
#if defined(_RPMDS_INTERNAL)
/**
* A package dependency set.
*/
struct rpmds_s {
const char * Type; /*!< Tag name. */
const char * DNEVR; /*!< Formatted dependency string. */
Header h; /*!< Header for dependency set (or NULL) */
const char ** N; /*!< Name. */
const char ** EVR; /*!< Epoch-Version-Release. */
int32_t * Flags; /*!< Bit(s) identifying context/comparison. */
uint32_t * Color; /*!< Bit(s) calculated from file color(s). */
int32_t * Refs; /*!< No. of file refs. */
int32_t BT; /*!< Package build time tie breaker. */
rpmTag tagN; /*!< Header tag. */
rpmTagType Nt, EVRt, Ft; /*!< Tag data types. */
int32_t Count; /*!< No. of elements */
int i; /*!< Element index. */
unsigned l; /*!< Low element (bsearch). */
unsigned u; /*!< High element (bsearch). */
int nopromote; /*!< Don't promote Epoch: in rpmdsCompare()? */
int nrefs; /*!< Reference count. */
};
#endif /* _RPMDS_INTERNAL */
/**
* Unreference a dependency set instance.
* @param ds dependency set