rpmpgp.h   rpmpgp.h 
skipping to change at line 69 skipping to change at line 69
/*@observer@*/ /*@null@*/ /*@observer@*/ /*@null@*/
const char * pubkey_algoN; const char * pubkey_algoN;
/*@observer@*/ /*@null@*/ /*@observer@*/ /*@null@*/
const char * hash_algoN; const char * hash_algoN;
rpmuint32_t sigtag; /*!< Package signature tag. */ rpmuint32_t sigtag; /*!< Package signature tag. */
rpmuint32_t sigtype; /*!< Package signature data type. */ rpmuint32_t sigtype; /*!< Package signature data type. */
/*@relnull@*/ /*@relnull@*/
const void * sig; /*!< Package signature. */ const void * sig; /*!< Package signature. */
rpmuint32_t siglen; /*!< Package signature length. */ size_t siglen; /*!< Package signature length. */
const void * pub; /*!< Package pubkey. */
size_t publen; /*!< Package pubkey length. */
pgpVSFlags vsflags; /*!< Digest/signature operation disa blers. */ pgpVSFlags vsflags; /*!< Digest/signature operation disa blers. */
struct rpmop_s dops; /*!< Digest operation statistics. */ struct rpmop_s dops; /*!< Digest operation statistics. */
struct rpmop_s sops; /*!< Signature operation statistics. */ struct rpmop_s sops; /*!< Signature operation statistics. */
int (*findPubkey) (void * _ts, /*@null@*/ void * _dig) int (*findPubkey) (void * _ts, /*@null@*/ void * _dig)
/*@modifies *_ts, *_dig @*/;/*!< Find pubkey, i.e. rpmtsFindPubkey() . */ /*@modifies *_ts, *_dig @*/;/*!< Find pubkey, i.e. rpmtsFindPubkey() . */
/*@null@*/ /*@null@*/
void * _ts; /*!< Find pubkey argument, i.e. rpmt s. */ void * _ts; /*!< Find pubkey argument, i.e. rpmt s. */
skipping to change at line 1388 skipping to change at line 1390
* @param pktlen OpenPGP packet(s) length (no. of bytes) * @param pktlen OpenPGP packet(s) length (no. of bytes)
* @retval dig parsed output of signature/pubkey packet parameters * @retval dig parsed output of signature/pubkey packet parameters
* @param printing should packets be printed? * @param printing should packets be printed?
* @return -1 on error, 0 on success * @return -1 on error, 0 on success
*/ */
int pgpPrtPkts(const rpmuint8_t * pkts, size_t pktlen, pgpDig dig, int prin ting) int pgpPrtPkts(const rpmuint8_t * pkts, size_t pktlen, pgpDig dig, int prin ting)
/*@globals fileSystem, internalState @*/ /*@globals fileSystem, internalState @*/
/*@modifies dig, fileSystem, internalState @*/; /*@modifies dig, fileSystem, internalState @*/;
/** \ingroup rpmpgp /** \ingroup rpmpgp
* Parse armored OpenPGP packets from an iob.
* @param iob I/O buffer
* @retval pkt dearmored OpenPGP packet(s)
* @retval pktlen dearmored OpenPGP packet(s) length in bytes
* @return type of armor found
*/
pgpArmor pgpArmorUnwrap(rpmiob iob,
/*@out@*/ rpmuint8_t ** pkt, /*@out@*/ size_t * pktlen)
/*@globals h_errno, fileSystem, internalState @*/
/*@modifies *pkt, *pktlen, fileSystem, internalState @*/;
/** \ingroup rpmpgp
* Parse armored OpenPGP packets from a file. * Parse armored OpenPGP packets from a file.
* @param fn file name * @param fn file name
* @retval pkt dearmored OpenPGP packet(s) * @retval pkt dearmored OpenPGP packet(s)
* @retval pktlen dearmored OpenPGP packet(s) length in bytes * @retval pktlen dearmored OpenPGP packet(s) length in bytes
* @return type of armor found * @return type of armor found
*/ */
pgpArmor pgpReadPkts(const char * fn, pgpArmor pgpReadPkts(const char * fn,
/*@out@*/ rpmuint8_t ** pkt, /*@out@*/ size_t * pktlen) /*@out@*/ rpmuint8_t ** pkt, /*@out@*/ size_t * pktlen)
/*@globals h_errno, fileSystem, internalState @*/ /*@globals h_errno, fileSystem, internalState @*/
/*@modifies *pkt, *pktlen, fileSystem, internalState @*/; /*@modifies *pkt, *pktlen, fileSystem, internalState @*/;
 End of changes. 2 change blocks. 
1 lines changed or deleted 15 lines changed or added


 rpmspec.h   rpmspec.h 
