rpmdb.h   rpmdb.h 
skipping to change at line 863 skipping to change at line 863
/** \ingroup dbi /** \ingroup dbi
* Return dbi transaction id. * Return dbi transaction id.
* @param dbi index database handle * @param dbi index database handle
* @return transaction id * @return transaction id
*/ */
/*@unused@*/ static inline /*@null@*/ /*@unused@*/ static inline /*@null@*/
DB_TXN * dbiTxnid(dbiIndex dbi) DB_TXN * dbiTxnid(dbiIndex dbi)
/*@*/ /*@*/
{ {
rpmdb rpmdb = (dbi ? dbi->dbi_rpmdb : NULL); rpmdb rpmdb = (dbi ? dbi->dbi_rpmdb : NULL);
DB_TXN * _txn = (rpmdb ? rpmdb->db_txn : NULL); DB_TXN * _txn = (DB_TXN*)(rpmdb ? rpmdb->db_txn : NULL);
return _txn; return _txn;
} }
#if defined(_RPMDB_INTERNAL) #if defined(_RPMDB_INTERNAL)
#if !defined(__LCLINT__) #if !defined(__LCLINT__)
/*@unused@*/ static inline /*@unused@*/ static inline
int rpmlkId(rpmdb rpmdb, uint32_t *_idp) int rpmlkId(rpmdb rpmdb, uint32_t *_idp)
{ {
DB_ENV * dbenv = rpmdb->db_dbenv; DB_ENV * dbenv = (DB_ENV*)rpmdb->db_dbenv;
int rc = (rpmdb->_dbi[0]->dbi_eflags & 0x080) int rc = (rpmdb->_dbi[0]->dbi_eflags & 0x080)
? dbenv->lock_id(dbenv, _idp) : ENOTSUP; ? dbenv->lock_id(dbenv, _idp) : ENOTSUP;
if (_rpmdb_debug) if (_rpmdb_debug)
fprintf(stderr, "<-- %s(%p,%p) id 0x%x rc %d\n", "dbenv->lock_id", dbenv, _ idp, *_idp, rc); fprintf(stderr, "<-- %s(%p,%p) id 0x%x rc %d\n", "dbenv->lock_id", dbenv, _ idp, *_idp, rc);
return rc; return rc;
} }
/*@unused@*/ static inline /*@unused@*/ static inline
int rpmlkIdFree(rpmdb rpmdb, uint32_t _id) int rpmlkIdFree(rpmdb rpmdb, uint32_t _id)
{ {
DB_ENV * dbenv = rpmdb->db_dbenv; DB_ENV * dbenv = (DB_ENV*)rpmdb->db_dbenv;
int rc = (rpmdb->_dbi[0]->dbi_eflags & 0x080) int rc = (rpmdb->_dbi[0]->dbi_eflags & 0x080)
? dbenv->lock_id_free(dbenv, _id) : ENOTSUP; ? dbenv->lock_id_free(dbenv, _id) : ENOTSUP;
if (_rpmdb_debug) if (_rpmdb_debug)
fprintf(stderr, "<-- %s(%p,%u) rc %d\n", "dbenv->lock_id_free", dbenv, (uns igned)_id, rc); fprintf(stderr, "<-- %s(%p,%u) rc %d\n", "dbenv->lock_id_free", dbenv, (uns igned)_id, rc);
return rc; return rc;
} }
/*@unused@*/ static inline /*@unused@*/ static inline
int rpmlkGet(rpmdb rpmdb, DBT * _object, uint32_t _lockmode, void * _lock) int rpmlkGet(rpmdb rpmdb, DBT * _object, uint32_t _lockmode, void * _lock)
{ {
DB_ENV * dbenv = rpmdb->db_dbenv; DB_ENV * dbenv = (DB_ENV*)rpmdb->db_dbenv;
uint32_t _locker = 0x12344321; uint32_t _locker = 0x12344321;
uint32_t _flags = 0; uint32_t _flags = 0;
int rc = (rpmdb->_dbi[0]->dbi_eflags & 0x080) int rc = (rpmdb->_dbi[0]->dbi_eflags & 0x080)
? dbenv->lock_get(dbenv, _locker, _flags, _object, _lockmode, _lock) ? dbenv->lock_get(dbenv, _locker, _flags, _object, (db_lockmode_t)_l ockmode, (DB_LOCK*)_lock)
: ENOTSUP; : ENOTSUP;
if (_rpmdb_debug) if (_rpmdb_debug)
fprintf(stderr, "<-- %s(%p,0x%x,0x%x,%p,0x%x,%p) rc %d\n", "dbenv->lock_get ", dbenv, _locker, _flags, _object, _lockmode, _lock, rc); fprintf(stderr, "<-- %s(%p,0x%x,0x%x,%p,0x%x,%p) rc %d\n", "dbenv->lock_get ", dbenv, _locker, _flags, _object, _lockmode, _lock, rc);
return rc; return rc;
} }
/*@unused@*/ static inline /*@unused@*/ static inline
int rpmlkPut(rpmdb rpmdb, void * _lock) int rpmlkPut(rpmdb rpmdb, void * _lock)
{ {
DB_ENV * dbenv = rpmdb->db_dbenv; DB_ENV * dbenv = (DB_ENV*)rpmdb->db_dbenv;
int rc = (rpmdb->_dbi[0]->dbi_eflags & 0x080) int rc = (rpmdb->_dbi[0]->dbi_eflags & 0x080)
? dbenv->lock_put(dbenv, _lock) ? dbenv->lock_put(dbenv, (DB_LOCK*)_lock)
: ENOTSUP; : ENOTSUP;
if (_rpmdb_debug) if (_rpmdb_debug)
fprintf(stderr, "<-- %s(%p,%p) rc %d\n", "dbenv->lock_put", dbenv, _lock, r c); fprintf(stderr, "<-- %s(%p,%p) rc %d\n", "dbenv->lock_put", dbenv, _lock, r c);
return rc; return rc;
} }
/*@unused@*/ static inline /*@unused@*/ static inline
int rpmlgcOpen(rpmdb rpmdb) int rpmlgcOpen(rpmdb rpmdb)
{ {
DB_ENV * dbenv = rpmdb->db_dbenv; DB_ENV * dbenv = (DB_ENV*)rpmdb->db_dbenv;
DB_LOGC * _logc = NULL; DB_LOGC * _logc = NULL;
uint32_t _flags = 0; uint32_t _flags = 0;
int rc = (rpmdb->_dbi[0]->dbi_eflags & 0x100) int rc = (rpmdb->_dbi[0]->dbi_eflags & 0x100)
? dbenv->log_cursor(dbenv, &_logc, _flags) : ENOTSUP; ? dbenv->log_cursor(dbenv, &_logc, _flags) : ENOTSUP;
rpmdb->db_logc = (!rc ? _logc : NULL); rpmdb->db_logc = (!rc ? _logc : NULL);
if (_rpmdb_debug) if (_rpmdb_debug)
fprintf(stderr, "<-- %s(%p,%p,0x%x) logc %p rc %d\n", "dbenv->log_cursor", dbenv, &_logc, _flags, _logc, rc); fprintf(stderr, "<-- %s(%p,%p,0x%x) logc %p rc %d\n", "dbenv->log_cursor", dbenv, &_logc, _flags, _logc, rc);
return rc; return rc;
} }
skipping to change at line 957 skipping to change at line 957
int rc = (_logc ? _logc->close(_logc, _flags) : ENOTSUP); int rc = (_logc ? _logc->close(_logc, _flags) : ENOTSUP);
rpmdb->db_logc = NULL; rpmdb->db_logc = NULL;
if (_rpmdb_debug) if (_rpmdb_debug)
fprintf(stderr, "<-- %s(%p) rc %d\n", "logc->close", _logc, rc); fprintf(stderr, "<-- %s(%p) rc %d\n", "logc->close", _logc, rc);
return rc; return rc;
} }
/*@unused@*/ static inline /*@unused@*/ static inline
int rpmlgcFile(rpmdb rpmdb, const DB_LSN * _lsn, char * name, size_t len) int rpmlgcFile(rpmdb rpmdb, const DB_LSN * _lsn, char * name, size_t len)
{ {
DB_ENV * dbenv = rpmdb->db_dbenv; DB_ENV * dbenv = (DB_ENV*)rpmdb->db_dbenv;
int rc = dbenv->log_file(dbenv, _lsn, name, len); int rc = dbenv->log_file(dbenv, _lsn, name, len);
if (_rpmdb_debug) if (_rpmdb_debug)
fprintf(stderr, "<-- %s(%p,%p,%p[%u]) \"%s\" rc %d\n", "dbenv->log_file", d benv, _lsn, name, (unsigned)len, name, rc); fprintf(stderr, "<-- %s(%p,%p,%p[%u]) \"%s\" rc %d\n", "dbenv->log_file", d benv, _lsn, name, (unsigned)len, name, rc);
return rc; return rc;
} }
/*@unused@*/ static inline /*@unused@*/ static inline
int rpmlgcFlush(rpmdb rpmdb, const DB_LSN * _lsn) int rpmlgcFlush(rpmdb rpmdb, const DB_LSN * _lsn)
{ {
DB_ENV * dbenv = rpmdb->db_dbenv; DB_ENV * dbenv = (DB_ENV*)rpmdb->db_dbenv;
int rc = dbenv->log_flush(dbenv, _lsn); int rc = dbenv->log_flush(dbenv, _lsn);
if (_rpmdb_debug) if (_rpmdb_debug)
fprintf(stderr, "<-- %s(%p,%p) rc %d\n", "dbenv->log_flush", dbenv, _lsn, r c); fprintf(stderr, "<-- %s(%p,%p) rc %d\n", "dbenv->log_flush", dbenv, _lsn, r c);
return rc; return rc;
} }
/*@unused@*/ static inline /*@unused@*/ static inline
int rpmlgcPrintf(rpmdb rpmdb, const char * fmt, void *_A1, void *_A2, void *_A3, void *_A4, void *_A5) int rpmlgcPrintf(rpmdb rpmdb, const char * fmt, void *_A1, void *_A2, void *_A3, void *_A4, void *_A5)
{ {
DB_ENV * dbenv = rpmdb->db_dbenv; DB_ENV * dbenv = (DB_ENV*)rpmdb->db_dbenv;
DB_TXN * _txnid = rpmdb->db_txn; DB_TXN * _txnid = (DB_TXN*)rpmdb->db_txn;
int rc = dbenv->log_printf(dbenv, _txnid, fmt, _A1, _A2, _A3, _A4, _A5) ; int rc = dbenv->log_printf(dbenv, _txnid, fmt, _A1, _A2, _A3, _A4, _A5) ;
if (_rpmdb_debug) if (_rpmdb_debug)
fprintf(stderr, "<-- %s(%p,%p,\"%s\", ...) rc %d\n", "dbenv->log_printf", d benv, _txnid, fmt, rc); fprintf(stderr, "<-- %s(%p,%p,\"%s\", ...) rc %d\n", "dbenv->log_printf", d benv, _txnid, fmt, rc);
return rc; return rc;
} }
/*@unused@*/ static inline /*@unused@*/ static inline
int rpmlgcPut(rpmdb rpmdb, DB_LSN * _lsn, const DBT * data, uint32_t flags) int rpmlgcPut(rpmdb rpmdb, DB_LSN * _lsn, const DBT * data, uint32_t flags)
{ {
DB_ENV * dbenv = rpmdb->db_dbenv; DB_ENV * dbenv = (DB_ENV*)rpmdb->db_dbenv;
int rc = dbenv->log_put(dbenv, _lsn, data, flags); int rc = dbenv->log_put(dbenv, _lsn, data, flags);
if (_rpmdb_debug) if (_rpmdb_debug)
fprintf(stderr, "<-- %s(%p,%p,%p,0x%x) rc %d\n", "dbenv->log_put", dbenv, _ lsn, data, flags, rc); fprintf(stderr, "<-- %s(%p,%p,%p,0x%x) rc %d\n", "dbenv->log_put", dbenv, _ lsn, data, flags, rc);
return rc; return rc;
} }
/*@unused@*/ static inline /*@unused@*/ static inline
int rpmmpfSyncAll(rpmdb rpmdb) int rpmmpfSyncAll(rpmdb rpmdb)
{ {
DB_ENV * dbenv = rpmdb->db_dbenv; DB_ENV * dbenv = (DB_ENV*)rpmdb->db_dbenv;
DB_LSN * _lsn = NULL; DB_LSN * _lsn = NULL;
int rc = (rpmdb->_dbi[0]->dbi_eflags & 0x100) int rc = (rpmdb->_dbi[0]->dbi_eflags & 0x100)
? dbenv->memp_sync(dbenv, _lsn) : ENOTSUP; ? dbenv->memp_sync(dbenv, _lsn) : ENOTSUP;
if (_rpmdb_debug) if (_rpmdb_debug)
fprintf(stderr, "<-- %s(%p,%p) rc %d\n", "dbenv->memp_sync", dbenv, _lsn, r c); fprintf(stderr, "<-- %s(%p,%p) rc %d\n", "dbenv->memp_sync", dbenv, _lsn, r c);
return rc; return rc;
} }
/*@unused@*/ static inline /*@unused@*/ static inline
int rpmmpfTrickle(rpmdb rpmdb) int rpmmpfTrickle(rpmdb rpmdb)
{ {
DB_ENV * dbenv = rpmdb->db_dbenv; DB_ENV * dbenv = (DB_ENV*)rpmdb->db_dbenv;
int _percent = 20; int _percent = 20;
int _nwrote = 0; int _nwrote = 0;
int rc = (rpmdb->_dbi[0]->dbi_eflags & 0x100) int rc = (rpmdb->_dbi[0]->dbi_eflags & 0x100)
? dbenv->memp_trickle(dbenv, _percent, &_nwrote) : ENOTSUP; ? dbenv->memp_trickle(dbenv, _percent, &_nwrote) : ENOTSUP;
if (_rpmdb_debug) if (_rpmdb_debug)
fprintf(stderr, "<-- %s(%p,%d) nwrote %d rc %d\n", "dbenv->memp_trickle", d benv, _percent, _nwrote, rc); fprintf(stderr, "<-- %s(%p,%d) nwrote %d rc %d\n", "dbenv->memp_trickle", d benv, _percent, _nwrote, rc);
return rc; return rc;
} }
/*@unused@*/ static inline /*@unused@*/ static inline
skipping to change at line 1036 skipping to change at line 1036
rpmdb->db_mpf = NULL; rpmdb->db_mpf = NULL;
if (_rpmdb_debug) if (_rpmdb_debug)
fprintf(stderr, "<-- %s(%p) rc %d\n", "mpf->close", mpf, rc); fprintf(stderr, "<-- %s(%p) rc %d\n", "mpf->close", mpf, rc);
return rc; return rc;
} }
/*@unused@*/ static inline /*@unused@*/ static inline
int rpmmpfGet(rpmdb rpmdb, uint32_t * _pgnop, uint32_t _flags, void ** _pag ep) int rpmmpfGet(rpmdb rpmdb, uint32_t * _pgnop, uint32_t _flags, void ** _pag ep)
{ {
DB_MPOOLFILE * mpf = rpmdb->db_mpf; DB_MPOOLFILE * mpf = rpmdb->db_mpf;
DB_TXN * _txnid = rpmdb->db_txn; DB_TXN * _txnid = (DB_TXN*)rpmdb->db_txn;
int rc = mpf->get(mpf, _pgnop, _txnid, _flags, _pagep); int rc = mpf->get(mpf, _pgnop, _txnid, _flags, _pagep);
if (_rpmdb_debug) if (_rpmdb_debug)
fprintf(stderr, "<-- %s(%p,%p,%p,0x%x,%p) rc %d\n", "mpf->get", mpf, _pgnop , _txnid, _flags, _pagep, rc); fprintf(stderr, "<-- %s(%p,%p,%p,0x%x,%p) rc %d\n", "mpf->get", mpf, _pgnop , _txnid, _flags, _pagep, rc);
return rc; return rc;
} }
/*@unused@*/ static inline /*@unused@*/ static inline
int rpmmpfOpen(rpmdb rpmdb, /*@null@*/ const char * fn, uint32_t flags) int rpmmpfOpen(rpmdb rpmdb, /*@null@*/ const char * fn, uint32_t flags)
{ {
DB_ENV * dbenv = rpmdb->db_dbenv; DB_ENV * dbenv = (DB_ENV*)rpmdb->db_dbenv;
DB_MPOOLFILE * mpf = NULL; DB_MPOOLFILE * mpf = NULL;
int _perms = rpmdb->_dbi[0]->dbi_perms; int _perms = rpmdb->_dbi[0]->dbi_perms;
size_t _pagesize = BUFSIZ; size_t _pagesize = BUFSIZ;
uint32_t _fcreate_flags = 0; uint32_t _fcreate_flags = 0;
int rc = (rpmdb->_dbi[0]->dbi_eflags & 0x100) int rc = (rpmdb->_dbi[0]->dbi_eflags & 0x100)
? dbenv->memp_fcreate(dbenv, &mpf, _fcreate_flags) : ENOTSUP; ? dbenv->memp_fcreate(dbenv, &mpf, _fcreate_flags) : ENOTSUP;
if (_rpmdb_debug) if (_rpmdb_debug)
fprintf(stderr, "<-- %s(%p,&mpf,0x%x) mpf %p rc %d\n", "dbenv->memp_fcreate ", dbenv, _fcreate_flags, mpf, rc); fprintf(stderr, "<-- %s(%p,&mpf,0x%x) mpf %p rc %d\n", "dbenv->memp_fcreate ", dbenv, _fcreate_flags, mpf, rc);
if (rc) goto exit; if (rc) goto exit;
skipping to change at line 1071 skipping to change at line 1071
exit: exit:
return rc; return rc;
} }
/*@unused@*/ static inline /*@unused@*/ static inline
int rpmmpfPut(rpmdb rpmdb, void * _page, uint32_t flags) int rpmmpfPut(rpmdb rpmdb, void * _page, uint32_t flags)
{ {
DB_MPOOLFILE * mpf = rpmdb->db_mpf; DB_MPOOLFILE * mpf = rpmdb->db_mpf;
uint32_t _priority = DB_PRIORITY_DEFAULT; uint32_t _priority = DB_PRIORITY_DEFAULT;
int rc = mpf->put(mpf, _page, _priority, flags); int rc = mpf->put(mpf, _page, (DB_CACHE_PRIORITY)_priority, flags);
if (_rpmdb_debug) if (_rpmdb_debug)
fprintf(stderr, "<-- %s(%p,%p,0x%x,0x%x) rc %d\n", "mpf->put", mpf, _page, _priority, flags, rc); fprintf(stderr, "<-- %s(%p,%p,0x%x,0x%x) rc %d\n", "mpf->put", mpf, _page, _priority, flags, rc);
return rc; return rc;
} }
/*@unused@*/ static inline /*@unused@*/ static inline
int rpmmpfSync(rpmdb rpmdb) int rpmmpfSync(rpmdb rpmdb)
{ {
DB_MPOOLFILE * mpf = rpmdb->db_mpf; DB_MPOOLFILE * mpf = rpmdb->db_mpf;
int rc = (mpf ? mpf->sync(mpf) : ENOTSUP); int rc = (mpf ? mpf->sync(mpf) : ENOTSUP);
 End of changes. 17 change blocks. 
18 lines changed or deleted 18 lines changed or added


 rpmgi.h   rpmgi.h 
skipping to change at line 59 skipping to change at line 59
const void * keyp; /*!< Iterator key. */ const void * keyp; /*!< Iterator key. */
size_t keylen; /*!< Iterator key length. */ size_t keylen; /*!< Iterator key length. */
rpmgiFlags flags; /*!< Iterator control bits. */ rpmgiFlags flags; /*!< Iterator control bits. */
int active; /*!< Iterator is active? */ int active; /*!< Iterator is active? */
int i; /*!< Element index. */ int i; /*!< Element index. */
/*@null@*/ /*@null@*/
const char * hdrPath; /*!< Path to current iterator header. */ const char * hdrPath; /*!< Path to current iterator header. */
/*@refcounted@*/ /*@null@*/ /*@refcounted@*/ /*@null@*/
Header h; /*!< Current iterator header. */ Header h; /*!< Current iterator header. */
int rc; /*!< Current exit code, specific to item. */
/*@null@*/ /*@null@*/
rpmtsi tsi; rpmtsi tsi;
/*@null@*/ /*@null@*/
rpmmi mi; rpmmi mi;
/*@refcounted@*/ /*@relnull@*/ /*@refcounted@*/ /*@relnull@*/
FD_t fd; FD_t fd;
skipping to change at line 191 skipping to change at line 192
/** /**
* Return current iteration transaction set. * Return current iteration transaction set.
* @param gi generalized iterator * @param gi generalized iterator
* @return transaction set * @return transaction set
*/ */
/*@null@*/ /*@null@*/
rpmts rpmgiTs(/*@null@*/ rpmgi gi) rpmts rpmgiTs(/*@null@*/ rpmgi gi)
/*@*/; /*@*/;
/** /**
* Return current iteration item(s) exit code.
* @param gi generalized iterator
* @return transaction set
*/
/*@null@*/
int rpmgiRc(/*@null@*/ rpmgi gi)
/*@*/;
/**
* Escape isspace(3) characters in string. * Escape isspace(3) characters in string.
* @param s string * @param s string
* @return escaped string * @return escaped string
*/ */
const char * rpmgiEscapeSpaces(const char * s) const char * rpmgiEscapeSpaces(const char * s)
/*@*/; /*@*/;
/** /**
* Load iterator args. * Load iterator args.
* @param gi generalized iterator * @param gi generalized iterator
 End of changes. 2 change blocks. 
0 lines changed or deleted 10 lines changed or added


 rpmns.h   rpmns.h 
skipping to change at line 55 skipping to change at line 55
RPMNS_TYPE_DISKSPACE= (1 << 19), /*!< diskspace(/path) */ RPMNS_TYPE_DISKSPACE= (1 << 19), /*!< diskspace(/path) */
RPMNS_TYPE_DIGEST = (1 << 20), /*!< digest(/path) = hex */ RPMNS_TYPE_DIGEST = (1 << 20), /*!< digest(/path) = hex */
RPMNS_TYPE_GNUPG = (1 << 21), /*!< gnupg(/path/file.asc) */ RPMNS_TYPE_GNUPG = (1 << 21), /*!< gnupg(/path/file.asc) */
RPMNS_TYPE_MACRO = (1 << 22), /*!< macro(foo) */ RPMNS_TYPE_MACRO = (1 << 22), /*!< macro(foo) */
RPMNS_TYPE_ENVVAR = (1 << 23), /*!< envvar(foo) */ RPMNS_TYPE_ENVVAR = (1 << 23), /*!< envvar(foo) */
RPMNS_TYPE_RUNNING = (1 << 24), /*!< running(foo) */ RPMNS_TYPE_RUNNING = (1 << 24), /*!< running(foo) */
RPMNS_TYPE_SANITY = (1 << 25), /*!< sanitycheck(foo) */ RPMNS_TYPE_SANITY = (1 << 25), /*!< sanitycheck(foo) */
RPMNS_TYPE_VCHECK = (1 << 26), /*!< vcheck(foo) */ RPMNS_TYPE_VCHECK = (1 << 26), /*!< vcheck(foo) */
RPMNS_TYPE_SIGNATURE= (1 << 27), /*!< signature(/text:/sig) = /pub:id */ RPMNS_TYPE_SIGNATURE= (1 << 27), /*!< signature(/text:/sig) = /pub:id */
RPMNS_TYPE_VERIFY = (1 << 28), /*!< verify(N) = E:V-R */ RPMNS_TYPE_VERIFY = (1 << 28), /*!< verify(N) = E:V-R */
RPMNS_TYPE_CONFIG = (1 << 29), /*!< config(N) = E:V-R */ RPMNS_TYPE_CONFIG = (1 << 29) /*!< config(N) = E:V-R */
} nsType; } nsType;
#if defined(_RPMNS_INTERNAL) #if defined(_RPMNS_INTERNAL)
/** \ingroup rpmds /** \ingroup rpmds
* An NS parsing container. * An NS parsing container.
*/ */
struct rpmns_s { struct rpmns_s {
/*@owned@*/ /*@owned@*/
const char * str; /*!< string storage */ const char * str; /*!< string storage */
nsType Type; /*!< Type */ nsType Type; /*!< Type */
skipping to change at line 90 skipping to change at line 90
/** \ingroup rpmds /** \ingroup rpmds
* Is string a known arch suffix? * Is string a known arch suffix?
* @param str string * @param str string
* @return RPMNS_TYPE_ARCH if known arch, else RPMNS_TYPE_UNKNO WN * @return RPMNS_TYPE_ARCH if known arch, else RPMNS_TYPE_UNKNO WN
*/ */
nsType rpmnsArch(const char * str) nsType rpmnsArch(const char * str)
/*@*/; /*@*/;
/** \ingroup rpmds /** \ingroup rpmds
* Is string a known probe namespace? * Is string a known probe namespace?
* @param str string * @param s string
* @param slen string length (0 uses strlen(s))
* @return nsType if known probe, else RPMNS_TYPE_UNKNOWN * @return nsType if known probe, else RPMNS_TYPE_UNKNOWN
*/ */
nsType rpmnsProbe(const char * str) nsType rpmnsProbe(const char * s, size_t slen)
/*@*/; /*@*/;
/** \ingroup rpmds /** \ingroup rpmds
* Classify a string as a dependency type. * Classify a string as a dependency type.
* @param str string like "bing(bang).boom" * @param s string like "bing(bang).boom"
* @param slen string length (0 uses strlen(s))
* @return dependency type * @return dependency type
*/ */
nsType rpmnsClassify(const char * str) nsType rpmnsClassify(const char * s, size_t slen)
/*@*/; /*@*/;
/** \ingroup rpmds /** \ingroup rpmds
* Split NS string into namespace, name and arch components. * Expand and split NS(N).A string into namespace, name and arch components
* @param str string like "bing(bang).boom" .
* @param s string like "bing(bang).boom"
* @retval *ns parse results * @retval *ns parse results
* @return 0 always * @return 0 always
*/ */
int rpmnsParse(const char * str, rpmns ns) int rpmnsParse(const char * str, rpmns ns)
/*@globals rpmGlobalMacroContext, h_errno, internalState @*/ /*@globals rpmGlobalMacroContext, h_errno, internalState @*/
/*@modifies ns, rpmGlobalMacroContext, internalState @*/; /*@modifies ns, rpmGlobalMacroContext, internalState @*/;
/** \ingroup rpmns /** \ingroup rpmns
* Clean global name space dependency sets. * Clean global name space dependency sets.
*/ */
 End of changes. 6 change blocks. 
7 lines changed or deleted 10 lines changed or added


