rpmconstant.h   rpmconstant.h 
skipping to change at line 34 skipping to change at line 34
#include <rpmtypes.h> #include <rpmtypes.h>
#include <rpmtag.h> #include <rpmtag.h>
#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 <misc.h> //#include <misc.h>
#include <rpmbuild.h> #include <rpmbuild.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 20 skipping to change at line 20
#include <assert.h> #include <assert.h>
#include <mire.h> #include <mire.h>
#include <rpmtypes.h> #include <rpmtypes.h>
#include <rpmtag.h> /* XXX Header typedef */ #include <rpmtag.h> /* XXX Header typedef */
#if defined(_RPMDB_INTERNAL) #if defined(_RPMDB_INTERNAL)
#if defined(WITH_DB) #if defined(WITH_DB)
#include <db51/db.h> #include <db51/db.h>
#else #else
#include <db51/db.h> #include "db_emu.h"
//#include "db_emu.h"
#endif #endif
#endif #endif
#if defined(_RPMDB_INTERNAL) #if defined(_RPMDB_INTERNAL)
#define DBT_INIT /*@-fullinitblock@*/ {0} /*@-fullinitblock@*/ /* - Wno-missing-field-initializers */ #define DBT_INIT /*@-fullinitblock@*/ {0} /*@-fullinitblock@*/ /* - Wno-missing-field-initializers */
#endif #endif
/*@-exportlocal@*/ /*@-exportlocal@*/
/*@unchecked@*/ /*@unchecked@*/
extern int _rpmdb_debug; extern int _rpmdb_debug;
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 rpmpgp.h   rpmpgp.h 
skipping to change at line 1473 skipping to change at line 1473
* @return NULL on last dereference * @return NULL on last dereference
*/ */
/*@unused@*/ /*@null@*/ /*@unused@*/ /*@null@*/
pgpDig pgpDigFree(/*@killref@*/ /*@only@*/ /*@null@*/ pgpDig dig) pgpDig pgpDigFree(/*@killref@*/ /*@only@*/ /*@null@*/ pgpDig dig)
/*@modifies dig @*/; /*@modifies dig @*/;
#define pgpDigFree(_dig) \ #define pgpDigFree(_dig) \
((pgpDig)rpmioFreePoolItem((rpmioItem)(_dig), __FUNCTION__, __FILE__, _ _LINE__)) ((pgpDig)rpmioFreePoolItem((rpmioItem)(_dig), __FUNCTION__, __FILE__, _ _LINE__))
/** \ingroup rpmpgp /** \ingroup rpmpgp
* Create a container for parsed OpenPGP packates. * Create a container for parsed OpenPGP packates.
* Generate a keypair (if requested).
* @param vsflags verify signature flags (usually 0)
* @param pubkey_algo pubkey algorithm (0 disables)
* @return container * @return container
*/ */
/*@relnull@*/ /*@relnull@*/
pgpDig pgpDigNew(/*@unused@*/ pgpVSFlags vsflags) pgpDig pgpDigNew(pgpVSFlags vsflags, pgpPubkeyAlgo pubkey_algo)
/*@globals fileSystem @*/ /*@globals fileSystem @*/
/*@modifies fileSystem @*/; /*@modifies fileSystem @*/;
int rpmbcExportPubkey(pgpDig dig)
/*@*/;
int rpmbcExportSignature(pgpDig dig, /*@only@*/ DIGEST_CTX ctx)
/*@*/;
/** \ingroup rpmpgp /** \ingroup rpmpgp
* Release (malloc'd) data from container. * Release (malloc'd) data from container.
* @param dig signature parameters container * @param dig signature parameters container
*/ */
void pgpDigClean(/*@null@*/ pgpDig dig) void pgpDigClean(/*@null@*/ pgpDig dig)
/*@modifies dig @*/; /*@modifies dig @*/;
/** \ingroup rpmpgp /** \ingroup rpmpgp
* Return OpenPGP pubkey parameters. * Return OpenPGP pubkey parameters.
 End of changes. 3 change blocks. 
1 lines changed or deleted 8 lines changed or added


 rpmte.h   rpmte.h 
#ifndef H_RPMTE #ifndef H_RPMTE
#define H_RPMTE #define H_RPMTE
/** \ingroup rpmts rpmte /** \ingroup rpmts rpmte
* \file lib/rpmte.h * \file lib/rpmte.h
* Structures used for an "rpmte" transaction element. * Structures used for an "rpmte" transaction element.
*/ */
#include <rpmfi.h> #include <rpmfi.h>
#include <rpmal.h> /* XXX alKey */
/** /**
*/ */
/*@-exportlocal@*/ /*@-exportlocal@*/
/*@unchecked@*/ /*@unchecked@*/
extern int _rpmte_debug; extern int _rpmte_debug;
/*@=exportlocal@*/ /*@=exportlocal@*/
/** \ingroup rpmte /** \ingroup rpmte
* Transaction element ordering chain linkage. * Transaction element ordering chain linkage.
skipping to change at line 336 skipping to change at line 335
/** \ingroup rpmte /** \ingroup rpmte
* Retrieve release string of transaction element. * Retrieve release string of transaction element.
* @param te transaction element * @param te transaction element
* @return release string * @return release string
*/ */
/*@observer@*/ /*@null@*/ /*@observer@*/ /*@null@*/
extern const char * rpmteR(rpmte te) extern const char * rpmteR(rpmte te)
/*@*/; /*@*/;
#ifdef RPM_VENDOR_MANDRIVA
/** \ingroup rpmte /** \ingroup rpmte
* Retrieve distepoch string of transaction element. * Retrieve distepoch string of transaction element.
* @param te transaction element * @param te transaction element
* @return distepoch string * @return distepoch string
*/ */
/*@observer@*/ /*@null@*/ /*@observer@*/ /*@null@*/
extern const char * rpmteD(rpmte te) extern const char * rpmteD(rpmte te)
/*@*/; /*@*/;
#endif
/** \ingroup rpmte /** \ingroup rpmte
* Retrieve arch string of transaction element. * Retrieve arch string of transaction element.
* @param te transaction element * @param te transaction element
* @return arch string * @return arch string
*/ */
/*@observer@*/ /*@null@*/ /*@observer@*/ /*@null@*/
extern const char * rpmteA(rpmte te) extern const char * rpmteA(rpmte te)
/*@*/; /*@*/;
 End of changes. 3 change blocks. 