skipping to change at line 195 skipping to change at line 195
rpmiob install; /*!< %install scriptlet. */ rpmiob install; /*!< %install scriptlet. */
/*@only@*/ /*@only@*/
rpmiob check; /*!< %check scriptlet. */ rpmiob check; /*!< %check scriptlet. */
/*@only@*/ /*@only@*/
rpmiob clean; /*!< %clean scriptlet. */ rpmiob clean; /*!< %clean scriptlet. */
size_t nfoo; size_t nfoo;
/*@only@*/ /*@relnull@*/ /*@only@*/ /*@relnull@*/
tagStore_t foo; tagStore_t foo;
void * dig; /*!< Auto-signing keypair. */
Package packages; /*!< Package list. */ Package packages; /*!< Package list. */
#if defined(__LCLINT__) #if defined(__LCLINT__)
/*@refs@*/ /*@refs@*/
int nrefs; /*!< (unused) keep splint happy */ int nrefs; /*!< (unused) keep splint happy */
#endif #endif
}; };
/** \ingroup rpmbuild /** \ingroup rpmbuild
* The structure used to store values for a package. * The structure used to store values for a package.
*/ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 rpmts.h   rpmts.h 
skipping to change at line 12 skipping to change at line 12
#define H_RPMTS #define H_RPMTS
/** \ingroup rpmts /** \ingroup rpmts
* \file lib/rpmts.h * \file lib/rpmts.h
* Structures and prototypes used for an "rpmts" transaction set. * Structures and prototypes used for an "rpmts" transaction set.
*/ */
#include "rpmps.h" #include "rpmps.h"
#include "rpmsw.h" #include "rpmsw.h"
#include <rpmpgp.h> /* XXX pgpVSFlags */ #include <rpmpgp.h> /* XXX pgpVSFlags */
#include <rpmbag.h>
/*@-exportlocal@*/ /*@-exportlocal@*/
/*@unchecked@*/ /*@unchecked@*/
extern int _rpmts_debug; extern int _rpmts_debug;
/*@unchecked@*/ /*@unchecked@*/
extern int _rpmts_macros; extern int _rpmts_macros;
/*@unchecked@*/ /*@unchecked@*/
extern int _rpmts_stats; extern int _rpmts_stats;
/*@unchecked@*/ /*@unchecked@*/
extern int _fps_debug; extern int _fps_debug;
skipping to change at line 214 skipping to change at line 215
* The set of packages to be installed/removed atomically. * The set of packages to be installed/removed atomically.
*/ */
struct rpmts_s { struct rpmts_s {
struct rpmioItem_s _item; /*!< usage mutex and pool identifier. */ struct rpmioItem_s _item; /*!< usage mutex and pool identifier. */
rpmdepFlags depFlags; /*!< Bit(s) to control rpmtsCheck(). */ rpmdepFlags depFlags; /*!< Bit(s) to control rpmtsCheck(). */
rpmtransFlags transFlags; /*!< Bit(s) to control rpmtsRun(). */ rpmtransFlags transFlags; /*!< Bit(s) to control rpmtsRun(). */
tsmStage goal; /*!< Transaction goal (i.e. mode) */ tsmStage goal; /*!< Transaction goal (i.e. mode) */
rpmTSType type; /*!< default, rollback, autorollback */ rpmTSType type; /*!< default, rollback, autorollback */
/*@refcounted@*/ /*@null@*/ /*@refcounted@*/ /*@null@*/
rpmdb sdb; /*!< Solve database handle. */ rpmbag bag; /*!< Solve store collection. */
int sdbmode; /*!< Solve database open mode. */
/*@null@*/ /*@null@*/
int (*solve) (rpmts ts, rpmds key, const void * data) int (*solve) (rpmts ts, rpmds key, const void * data)
/*@modifies ts @*/; /*!< Search for NEVRA key. */ /*@modifies ts @*/; /*!< Search for NEVRA key. */
/*@relnull@*/ /*@relnull@*/
const void * solveData; /*!< Solve callback data */ const void * solveData; /*!< Solve callback data */
int nsuggests; /*!< No. of depCheck suggestions. */ int nsuggests; /*!< No. of depCheck suggestions. */
/*@only@*/ /*@null@*/ /*@only@*/ /*@null@*/
const void ** suggests; /*!< Possible depCheck suggestions. */ const void ** suggests; /*!< Possible depCheck suggestions. */
/*@observer@*/ /*@null@*/ /*@observer@*/ /*@null@*/
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 rpmversion.h   rpmversion.h 
skipping to change at line 81 skipping to change at line 81
/* 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,3,r,2,0,_) #define RPMLIB_VERSION RPMLIB_VERSION_ENCODE(5,3,r,3,0,_)
#define RPMLIB_TIMESTAMP RPMLIB_TIMESTAMP_ENCODE(2009,0,0,0,0) #define RPMLIB_TIMESTAMP RPMLIB_TIMESTAMP_ENCODE(2009,0,0,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)) \
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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/