 rpmts.h   rpmts.h 
skipping to change at line 94 skipping to change at line 94
RPMTRANS_FLAG_NOPOSTUN = (1 << 22), /*!< from --nopostun */ RPMTRANS_FLAG_NOPOSTUN = (1 << 22), /*!< from --nopostun */
RPMTRANS_FLAG_NOTRIGGERPOSTUN = (1 << 23), /*!< from --notriggerpostun */ RPMTRANS_FLAG_NOTRIGGERPOSTUN = (1 << 23), /*!< from --notriggerpostun */
/*@-enummemuse@*/ /*@-enummemuse@*/
RPMTRANS_FLAG_NOPAYLOAD = (1 << 24), RPMTRANS_FLAG_NOPAYLOAD = (1 << 24),
/*@=enummemuse@*/ /*@=enummemuse@*/
RPMTRANS_FLAG_NORPMDB = (1 << 25), /*!< from --norpmdb */ RPMTRANS_FLAG_NORPMDB = (1 << 25), /*!< from --norpmdb */
RPMTRANS_FLAG_NOPOLICY = (1 << 26), /*!< from --nopolicy */ RPMTRANS_FLAG_NOPOLICY = (1 << 26), /*!< from --nopolicy */
RPMTRANS_FLAG_NOFDIGESTS = (1 << 27), /*!< from --nofdigests */ RPMTRANS_FLAG_NOFDIGESTS = (1 << 27), /*!< from --nofdigests */
RPMTRANS_FLAG_NOPRETRANS = (1 << 28), /*!< from --nopretrans */ RPMTRANS_FLAG_NOPRETRANS = (1 << 28), /*!< from --nopretrans */
RPMTRANS_FLAG_NOPOSTTRANS = (1 << 29), /*!< from --noposttrans */ RPMTRANS_FLAG_NOPOSTTRANS = (1 << 29), /*!< from --noposttrans */
RPMTRANS_FLAG_NOCONFIGS = (1 << 30), /*!< from --noconfigs */ RPMTRANS_FLAG_NOCONFIGS = (1 << 30) /*!< from --noconfigs */
/* 31 unused */ /* 31 unused */
} rpmtransFlags; } rpmtransFlags;
#define _noTransScripts \ #define _noTransScripts \
( RPMTRANS_FLAG_NOPRETRANS | \ ( RPMTRANS_FLAG_NOPRETRANS | \
RPMTRANS_FLAG_NOPRE | \ RPMTRANS_FLAG_NOPRE | \
RPMTRANS_FLAG_NOPOST | \ RPMTRANS_FLAG_NOPOST | \
RPMTRANS_FLAG_NOPREUN | \ RPMTRANS_FLAG_NOPREUN | \
RPMTRANS_FLAG_NOPOSTUN | \ RPMTRANS_FLAG_NOPOSTUN | \
RPMTRANS_FLAG_NOPOSTTRANS \ RPMTRANS_FLAG_NOPOSTTRANS \
skipping to change at line 156 skipping to change at line 156
RPMTRANS_TYPE_NORMAL = 0, RPMTRANS_TYPE_NORMAL = 0,
RPMTRANS_TYPE_ROLLBACK = (1 << 0), RPMTRANS_TYPE_ROLLBACK = (1 << 0),
RPMTRANS_TYPE_AUTOROLLBACK = (1 << 1) RPMTRANS_TYPE_AUTOROLLBACK = (1 << 1)
} rpmTSType; } rpmTSType;
/** \ingroup rpmts /** \ingroup rpmts
*/ */
typedef enum tsStage_e { typedef enum tsStage_e {
TSM_UNKNOWN = 0, TSM_UNKNOWN = 0,
TSM_INSTALL = 7, TSM_INSTALL = 7,
TSM_ERASE = 8, TSM_ERASE = 8
} tsmStage; } tsmStage;
#if defined(_RPMTS_INTERNAL) #if defined(_RPMTS_INTERNAL)
#include <rpmbf.h> #include <rpmbf.h>
#include "rpmhash.h" /* XXX hashTable */ #include "rpmhash.h" /* XXX hashTable */
#include "rpmkeyring.h" #include "rpmkeyring.h"
#include <rpmtxn.h> #include <rpmtxn.h>
#include "rpmal.h" /* XXX availablePackage/relocateFileList ,*/ #include "rpmal.h" /* XXX availablePackage/relocateFileList ,*/
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 rpmtypes.h   rpmtypes.h 
skipping to change at line 95 skipping to change at line 95
/** /**
* Scriptlet states (when installed). * Scriptlet states (when installed).
*/ */
typedef enum rpmScriptState_e { typedef enum rpmScriptState_e {
RPMSCRIPT_STATE_UNKNOWN = 0, RPMSCRIPT_STATE_UNKNOWN = 0,
/* 0-15 reserved for waitpid return. */ /* 0-15 reserved for waitpid return. */
RPMSCRIPT_STATE_EXEC = (1 << 16), /*!< scriptlet was exec'd */ RPMSCRIPT_STATE_EXEC = (1 << 16), /*!< scriptlet was exec'd */
RPMSCRIPT_STATE_REAPED = (1 << 17), /*!< scriptlet was reaped */ RPMSCRIPT_STATE_REAPED = (1 << 17), /*!< scriptlet was reaped */
/* 18-23 unused */ /* 18-23 unused */
RPMSCRIPT_STATE_SELINUX = (1 << 24), /*!< scriptlet exec by SELinux */ RPMSCRIPT_STATE_SELINUX = (1 << 24), /*!< scriptlet exec by SELinux */
RPMSCRIPT_STATE_EMBEDDED = (1 << 25), /*!< scriptlet exec by lua et a l */ RPMSCRIPT_STATE_EMBEDDED = (1 << 25) /*!< scriptlet exec by lua et al */
/* 26-31 unused */ /* 26-31 unused */
} rpmScriptState; } rpmScriptState;
#endif /* _H_RPMTYPES_ */ #endif /* _H_RPMTYPES_ */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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,4,r,0,0,_) #define RPMLIB_VERSION RPMLIB_VERSION_ENCODE(5,4,r,1,0,_)
#define RPMLIB_TIMESTAMP RPMLIB_TIMESTAMP_ENCODE(2010,12,29,0,0) #define RPMLIB_TIMESTAMP RPMLIB_TIMESTAMP_ENCODE(2010,12,29,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/