rpmconstant.h   rpmconstant.h 
skipping to change at line 30 skipping to change at line 30
#include <rpmio.h> #include <rpmio.h>
#include <rpmcb.h> /* XXX fnpyKey */ #include <rpmcb.h> /* XXX fnpyKey */
#include <rpmdb.h> #include <rpmdb.h>
#include <rpmts.h> #include <rpmts.h>
#include <rpmte.h> #include <rpmte.h>
#include <rpmps.h> #include <rpmps.h>
#include <rpmds.h> #include <rpmds.h>
#include <rpmfi.h> #include <rpmfi.h>
#include <rpmpgp.h> #include <rpmpgp.h>
#include <misc.h> //#include <misc.h>
#include <rpmbuild.h> #include <rpmbuild.h>
#include <rpmlib.h> #include <rpmlib.h>
/** /**
* A constant pair name/value * A constant pair name/value
*/ */
typedef /*@abstract@*/ struct rpmconstant_s *rpmconstant; typedef /*@abstract@*/ struct rpmconstant_s *rpmconstant;
/** /**
* A constant list set * A constant list set
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 rpmdb.h   rpmdb.h 
skipping to change at line 1176 skipping to change at line 1176
* Destroy rpm database iterator. * Destroy rpm database iterator.
* @param mi rpm database iterator * @param mi rpm database iterator
* @return NULL always * @return NULL always
*/ */
/*@null@*/ /*@null@*/
rpmdbMatchIterator rpmdbFreeIterator(/*@only@*/ /*@null@*/rpmdbMatchIterato r mi) rpmdbMatchIterator rpmdbFreeIterator(/*@only@*/ /*@null@*/rpmdbMatchIterato r mi)
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/ /*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies mi, rpmGlobalMacroContext, fileSystem, internalState @*/ ; /*@modifies mi, rpmGlobalMacroContext, fileSystem, internalState @*/ ;
/** \ingroup rpmdb /** \ingroup rpmdb
* Return array of keys matching a pattern.
* @param db rpm database
* @param tag rpm tag
* @param mode type of pattern match
* @param pat pattern to match
* @retval *argvp array of keys that match
* @return 0 on success
*/
int rpmdbMireApply(rpmdb db, rpmTag tag, rpmMireMode mode, const char * pat
,
const char *** argvp)
/*@modifies db, *argvp */;
/** \ingroup rpmdb
* Add package header to rpm database and indices. * Add package header to rpm database and indices.
* @param db rpm database * @param db rpm database
* @param iid install transaction id (iid = 0 or -1 to skip) * @param iid install transaction id (iid = 0 or -1 to skip)
* @param h header * @param h header
* @param ts (unused) transaction set (or NULL) * @param ts (unused) transaction set (or NULL)
* @return 0 on success * @return 0 on success
*/ */
int rpmdbAdd(/*@null@*/ rpmdb db, int iid, Header h, /*@null@*/ rpmts ts) int rpmdbAdd(/*@null@*/ rpmdb db, int iid, Header h, /*@null@*/ rpmts ts)
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/ /*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies db, h, ts, /*@modifies db, h, ts,
 End of changes. 1 change blocks. 
0 lines changed or deleted 14 lines changed or added


 rpmds.h   rpmds.h 
skipping to change at line 646 skipping to change at line 646
/** \ingroup rpmds /** \ingroup rpmds
* Compare two versioned dependency ranges, looking for overlap. * Compare two versioned dependency ranges, looking for overlap.
* @param A 1st dependency * @param A 1st dependency
* @param B 2nd dependency * @param B 2nd dependency
* @return 1 if dependencies overlap, 0 otherwise * @return 1 if dependencies overlap, 0 otherwise
*/ */
int rpmdsCompare(const rpmds A, const rpmds B) int rpmdsCompare(const rpmds A, const rpmds B)
/*@*/; /*@*/;
/** \ingroup rpmds /** \ingroup rpmds
* Compare A against every member of B, looking for 1st match.
* @param A 1st dependency
* @param B 2nd dependency
* @return 1 if some dependency overlaps, 0 otherwise
*/
int rpmdsMatch(const rpmds A, rpmds B)
/*@modifies B @*/;
/** \ingroup rpmds
* Report a Requires: or Conflicts: dependency problem. * Report a Requires: or Conflicts: dependency problem.
* @param ps transaction set problems * @param ps transaction set problems
* @param pkgNEVR package name/epoch/version/release * @param pkgNEVR package name/epoch/version/release
* @param ds dependency set * @param ds dependency set
* @param suggestedKeys filename or python object address * @param suggestedKeys filename or python object address
* @param adding dependency problem is from added package set? * @param adding dependency problem is from added package set?
*/ */
void rpmdsProblem(/*@null@*/ rpmps ps, const char * pkgNEVR, const rpmds ds , void rpmdsProblem(/*@null@*/ rpmps ps, const char * pkgNEVR, const rpmds ds ,
/*@only@*/ /*@null@*/ const fnpyKey * suggestedKeys, /*@only@*/ /*@null@*/ const fnpyKey * suggestedKeys,
int adding) int adding)
 End of changes. 1 change blocks. 
