rpmdb.h   rpmdb.h 
skipping to change at line 13 skipping to change at line 13
/*@-bounds@*/ /*@-bounds@*/
/** \ingroup rpmdb dbi db1 db3 /** \ingroup rpmdb dbi db1 db3
* \file rpmdb/rpmdb.h * \file rpmdb/rpmdb.h
* Access RPM indices using Berkeley DB interface(s). * Access RPM indices using Berkeley DB interface(s).
*/ */
#include <assert.h> #include <assert.h>
#include <rpmlib.h> #include <rpmlib.h>
#include <mire.h> #include <mire.h>
#if defined(_RPMDB_INTERNAL)
#if defined(WITH_DB) #if defined(WITH_DB)
#include "db.h" #include "db.h"
#else #else
#include "db_emu.h" #include "db_emu.h"
#endif #endif
#endif
/*@-exportlocal@*/ /*@-exportlocal@*/
/*@unchecked@*/ /*@unchecked@*/
extern int _rpmdb_debug; extern int _rpmdb_debug;
/*@=exportlocal@*/ /*@=exportlocal@*/
#ifdef NOTYET #ifdef NOTYET
/** \ingroup rpmdb /** \ingroup rpmdb
* Database of headers and tag value indices. * Database of headers and tag value indices.
*/ */
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added


 rpmds.h   rpmds.h 
skipping to change at line 477 skipping to change at line 477
* Search a sorted dependency set for an element that overlaps. * Search a sorted dependency set for an element that overlaps.
* A boolean result is saved (if allocated) and accessible through * A boolean result is saved (if allocated) and accessible through
* rpmdsResult(ods) afterwards. * rpmdsResult(ods) afterwards.
* @param ds dependency set to search * @param ds dependency set to search
* @param ods dependency set element to find. * @param ods dependency set element to find.
* @return dependency index (or -1 if not found) * @return dependency index (or -1 if not found)
*/ */
int rpmdsSearch(/*@null@*/ rpmds ds, /*@null@*/ rpmds ods) int rpmdsSearch(/*@null@*/ rpmds ds, /*@null@*/ rpmds ods)
/*@modifies ds, ods @*/; /*@modifies ds, ods @*/;
/**
*/
/*@unchecked@*/ /*@null@*/
extern const char * _cpuinfo_path;
/** \ingroup rpmds /** \ingroup rpmds
* Load /proc/cpuinfo provides into a dependency set. * Load /proc/cpuinfo provides into a dependency set.
* @retval *dsp (loaded) depedency set * @retval *dsp (loaded) depedency set
* @param fn path to file (NULL uses /proc/cpuinfo) * @param fn path to file (NULL uses /proc/cpuinfo)
* @return 0 on success * @return 0 on success
*/ */
int rpmdsCpuinfo(/*@out@*/ rpmds * dsp, /*@null@*/ const char * fn) int rpmdsCpuinfo(/*@out@*/ rpmds * dsp, /*@null@*/ const char * fn)
/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/ /*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies *dsp, rpmGlobalMacroContext, h_errno, fileSystem, intern alState @*/; /*@modifies *dsp, rpmGlobalMacroContext, h_errno, fileSystem, intern alState @*/;
 End of changes. 1 change blocks. 
0 lines changed or deleted 5 lines changed or added


 rpmio.h   rpmio.h 
skipping to change at line 103 skipping to change at line 103
typedef FD_t (*fdio_fopen_function_t) (const char * path, const char * fmod e) typedef FD_t (*fdio_fopen_function_t) (const char * path, const char * fmod e)
/*@globals errno, fileSystem @*/ /*@globals errno, fileSystem @*/
/*@modifies errno, fileSystem @*/; /*@modifies errno, fileSystem @*/;
/** /**
*/ */
typedef FD_t (*fdio_fdopen_function_t) (void * cookie, const char * fmode) typedef FD_t (*fdio_fdopen_function_t) (void * cookie, const char * fmode)
/*@globals errno, fileSystem @*/ /*@globals errno, fileSystem @*/
/*@modifies errno, fileSystem @*/; /*@modifies errno, fileSystem @*/;
/**
*/
typedef int (*fdio_flush_function_t) (void * cookie)
/*@globals errno, fileSystem @*/
/*@modifies errno, fileSystem @*/;
/*@}*/ /*@}*/
/** \ingroup rpmio /** \ingroup rpmio
*/ */
struct FDIO_s { struct FDIO_s {
fdio_read_function_t read; fdio_read_function_t read;
fdio_write_function_t write; fdio_write_function_t write;
fdio_seek_function_t seek; fdio_seek_function_t seek;
fdio_close_function_t close; fdio_close_function_t close;
fdio_fopen_function_t _fopen; fdio_fopen_function_t _fopen;
fdio_fdopen_function_t _fdopen; fdio_fdopen_function_t _fdopen;
/*@null@*/
fdio_flush_function_t _flush;
}; };
/** \ingroup rpmio /** \ingroup rpmio
* \name RPMIO Interface. * \name RPMIO Interface.
*/ */
/*@{*/ /*@{*/
/** /**
* strerror(3) clone. * strerror(3) clone.
*/ */
 End of changes. 2 change blocks. 
0 lines changed or deleted 8 lines changed or added


 rpmlib.h   rpmlib.h 