3 lines changed or deleted 0 lines changed or added


 rpmtypes.h   rpmtypes.h 
skipping to change at line 16 skipping to change at line 16
*/ */
/** \ingroup rpmts /** \ingroup rpmts
* The RPM Transaction Set. * The RPM Transaction Set.
* Transaction sets are inherently unordered! RPM may reorder transaction * Transaction sets are inherently unordered! RPM may reorder transaction
* sets to reduce errors. In general, installs/upgrades are done before * sets to reduce errors. In general, installs/upgrades are done before
* strict removals, and prerequisite ordering is done on installs/upgrades. * strict removals, and prerequisite ordering is done on installs/upgrades.
*/ */
typedef /*@abstract@*/ /*@refcounted@*/ struct rpmts_s * rpmts; typedef /*@abstract@*/ /*@refcounted@*/ struct rpmts_s * rpmts;
/** \ingroup rpmts
* An added/available package retrieval key.
*/
typedef /*@abstract@*/ void * alKey;
/** \ingroup rpmbuild /** \ingroup rpmbuild
*/ */
typedef /*@abstract@*/ /*@refcounted@*/ struct Spec_s * Spec; typedef /*@abstract@*/ /*@refcounted@*/ struct Spec_s * Spec;
/** \ingroup rpmds /** \ingroup rpmds
* Dependency tag sets from a header, so that a header can be discarded ear ly. * Dependency tag sets from a header, so that a header can be discarded ear ly.
*/ */
typedef /*@abstract@*/ /*@refcounted@*/ struct rpmds_s * rpmds; typedef /*@abstract@*/ /*@refcounted@*/ struct rpmds_s * rpmds;
/** \ingroup rpmds /** \ingroup rpmds
 End of changes. 1 change blocks. 
0 lines changed or deleted 5 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,5,0,_) #define RPMLIB_VERSION RPMLIB_VERSION_ENCODE(5,3,r,6,0,_)
#define RPMLIB_TIMESTAMP RPMLIB_TIMESTAMP_ENCODE(2010,9,18,0,0) #define RPMLIB_TIMESTAMP RPMLIB_TIMESTAMP_ENCODE(2010,9,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)) \
 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/