0 lines changed or deleted 9 lines changed or added


 rpmio.h   rpmio.h 
skipping to change at line 295 skipping to change at line 295
/*@modifies *st, errno, fileSystem, internalState @*/; /*@modifies *st, errno, fileSystem, internalState @*/;
/** /**
* lstat(2) clone. * lstat(2) clone.
*/ */
int Lstat(const char * path, /*@out@*/ struct stat * st) int Lstat(const char * path, /*@out@*/ struct stat * st)
/*@globals errno, h_errno, fileSystem, internalState @*/ /*@globals errno, h_errno, fileSystem, internalState @*/
/*@modifies *st, errno, fileSystem, internalState @*/; /*@modifies *st, errno, fileSystem, internalState @*/;
/** /**
* fstat(2) clone.
*/
int Fstat(FD_t fd, /*@out@*/ struct stat * st)
/*@globals errno, fileSystem, internalState @*/
/*@modifies *st, errno, fileSystem, internalState @*/;
/**
* chown(2) clone. * chown(2) clone.
* @todo Implement remotely. * @todo Implement remotely.
*/ */
int Chown(const char * path, uid_t owner, gid_t group) int Chown(const char * path, uid_t owner, gid_t group)
/*@globals errno, fileSystem, internalState @*/ /*@globals errno, fileSystem, internalState @*/
/*@modifies errno, fileSystem, internalState @*/; /*@modifies errno, fileSystem, internalState @*/;
/** /**
* lchown(2) clone. * lchown(2) clone.
* @todo Implement remotely. * @todo Implement remotely.
 End of changes. 1 change blocks. 
0 lines changed or deleted 7 lines changed or added


 rpmlib.h   rpmlib.h 
skipping to change at line 112 skipping to change at line 112
/** /**
* Table of query format extensions. * Table of query format extensions.
* @note Chains *headerCompoundFormats -> *headerDefaultFormats. * @note Chains *headerCompoundFormats -> *headerDefaultFormats.
*/ */
/*@-redecl@*/ /*@-redecl@*/
/*@unchecked@*/ /*@unchecked@*/
extern headerSprintfExtension rpmHeaderFormats; extern headerSprintfExtension rpmHeaderFormats;
/*@=redecl@*/ /*@=redecl@*/
/**
* Scriptlet identifiers.
*/
typedef enum rpmScriptID_e {
RPMSCRIPT_UNKNOWN = 0, /*!< unknown scriptlet */
RPMSCRIPT_PRETRANS = 1, /*!< %pretrans scriptlet */
RPMSCRIPT_TRIGGERPREIN = 2, /*!< %triggerprein scriptlet */
RPMSCRIPT_PREIN = 3, /*!< %pre scriptlet */
RPMSCRIPT_POSTIN = 4, /*!< %post scriptlet */
RPMSCRIPT_TRIGGERIN = 5, /*!< %triggerin scriptlet *
/
RPMSCRIPT_TRIGGERUN = 6, /*!< %triggerun scriptlet *
/
RPMSCRIPT_PREUN = 7, /*!< %preun scriptlet */
RPMSCRIPT_POSTUN = 8, /*!< %postun scriptlet */
RPMSCRIPT_TRIGGERPOSTUN = 9, /*!< %triggerpostun scriptlet */
RPMSCRIPT_POSTTRANS = 10, /*!< %posttrans scriptlet *
/
/* 11-15 unused */
RPMSCRIPT_VERIFY = 16, /*!< %verify scriptlet */
RPMSCRIPT_SANITYCHECK = 17, /*!< %sanitycheck scriptlet */
RPMSCRIPT_MAX = 32
} rpmScriptID;
/**
* Scriptlet states (when installed).
*/
typedef enum rpmScriptState_e {
RPMSCRIPT_STATE_UNKNOWN = 0,
/* 0-15 reserved for waitpid return. */
RPMSCRIPT_STATE_EXEC = (1 << 16), /*!< scriptlet was exec'd */
RPMSCRIPT_STATE_REAPED = (1 << 17), /*!< scriptlet was reaped */
/* 18-23 unused */
RPMSCRIPT_STATE_SELINUX = (1 << 24), /*!< scriptlet exec by SELinux
*/
RPMSCRIPT_STATE_EMULATOR = (1 << 25), /*!< scriptlet exec in emulator
*/
RPMSCRIPT_STATE_LUA = (1 << 26) /*!< scriptlet exec wit
h lua */
} rpmScriptState;
/* ==================================================================== */ /* ==================================================================== */
/** \name RPMRC */ /** \name RPMRC */
/*@{*/ /*@{*/
/** \ingroup rpmrc /** \ingroup rpmrc
* Build and install arch/os table identifiers. * Build and install arch/os table identifiers.
* @deprecated Eliminate from API. * @deprecated Eliminate from API.
* @todo Eliminate in rpm-5.1. * @todo Eliminate in rpm-5.1.
*/ */
enum rpm_machtable_e { enum rpm_machtable_e {
skipping to change at line 254 skipping to change at line 219
* Compare headers to determine which header is "newer". * Compare headers to determine which header is "newer".
* @deprecated Use rpmdsCompare instead. * @deprecated Use rpmdsCompare instead.
* @todo Eliminate in rpm-5.1. * @todo Eliminate in rpm-5.1.
* @param first 1st header * @param first 1st header
* @param second 2nd header * @param second 2nd header
* @return result of comparison * @return result of comparison
*/ */
int rpmVersionCompare(Header first, Header second) int rpmVersionCompare(Header first, Header second)
/*@*/; /*@*/;
/** \ingroup rpmts
* Package state machine data.
*/
typedef /*@abstract@*/ /*@refcounted@*/ struct rpmpsm_s * rpmpsm;
/** /**
* Return package header from file handle, verifying digests/signatures. * Return package header from file handle, verifying digests/signatures.
* @param ts transaction set * @param ts transaction set
* @param _fd file handle * @param _fd file handle
* @param fn file name * @param fn file name
* @retval hdrp address of header (or NULL) * @retval hdrp address of header (or NULL)
* @return RPMRC_OK on success * @return RPMRC_OK on success
*/ */
rpmRC rpmReadPackageFile(rpmts ts, void * _fd, rpmRC rpmReadPackageFile(rpmts ts, void * _fd,
const char * fn, /*@null@*/ /*@out@*/ Header * hdrp) const char * fn, /*@null@*/ /*@out@*/ Header * hdrp)
 End of changes. 2 change blocks. 
46 lines changed or deleted 0 lines changed or added