skipping to change at line 13 skipping to change at line 13
/** \ingroup rpmcli rpmrc rpmts rpmte rpmds rpmfi rpmdb lead signature head er payload dbi /** \ingroup rpmcli rpmrc rpmts rpmte rpmds rpmfi rpmdb lead signature head er payload dbi
* \file lib/rpmlib.h * \file lib/rpmlib.h
* *
* In Memoriam: Steve Taylor <staylor@redhat.com> was here, now he's not. * In Memoriam: Steve Taylor <staylor@redhat.com> was here, now he's not.
* *
*/ */
#include <rpmtag.h> #include <rpmtag.h>
#include <rpmversion.h> #include <rpmversion.h>
#include <rpmio.h>
#define RPM_FORMAT_VERSION 5 #define RPM_FORMAT_VERSION 5
#define RPM_MAJOR_VERSION 0 #define RPM_MAJOR_VERSION 0
#define RPM_MINOR_VERSION 0 #define RPM_MINOR_VERSION 0
/*@-redecl@*/ /*@-redecl@*/
/*@-incondefs@*/ /*@-incondefs@*/
/*@checked@*/ /*@checked@*/
extern struct MacroContext_s * rpmGlobalMacroContext; extern struct MacroContext_s * rpmGlobalMacroContext;
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 rpmps.h   rpmps.h 
skipping to change at line 261 skipping to change at line 261
* @param filter problem filter (or NULL) * @param filter problem filter (or NULL)
* @return 0 no problems, 1 if problems remain * @return 0 no problems, 1 if problems remain
*/ */
int rpmpsTrim(/*@null@*/ rpmps ps, /*@null@*/ rpmps filter) int rpmpsTrim(/*@null@*/ rpmps ps, /*@null@*/ rpmps filter)
/*@modifies ps @*/; /*@modifies ps @*/;
/** /**
* Return a problem from problem set * Return a problem from problem set
* *
* @param ps problem set * @param ps problem set
* @param num problem number * @param num problem number (<0 is last problem)
* @return rpmProblem, or NULL if error * @return rpmProblem, or NULL if error
*/ */
/*@exposed@*/ /*@exposed@*/
rpmProblem rpmpsGetProblem(/*@null@*/ rpmps ps, int num) rpmProblem rpmpsGetProblem(/*@null@*/ rpmps ps, int num)
/*@*/; /*@*/;
/** /**
* Return the package NEVR causing the problem * Return the package NEVR causing the problem
* *
* @param prob rpm problem * @param prob rpm problem
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 rpmts.h   rpmts.h 
skipping to change at line 744 skipping to change at line 744
/** \ingroup rpmts /** \ingroup rpmts
* Set chrootDone flag, i.e. has chroot(2) been performed? * Set chrootDone flag, i.e. has chroot(2) been performed?
* @param ts transaction set * @param ts transaction set
* @param chrootDone new chrootDone flag * @param chrootDone new chrootDone flag
* @return previous chrootDone flag * @return previous chrootDone flag
*/ */
int rpmtsSetChrootDone(rpmts ts, int chrootDone) int rpmtsSetChrootDone(rpmts ts, int chrootDone)
/*@modifies ts @*/; /*@modifies ts @*/;
/** \ingroup rpmts /** \ingroup rpmts
* Get file security context patterns.
* @param ts transaction set
* @return file security context patterns
*/
/*@null@*/
rpmsx rpmtsREContext(const rpmts ts)
/*@modifies ts @*/;
/** \ingroup rpmts
* Get file security context patterns.
* @param ts transaction set
* @param sx security context patterns
* @return 0 on success
*/
int rpmtsSetREContext(rpmts ts, rpmsx sx)
/*@modifies ts, sx @*/;
/** \ingroup rpmts
* Get transaction id, i.e. transaction time stamp. * Get transaction id, i.e. transaction time stamp.
* @param ts transaction set * @param ts transaction set
* @return transaction id * @return transaction id
*/ */
uint32_t rpmtsGetTid(rpmts ts) uint32_t rpmtsGetTid(rpmts ts)
/*@*/; /*@*/;
/** \ingroup rpmts /** \ingroup rpmts
* Set transaction id, i.e. transaction time stamp. * Set transaction id, i.e. transaction time stamp.
* @param ts transaction set * @param ts transaction set
 End of changes. 1 change blocks. 
18 lines changed or deleted 0 lines changed or added


 rpmurl.h   rpmurl.h 
#ifndef H_RPMURL #ifndef H_RPMURL
#define H_RPMURL #define H_RPMURL
/** \ingroup rpmio /** \ingroup rpmio
* \file rpmio/rpmurl.h * \file rpmio/rpmurl.h
*/ */
#include <assert.h> #include <assert.h>
#include <rpmio.h>
/** /**
* Supported URL types. * Supported URL types.
*/ */
typedef enum urltype_e { typedef enum urltype_e {
URL_IS_UNKNOWN = 0, /*!< unknown (aka a file) */ URL_IS_UNKNOWN = 0, /*!< unknown (aka a file) */
URL_IS_DASH = 1, /*!< stdin/stdout */ URL_IS_DASH = 1, /*!< stdin/stdout */
URL_IS_PATH = 2, /*!< file://... */ URL_IS_PATH = 2, /*!< file://... */
URL_IS_FTP = 3, /*!< ftp://... */ URL_IS_FTP = 3, /*!< ftp://... */
URL_IS_HTTP = 4, /*!< http://... */ URL_IS_HTTP = 4, /*!< http://... */
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 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,4,0,_) #define RPMLIB_VERSION RPMLIB_VERSION_ENCODE(5,1,r,5,0,_)
#define RPMLIB_TIMESTAMP RPMLIB_TIMESTAMP_ENCODE(2008,6,21,0,0) #define RPMLIB_TIMESTAMP RPMLIB_TIMESTAMP_ENCODE(2008,10,12,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/