 rpmversion.h   rpmversion.h 
skipping to change at line 69 skipping to change at line 69
/* link-time information */ /* link-time information */
extern uint32_t rpmlibVersion(void) extern uint32_t rpmlibVersion(void)
/*@*/; /*@*/;
extern uint32_t rpmlibTimestamp(void) extern uint32_t rpmlibTimestamp(void)
/*@*/; /*@*/;
extern uint32_t rpmlibVendor(void) extern uint32_t rpmlibVendor(void)
/*@*/; /*@*/;
/* compile-time information */ /* compile-time information */
#define RPMLIB_VERSION RPMLIB_VERSION_ENCODE(5,1,r,5,0,_) #define RPMLIB_VERSION RPMLIB_VERSION_ENCODE(5,1,r,6,0,_)
#define RPMLIB_TIMESTAMP RPMLIB_TIMESTAMP_ENCODE(2008,10,12,0,0) #define RPMLIB_TIMESTAMP RPMLIB_TIMESTAMP_ENCODE(2008,10,18,0,0)
#define RPMLIB_VENDOR RPMLIB_VENDOR_ENCODE('R','P','M','5') #define RPMLIB_VENDOR RPMLIB_VENDOR_ENCODE('R','P','M','5')
/* RPM release version encoding */ /* RPM release version encoding */
#define RPMLIB_VERSION_ENCODE(major,minor,type,micro,revision,snap) \ #define RPMLIB_VERSION_ENCODE(major,minor,type,micro,revision,snap) \
( RPMLIB_BITFIELD_SET(31,27,(major)) \ ( RPMLIB_BITFIELD_SET(31,27,(major)) \
| RPMLIB_BITFIELD_SET(26,21,(minor)) \ | RPMLIB_BITFIELD_SET(26,21,(minor)) \
| RPMLIB_BITFIELD_SET(20,18,RPMLIB_VERSION_ENCODE_T(type)) \ | RPMLIB_BITFIELD_SET(20,18,RPMLIB_VERSION_ENCODE_T(type)) \
| RPMLIB_BITFIELD_SET(17,10,(micro)) \ | RPMLIB_BITFIELD_SET(17,10,(micro)) \
| RPMLIB_BITFIELD_SET(9,1,(revision)) \ | RPMLIB_BITFIELD_SET(9,1,(revision)) \
| RPMLIB_BITFIELD_SET(0,0,RPMLIB_VERSION_ENCODE_S(snap))) | RPMLIB_BITFIELD_SET(0,0,RPMLIB_VERSION_ENCODE_S(snap)))
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/