rpmbf.h   rpmbf.h 
skipping to change at line 75 skipping to change at line 75
/*@unused@*/ /*@unused@*/
static inline pbm_set * PBM_REALLOC(pbm_set ** sp, int * odp, int nd) static inline pbm_set * PBM_REALLOC(pbm_set ** sp, int * odp, int nd)
/*@modifies *sp, *odp @*/ /*@modifies *sp, *odp @*/
{ {
int i, nb; int i, nb;
if (nd > (*odp)) { if (nd > (*odp)) {
nd *= 2; nd *= 2;
nb = __PBM_IX(nd) + 1; nb = __PBM_IX(nd) + 1;
/*@-unqualifiedtrans@*/ /*@-unqualifiedtrans@*/
*sp = xrealloc(*sp, nb * (__PBM_NBITS/8)); *sp = (pbm_set *) xrealloc(*sp, nb * (__PBM_NBITS/8));
/*@=unqualifiedtrans@*/ /*@=unqualifiedtrans@*/
for (i = __PBM_IX(*odp) + 1; i < nb; i++) for (i = __PBM_IX(*odp) + 1; i < nb; i++)
__PBM_BITS(*sp)[i] = 0; __PBM_BITS(*sp)[i] = 0;
*odp = nd; *odp = nd;
} }
/*@-compdef -retalias -usereleased@*/ /*@-compdef -retalias -usereleased@*/
return *sp; return *sp;
/*@=compdef =retalias =usereleased@*/ /*@=compdef =retalias =usereleased@*/
} }
 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 382 skipping to change at line 382
/* mutex sub-system parameters */ /* mutex sub-system parameters */
/* replication sub-system parameters */ /* replication sub-system parameters */
/* sequences sub-system parameters */ /* sequences sub-system parameters */
const char * dbi_seq_id; const char * dbi_seq_id;
unsigned int dbi_seq_cachesize; unsigned int dbi_seq_cachesize;
unsigned int dbi_seq_flags; unsigned int dbi_seq_flags;
int64_t dbi_seq_initial; int64_t dbi_seq_initial;
int64_t dbi_seq_min; int64_t dbi_seq_min;
int64_t dbi_seq_max; int64_t dbi_seq_max;
int64_t dbi_seqno;
/* transaction sub-system parameters */ /* transaction sub-system parameters */
#if 0 #if 0
int (*dbi_tx_recover) (DB_ENV *dbenv, DBT *log_rec, int (*dbi_tx_recover) (DB_ENV *dbenv, DBT *log_rec,
DB_LSN *lsnp, int redo, void *info) DB_LSN *lsnp, int redo, void *info)
/*@globals fileSystem @*/ /*@globals fileSystem @*/
/*@modifies fileSystem @*/; /*@modifies fileSystem @*/;
#endif #endif
/* dbinfo parameters */ /* dbinfo parameters */
int dbi_pagesize; /*!< (fs blksize) */ int dbi_pagesize; /*!< (fs blksize) */
skipping to change at line 434 skipping to change at line 435
/*@null@*/ /*@null@*/
const char * dbi_primary; /*!< Primary table for secondary index. */ const char * dbi_primary; /*!< Primary table for secondary index. */
/*@null@*/ /*@null@*/
const char * dbi_foreign; const char * dbi_foreign;
/*@refcounted@*/ /*@refcounted@*/
rpmdb dbi_rpmdb; /*!< the parent rpm database */ rpmdb dbi_rpmdb; /*!< the parent rpm database */
rpmTag dbi_rpmtag; /*!< rpm tag used for index */ rpmTag dbi_rpmtag; /*!< rpm tag used for index */
size_t dbi_jlen; /*!< size of join key */ size_t dbi_jlen; /*!< size of join key */
int dbi_table_nkeys; /*!< Sqlite3: COUNT(key) */
int dbi_table_exists; /*!< Sqlite3: table exists? */
/*@only@*/ /*@relnull@*/ /*@only@*/ /*@relnull@*/
DB_SEQUENCE * dbi_seq; /*!< Berkeley DB_SEQUENCE handle */ void * dbi_seq; /*!< Berkeley DB_SEQUENCE handle */
/*@only@*/ /*@relnull@*/ /*@only@*/ /*@relnull@*/
DB * dbi_db; /*!< Berkeley DB handle */ void * dbi_db; /*!< Berkeley DB handle */
/*@only@*/ /*@null@*/ /*@only@*/ /*@null@*/
DB_TXN * dbi_txnid; /*!< Berkeley DB_TXN handle */ void * dbi_txnid; /*!< Berkeley DB_TXN handle */
/*@only@*/ /*@null@*/ /*@only@*/ /*@null@*/
void * dbi_stats; /*!< Berkeley DB statistics */ void * dbi_stats; /*!< Berkeley DB statistics */
/*@observer@*/ /*@observer@*/
const struct _dbiVec * dbi_vec; /*!< private methods */ const struct _dbiVec * dbi_vec; /*!< private methods */
}; };
#endif /* !defined(SWIG) */ #endif /* !defined(SWIG) */
/** \ingroup rpmdb /** \ingroup rpmdb
skipping to change at line 492 skipping to change at line 496
int (*db_export) (rpmdb db, Header h, int adding); int (*db_export) (rpmdb db, Header h, int adding);
/*@refcounted@*/ /*@refcounted@*/
Header db_h; /*!< Currently active header */ Header db_h; /*!< Currently active header */
rpmdb db_next; /*!< Chain of rpmdbOpen'ed rpmdb's. */ rpmdb db_next; /*!< Chain of rpmdbOpen'ed rpmdb's. */
int db_opens; /*!< No. of opens for this rpmdb. */ int db_opens; /*!< No. of opens for this rpmdb. */
void * db_dbenv; /*!< Berkeley DB_ENV handle. */ void * db_dbenv; /*!< Berkeley DB_ENV handle. */
void * db_txn; /*!< Berkeley DB_TXN handle */ void * db_txn; /*!< Berkeley DB_TXN handle */
DB_LOGC * db_logc; /*!< Berkeley DB_LOGC handle */ void * db_logc; /*!< Berkeley DB_LOGC handle */
DB_MPOOLFILE *db_mpf; /*!< Berkeley DB_MPOOLFILE handle */ void * db_mpf; /*!< Berkeley DB_MPOOLFILE handle */
tagStore_t db_tags; /*!< Tag name/value mappings. */ tagStore_t db_tags; /*!< Tag name/value mappings. */
size_t db_ndbi; /*!< No. of tag indices. */ size_t db_ndbi; /*!< No. of tag indices. */
/*@only@*/ /*@null@*/ /*@only@*/ /*@null@*/
dbiIndex * _dbi; /*!< Tag indices. */ dbiIndex * _dbi; /*!< Tag indices. */
struct rpmop_s db_getops; /*!< dbiGet statistics. */ struct rpmop_s db_getops; /*!< dbiGet statistics. */
struct rpmop_s db_putops; /*!< dbiPut statistics. */ struct rpmop_s db_putops; /*!< dbiPut statistics. */
struct rpmop_s db_delops; /*!< dbiDel statistics. */ struct rpmop_s db_delops; /*!< dbiDel statistics. */
skipping to change at line 870 skipping to change at line 874
/*@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 = (DB_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(WITH_DB)
#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 = (DB_ENV*)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 = (DB_ENV*)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 = (DB_ENV*)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, (db_lockmode_t)_l ockmode, (DB_LOCK*)_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 = (DB_ENV*)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, (DB_LOCK*)_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 = (DB_ENV*)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 1089 skipping to change at line 1093
/*@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);
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;
} }
#endif /* __LCLINT__ */ #endif /* __LCLINT__ */
#endif /* defined(WITH_DB) */
#endif /* _RPMDB_INTERNAL */ #endif /* _RPMDB_INTERNAL */
/*@=globuse =mustmod @*/ /*@=globuse =mustmod @*/
#endif /* !defined(SWIG) */ #endif /* !defined(SWIG) */
/*@=exportlocal@*/ /*@=exportlocal@*/
/** \ingroup dbi /** \ingroup dbi
* Destroy set of index database items. * Destroy set of index database items.
* @param set set of index database items * @param set set of index database items
* @return NULL always * @return NULL always
 End of changes. 13 change blocks. 
12 lines changed or deleted 16 lines changed or added


 rpmds.h   rpmds.h 
skipping to change at line 106 skipping to change at line 106
rpmds * Cdsp; /*!< Conflicts: collector. */ rpmds * Cdsp; /*!< Conflicts: collector. */
/*@dependent@*/ /*@relnull@*/ /*@dependent@*/ /*@relnull@*/
rpmds * Odsp; /*!< Obsoletes: collector. */ rpmds * Odsp; /*!< Obsoletes: collector. */
/*@dependent@*/ /*@relnull@*/ /*@dependent@*/ /*@relnull@*/
rpmds * Tdsp; /*!< Triggers collector. */ rpmds * Tdsp; /*!< Triggers collector. */
/*@dependent@*/ /*@relnull@*/ /*@dependent@*/ /*@relnull@*/
rpmds * Ddsp; /*!< Dirnames collector. */ rpmds * Ddsp; /*!< Dirnames collector. */
/*@dependent@*/ /*@relnull@*/ /*@dependent@*/ /*@relnull@*/
rpmds * Ldsp; /*!< Linktos collector. */ rpmds * Ldsp; /*!< Linktos collector. */
/*@refcounted@*/ /*@null@*/ /*@refcounted@*/ /*@null@*/
rpmds this; /*!< N = EVR */ rpmds my; /*!< N = EVR */
/*@refcounted@*/ /*@null@*/ /*@refcounted@*/ /*@null@*/
rpmds P; /*!< Provides: */ rpmds P; /*!< Provides: */
/*@refcounted@*/ /*@null@*/ /*@refcounted@*/ /*@null@*/
rpmds R; /*!< Requires: */ rpmds R; /*!< Requires: */
/*@refcounted@*/ /*@null@*/ /*@refcounted@*/ /*@null@*/
rpmds C; /*!< Conflicts: */ rpmds C; /*!< Conflicts: */
/*@refcounted@*/ /*@null@*/ /*@refcounted@*/ /*@null@*/
rpmds O; /*!< Obsoletes: */ rpmds O; /*!< Obsoletes: */
/*@refcounted@*/ /*@null@*/ /*@refcounted@*/ /*@null@*/
rpmds T; /*!< Triggers */ rpmds T; /*!< Triggers */
/*@refcounted@*/ /*@null@*/ /*@refcounted@*/ /*@null@*/
rpmds D; /*!< Dirnames */ rpmds D; /*!< Dirnames */
/*@refcounted@*/ /*@null@*/ /*@refcounted@*/ /*@null@*/
rpmds L; /*!< Linktos */ rpmds L; /*!< Linktos */
#if defined(__LCLINT__) #if defined(__LCLINT__)
/*@refs@*/ /*@refs@*/
int nrefs; /*!< (unused) keep splint happy */ int nrefs; /*!< (unused) keep splint happy */
#endif #endif
}; };
#endif /* _RPMPRCO_INTERNAL */ #endif /* _RPMPRCO_INTERNAL */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
 End of changes. 8 change blocks. 
8 lines changed or deleted 8 lines changed or added


 rpmevr.h   rpmevr.h 
skipping to change at line 74 skipping to change at line 74
RPMSENSE_CONFIG = (1 << 28), RPMSENSE_CONFIG = (1 << 28),
RPMSENSE_PROBE = (1 << 29), RPMSENSE_PROBE = (1 << 29),
RPMSENSE_PACKAGE = (1 << 30), RPMSENSE_PACKAGE = (1 << 30),
RPMSENSE_SCRIPT_SANITYCHECK = (1 << 31) /*!< %sanitycheck dependency. * / RPMSENSE_SCRIPT_SANITYCHECK = (1 << 31) /*!< %sanitycheck dependency. * /
#endif #endif
} evrFlags; } evrFlags;
/*@=matchfields@*/ /*@=matchfields@*/
typedef enum evrFlags_e rpmsenseFlags; typedef enum evrFlags_e rpmsenseFlags;
#define RPMSENSE_SENSEMASK 0x0e /* Mask to get senses, ie s #define RPMSENSE_SENSEMASK \
erial, */ (RPMSENSE_EQUAL | RPMSENSE_GREATER | RPMSENSE_LESS)
/* less, greater, equal. #define RPMSENSE_NOTEQUAL \
*/ (RPMSENSE_EQUAL ^ RPMSENSE_SENSEMASK)
#define RPMSENSE_NOTEQUAL (RPMSENSE_EQUAL ^ RPMSENSE_SENSEMASK
)
#if defined(_RPMEVR_INTERNAL) #if defined(_RPMEVR_INTERNAL)
/** \ingroup rpmds /** \ingroup rpmds
* An EVR parsing container. * An EVR parsing container.
*/ */
struct EVR_s { struct EVR_s {
/*@owned@*/ /*@owned@*/
const char * str; /*!< EVR storage */ const char * str; /*!< EVR storage */
#ifndef DYING #ifndef DYING
unsigned long Elong; /*!< E converted to integer. */ unsigned long Elong; /*!< E converted to integer. */
 End of changes. 1 change blocks. 
6 lines changed or deleted 4 lines changed or added


 rpmmacro.h   rpmmacro.h 
skipping to change at line 91 skipping to change at line 91
int int
rpmGetMacroEntries(/*@null@*/ MacroContext mc, /*@null@*/ void * _mire, rpmGetMacroEntries(/*@null@*/ MacroContext mc, /*@null@*/ void * _mire,
int used, /*@null@*/ const char *** avp) int used, /*@null@*/ const char *** avp)
/*@globals rpmGlobalMacroContext @*/ /*@globals rpmGlobalMacroContext @*/
/*@modifies _mire, *avp @*/; /*@modifies _mire, *avp @*/;
/** /**
* Check whether configuration file is moderately secure to load. * Check whether configuration file is moderately secure to load.
* @param filename filename to check * @param filename filename to check
* @return 1 on success, 0 on failure * @return 1 on success, 0 on failure
* XXX FIXME: rpmRC return?
*/ */
int rpmSecuritySaneFile(const char *filename) int rpmSecuritySaneFile(const char *filename)
/*@globals internalState @*/; /*@globals internalState @*/;
/** /**
* Return URL path(s) from a (URL prefixed) pattern glob. * Return URL path(s) from a (URL prefixed) pattern glob.
* @param patterns glob pattern * @param patterns glob pattern
* @retval *argcPtr no. of paths * @retval *argcPtr no. of paths
* @retval *argvPtr array of paths (malloc'd contiguous blob) * @retval *argvPtr array of paths (malloc'd contiguous blob)
* @return 0 on success * @return 0 on success
* XXX FIXME: rpmRC return?
*/ */
int rpmGlob(const char * patterns, /*@out@*/ int * argcPtr, int rpmGlob(const char * patterns, /*@out@*/ int * argcPtr,
/*@out@*/ const char *** argvPtr) /*@out@*/ const char *** argvPtr)
/*@globals fileSystem, internalState @*/ /*@globals fileSystem, internalState @*/
/*@modifies *argcPtr, *argvPtr, fileSystem, internalState @*/; /*@modifies *argcPtr, *argvPtr, fileSystem, internalState @*/;
/** /**
* Expand macro into buffer. * Expand macro into buffer.
* @deprecated Use rpmExpand(). * @deprecated Use rpmExpand().
* @todo Eliminate from API. * @todo Eliminate from API.
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added


 rpmpgp.h   rpmpgp.h 
skipping to change at line 258 skipping to change at line 258
as defined for IETF-S/MIME) as defined for IETF-S/MIME)
100 to 110 - Private/Experimental algorithm. 100 to 110 - Private/Experimental algorithm.
\endverbatim \endverbatim
* *
* Implementations MUST implement DSA for signatures, and Elgamal for * Implementations MUST implement DSA for signatures, and Elgamal for
* encryption. Implementations SHOULD implement RSA keys. * encryption. Implementations SHOULD implement RSA keys.
* Implementations MAY implement any other algorithm. * Implementations MAY implement any other algorithm.
*/ */
/*@-typeuse@*/ /*@-typeuse@*/
typedef enum pgpPubkeyAlgo_e { typedef enum pgpPubkeyAlgo_e {
PGPPUBKEYALGO_UNKNOWN = 0,
PGPPUBKEYALGO_RSA = 1, /*!< RSA */ PGPPUBKEYALGO_RSA = 1, /*!< RSA */
PGPPUBKEYALGO_RSA_ENCRYPT = 2, /*!< RSA(Encrypt-Only) */ PGPPUBKEYALGO_RSA_ENCRYPT = 2, /*!< RSA(Encrypt-Only) */
PGPPUBKEYALGO_RSA_SIGN = 3, /*!< RSA(Sign-Only) */ PGPPUBKEYALGO_RSA_SIGN = 3, /*!< RSA(Sign-Only) */
PGPPUBKEYALGO_ELGAMAL_ENCRYPT = 16, /*!< Elgamal(Encrypt-Only) * / PGPPUBKEYALGO_ELGAMAL_ENCRYPT = 16, /*!< Elgamal(Encrypt-Only) * /
PGPPUBKEYALGO_DSA = 17, /*!< DSA */ PGPPUBKEYALGO_DSA = 17, /*!< DSA */
PGPPUBKEYALGO_EC = 18, /*!< Elliptic Curve */ PGPPUBKEYALGO_EC = 18, /*!< Elliptic Curve */
PGPPUBKEYALGO_ECDSA = 19, /*!< ECDSA */ PGPPUBKEYALGO_ECDSA = 19, /*!< ECDSA */
PGPPUBKEYALGO_ELGAMAL = 20, /*!< Elgamal */ PGPPUBKEYALGO_ELGAMAL = 20, /*!< Elgamal */
PGPPUBKEYALGO_DH = 21, /*!< Diffie-Hellman (X9.42) */ PGPPUBKEYALGO_DH = 21, /*!< Diffie-Hellman (X9.42) */
PGPPUBKEYALGO_ECDH = 22 /*!< ECC Diffie-Hellman */ PGPPUBKEYALGO_ECDH = 22 /*!< ECC Diffie-Hellman */
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 rpmtag.h   rpmtag.h 
skipping to change at line 66 skipping to change at line 66
/** \ingroup header /** \ingroup header
*/ */
typedef struct _HE_s * HE_t; /*!< tag container. */ typedef struct _HE_s * HE_t; /*!< tag container. */
/** \ingroup header /** \ingroup header
*/ */
/*@-typeuse -fielduse@*/ /*@-typeuse -fielduse@*/
#if !defined(SWIG) #if !defined(SWIG)
union rpmDataType_u { union rpmDataType_u {
/*@null@*/ /*@null@*/
void * ptr; void * ptr; /*!< must be first */
rpmuint8_t * ui8p; /*!< RPM_UINT8_TYPE | RPM_CHAR_TYPE */ rpmuint8_t * ui8p; /*!< RPM_UINT8_TYPE | RPM_CHAR_TYPE */
rpmuint16_t * ui16p; /*!< RPM_UINT16_TYPE */ rpmuint16_t * ui16p; /*!< RPM_UINT16_TYPE */
rpmuint32_t * ui32p; /*!< RPM_UINT32_TYPE */ rpmuint32_t * ui32p; /*!< RPM_UINT32_TYPE */
rpmuint64_t * ui64p; /*!< RPM_UINT64_TYPE */ rpmuint64_t * ui64p; /*!< RPM_UINT64_TYPE */
/*@relnull@*/ /*@relnull@*/
const char * str; /*!< RPM_STRING_TYPE */ const char * str; /*!< RPM_STRING_TYPE */
unsigned char * blob; /*!< RPM_BIN_TYPE */ unsigned char * blob; /*!< RPM_BIN_TYPE */
const char ** argv; /*!< RPM_STRING_ARRAY_TYPE */ const char ** argv; /*!< RPM_STRING_ARRAY_TYPE */
HE_t he; HE_t he;
}; };
skipping to change at line 135 skipping to change at line 135
typedef /*@abstract@*/ struct headerIterator_s * HeaderIterator; typedef /*@abstract@*/ struct headerIterator_s * HeaderIterator;
/** \ingroup header /** \ingroup header
*/ */
typedef /*@abstract@*/ struct headerTagIndices_s * headerTagIndices; typedef /*@abstract@*/ struct headerTagIndices_s * headerTagIndices;
/** \ingroup header /** \ingroup header
*/ */
typedef /*@abstract@*/ const struct headerSprintfExtension_s * headerSprint fExtension; typedef /*@abstract@*/ const struct headerSprintfExtension_s * headerSprint fExtension;
/**
* Pseudo-tags used by the rpmdb and rpmgi iterator API's.
*/
#define RPMDBI_PACKAGES 0 /* Installed package headers
. */
#define RPMDBI_DEPCACHE 1 /* Dependency resolution cac
he. */
/* (obsolete) RPMDBI_LABEL was 2 */
#define RPMDBI_ADDED 3 /* Added package headers. */
#define RPMDBI_REMOVED 4 /* Removed package headers.
*/
#define RPMDBI_AVAILABLE 5 /* Available package headers
. */
#define RPMDBI_HDLIST 6 /* (rpmgi) Header list. */
#define RPMDBI_ARGLIST 7 /* (rpmgi) Argument list. */
#define RPMDBI_FTSWALK 8 /* (rpmgi) File tree walk.
*/
#define RPMDBI_SEQNO 9 /* Sequence numbers. */
#define RPMDBI_BTREE 10 /* (development) Generic DB_
BTREE. */
#define RPMDBI_HASH 11 /* (development) Generic DB_
HASH. */
#define RPMDBI_QUEUE 12 /* (development) Generic DB_
QUEUE. */
#define RPMDBI_RECNO 13 /* (development) Generic DB_
RECNO. */
#define RPMDBI_HEAP 14 /* (development) Generic DB_
HEAP. */
/* 15 unused */
#define RPMDBI_REPACKAGES 16 /* Re-packaged package paths
. */
#define RPMDBI_REPOSITORY 17 /* Repository URI's. */
/** \ingroup header /** \ingroup header
* Tags identify data in package headers. * Tags identify data in package headers.
* @note tags should not have value 0! * @note tags should not have value 0!
*/ */
enum rpmTag_e { enum rpmTag_e {
RPMTAG_HEADERIMAGE = HEADER_IMAGE, /*!< internal Curren t image. */ RPMTAG_HEADERIMAGE = HEADER_IMAGE, /*!< internal Curren t image. */
RPMTAG_HEADERSIGNATURES = HEADER_SIGNATURES, /*!< internal Signat ures. */ RPMTAG_HEADERSIGNATURES = HEADER_SIGNATURES, /*!< internal Signat ures. */
RPMTAG_HEADERIMMUTABLE = HEADER_IMMUTABLE, /*!< x Original imag e. */ RPMTAG_HEADERIMMUTABLE = HEADER_IMMUTABLE, /*!< x Original imag e. */
/*@-enummemuse@*/ /*@-enummemuse@*/
skipping to change at line 201 skipping to change at line 179
#define RPMTAG_HDRID RPMTAG_SHA1HEADER /* s */ #define RPMTAG_HDRID RPMTAG_SHA1HEADER /* s */
RPMTAG_NAME = 1000, /* s */ RPMTAG_NAME = 1000, /* s */
#define RPMTAG_N RPMTAG_NAME /* s */ #define RPMTAG_N RPMTAG_NAME /* s */
RPMTAG_VERSION = 1001, /* s */ RPMTAG_VERSION = 1001, /* s */
#define RPMTAG_V RPMTAG_VERSION /* s */ #define RPMTAG_V RPMTAG_VERSION /* s */
RPMTAG_RELEASE = 1002, /* s */ RPMTAG_RELEASE = 1002, /* s */
#define RPMTAG_R RPMTAG_RELEASE /* s */ #define RPMTAG_R RPMTAG_RELEASE /* s */
RPMTAG_EPOCH = 1003, /* i */ RPMTAG_EPOCH = 1003, /* i */
#define RPMTAG_E RPMTAG_EPOCH /* i */ #define RPMTAG_E RPMTAG_EPOCH /* i */
RPMTAG_SUMMARY = 1004, /* s{} */ RPMTAG_SUMMARY = 1004, /* s */
RPMTAG_DESCRIPTION = 1005, /* s{} */ RPMTAG_DESCRIPTION = 1005, /* s */
RPMTAG_BUILDTIME = 1006, /* i */ RPMTAG_BUILDTIME = 1006, /* i */
RPMTAG_BUILDHOST = 1007, /* s */ RPMTAG_BUILDHOST = 1007, /* s */
RPMTAG_INSTALLTIME = 1008, /* i[] */ RPMTAG_INSTALLTIME = 1008, /* i[] */
RPMTAG_SIZE = 1009, /* i */ RPMTAG_SIZE = 1009, /* i */
RPMTAG_DISTRIBUTION = 1010, /* s */ RPMTAG_DISTRIBUTION = 1010, /* s */
RPMTAG_VENDOR = 1011, /* s */ RPMTAG_VENDOR = 1011, /* s */
RPMTAG_GIF = 1012, /* x */ RPMTAG_GIF = 1012, /* x */
RPMTAG_XPM = 1013, /* x */ RPMTAG_XPM = 1013, /* x */
RPMTAG_LICENSE = 1014, /* s */ RPMTAG_LICENSE = 1014, /* s */
RPMTAG_PACKAGER = 1015, /* s */ RPMTAG_PACKAGER = 1015, /* s */
RPMTAG_GROUP = 1016, /* s{} */ RPMTAG_GROUP = 1016, /* s */
/*@-enummemuse@*/ /*@-enummemuse@*/
RPMTAG_CHANGELOG = 1017, /* s[] internal */ RPMTAG_CHANGELOG = 1017, /* s[] internal */
/*@=enummemuse@*/ /*@=enummemuse@*/
RPMTAG_SOURCE = 1018, /* s[] */ RPMTAG_SOURCE = 1018, /* s[] */
RPMTAG_PATCH = 1019, /* s[] */ RPMTAG_PATCH = 1019, /* s[] */
RPMTAG_URL = 1020, /* s */ RPMTAG_URL = 1020, /* s */
RPMTAG_OS = 1021, /* s legacy used int */ RPMTAG_OS = 1021, /* s legacy used int */
RPMTAG_ARCH = 1022, /* s legacy used int */ RPMTAG_ARCH = 1022, /* s legacy used int */
RPMTAG_PREIN = 1023, /* s */ RPMTAG_PREIN = 1023, /* s */
RPMTAG_POSTIN = 1024, /* s */ RPMTAG_POSTIN = 1024, /* s */
skipping to change at line 495 skipping to change at line 473
}; };
/** \ingroup header /** \ingroup header
*/ */
typedef enum rpmTag_e rpmTag; typedef enum rpmTag_e rpmTag;
/** \ingroup header /** \ingroup header
*/ */
typedef enum rpmSigTag_e rpmSigTag; typedef enum rpmSigTag_e rpmSigTag;
/**
* Pseudo-tags used by the rpmdb and rpmgi iterator API's.
*/
#define RPMDBI_PACKAGES (rpmTag)0 /* Installed package headers
. */
#define RPMDBI_DEPCACHE (rpmTag)1 /* Dependency resolution cac
he. */
/* (obsolete) RPMDBI_LABEL was 2 */
#define RPMDBI_ADDED (rpmTag)3 /* Added package headers. */
#define RPMDBI_REMOVED (rpmTag)4 /* Removed package headers.
*/
#define RPMDBI_AVAILABLE (rpmTag)5 /* Available package headers
. */
#define RPMDBI_HDLIST (rpmTag)6 /* (rpmgi) Header list. */
#define RPMDBI_ARGLIST (rpmTag)7 /* (rpmgi) Argument list. */
#define RPMDBI_FTSWALK (rpmTag)8 /* (rpmgi) File tree walk.
*/
#define RPMDBI_SEQNO (rpmTag)9 /* Sequence numbers. */
#define RPMDBI_BTREE (rpmTag)10 /* (development) Generic DB_
BTREE. */
#define RPMDBI_HASH (rpmTag)11 /* (development) Generic DB_
HASH. */
#define RPMDBI_QUEUE (rpmTag)12 /* (development) Generic DB_
QUEUE. */
#define RPMDBI_RECNO (rpmTag)13 /* (development) Generic DB_
RECNO. */
#define RPMDBI_HEAP (rpmTag)14 /* (development) Generic DB_
HEAP. */
/* 15 unused */
#define RPMDBI_REPACKAGES (rpmTag)16 /* Re-packaged package paths
. */
#define RPMDBI_REPOSITORY (rpmTag)17 /* Repository URI's. */
/** \ingroup header /** \ingroup header
*/ */
/*@-typeuse -fielduse@*/ /*@-typeuse -fielduse@*/
#if !defined(SWIG) #if !defined(SWIG)
struct _HE_s { struct _HE_s {
rpmTag tag; rpmTag tag;
rpmTagType t; rpmTagType t;
/*@owned@*/ /*@null@*/ /*@owned@*/ /*@null@*/
rpmTagData p; rpmTagData p;
rpmTagCount c; rpmTagCount c;
skipping to change at line 908 skipping to change at line 908
/** \ingroup header /** \ingroup header
* Convert header to on-disk representation, and then reload. * Convert header to on-disk representation, and then reload.
* This is used to insure that all header data is in a single * This is used to insure that all header data is in a single
* contiguous memory allocation. * contiguous memory allocation.
* @param h header (with pointers) * @param h header (with pointers)
* @param tag region tag * @param tag region tag
* @return on-disk header (with offsets) * @return on-disk header (with offsets)
*/ */
/*@null@*/ /*@null@*/
Header headerReload(/*@only@*/ Header h, int tag) Header headerReload(/*@only@*/ Header h, rpmTag tag)
/*@globals fileSystem, internalState @*/ /*@globals fileSystem, internalState @*/
/*@modifies h, fileSystem, internalState @*/; /*@modifies h, fileSystem, internalState @*/;
/** \ingroup header /** \ingroup header
* Duplicate a header. * Duplicate a header.
* @param h header * @param h header
* @return new header instance * @return new header instance
*/ */
/*@null@*/ /*@null@*/
Header headerCopy(Header h) Header headerCopy(Header h)
skipping to change at line 951 skipping to change at line 951
/** \ingroup header /** \ingroup header
* Check if tag is in header. * Check if tag is in header.
* @param h header * @param h header
* @param tag tag * @param tag tag
* @return 1 on success, 0 on failure * @return 1 on success, 0 on failure
*/ */
int headerIsEntry(/*@null@*/ Header h, rpmTag tag) int headerIsEntry(/*@null@*/ Header h, rpmTag tag)
/*@*/; /*@*/;
#if defined(SUPPORT_I18BSTRING_TYPE)
/** \ingroup header /** \ingroup header
* Add locale specific tag to header. * Add locale specific tag to header.
* A NULL lang is interpreted as the C locale. Here are the rules: * A NULL lang is interpreted as the C locale. Here are the rules:
* \verbatim * \verbatim
* - If the tag isn't in the header, it's added with the passed string * - If the tag isn't in the header, it's added with the passed string
* as new value. * as new value.
* - If the tag occurs multiple times in entry, which tag is affected * - If the tag occurs multiple times in entry, which tag is affected
* by the operation is undefined. * by the operation is undefined.
* - If the tag is in the header w/ this language, the entry is * - If the tag is in the header w/ this language, the entry is
* *replaced* (like headerModifyEntry()). * *replaced* (like headerModifyEntry()).
skipping to change at line 974 skipping to change at line 975
* *
* @param h header * @param h header
* @param tag tag * @param tag tag
* @param string tag value * @param string tag value
* @param lang locale * @param lang locale
* @return 1 on success, 0 on failure * @return 1 on success, 0 on failure
*/ */
int headerAddI18NString(Header h, rpmTag tag, const char * string, int headerAddI18NString(Header h, rpmTag tag, const char * string,
const char * lang) const char * lang)
/*@modifies h @*/; /*@modifies h @*/;
#endif
/** \ingroup header /** \ingroup header
* Duplicate tag values from one header into another. * Duplicate tag values from one header into another.
* @param headerFrom source header * @param headerFrom source header
* @param headerTo destination header * @param headerTo destination header
* @param tagstocopy array of tags that are copied * @param tagstocopy array of tags that are copied
*/ */
void headerCopyTags(Header headerFrom, Header headerTo, rpmTag * tagstocopy ) void headerCopyTags(Header headerFrom, Header headerTo, rpmTag * tagstocopy )
/*@globals internalState @*/ /*@globals internalState @*/
/*@modifies headerTo, internalState @*/; /*@modifies headerTo, internalState @*/;
 End of changes. 8 change blocks. 
38 lines changed or deleted 40 lines changed or added


 rpmte.h   rpmte.h 
skipping to change at line 216 skipping to change at line 216
rpmts ts; /*!< transaction set. */ rpmts ts; /*!< transaction set. */
int reverse; /*!< reversed traversal? */ int reverse; /*!< reversed traversal? */
int ocsave; /*!< last returned iterator index. */ int ocsave; /*!< last returned iterator index. */
int oc; /*!< iterator index. */ int oc; /*!< iterator index. */
#if defined(__LCLINT__) #if defined(__LCLINT__)
/*@refs@*/ /*@refs@*/
int nrefs; /*!< (unused) keep splint happy */ int nrefs; /*!< (unused) keep splint happy */
#endif #endif
}; };
#ifdef __cplusplus
extern "C" {
#endif
int rpmteClose(rpmte te, rpmts ts, int reset_fi) int rpmteClose(rpmte te, rpmts ts, int reset_fi)
/*@modifies te, ts @*/; /*@modifies te, ts @*/;
Header rpmteDBHeader(rpmts ts, uint32_t rec) Header rpmteDBHeader(rpmts ts, uint32_t rec)
/*@modifies ts @*/; /*@modifies ts @*/;
Header rpmteFDHeader(rpmts ts, rpmte te) Header rpmteFDHeader(rpmts ts, rpmte te)
/*@modifies ts, te @*/; /*@modifies ts, te @*/;
int rpmteOpen(rpmte te, rpmts ts, int reload_fi) int rpmteOpen(rpmte te, rpmts ts, int reload_fi)
/*@modifies te, ts @*/; /*@modifies te, ts @*/;
/** \ingroup rpmte /** \ingroup rpmte
* Return failed status of transaction element. * Return failed status of transaction element.
* @param te transaction element * @param te transaction element
* @return 1 if transaction element (or its parents) failed * @return 1 if transaction element (or its parents) failed
*/ */
int rpmteFailed(rpmte te) int rpmteFailed(rpmte te)
/*@*/; /*@*/;
int rpmteHaveTransScript(rpmte te, rpmTag tag) int rpmteHaveTransScript(rpmte te, rpmTag tag)
/*@*/; /*@*/;
#ifdef __cplusplus
}
#endif
#endif /* _RPMTE_INTERNAL */ #endif /* _RPMTE_INTERNAL */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** \ingroup rpmte /** \ingroup rpmte
* Destroy a transaction element. * Destroy a transaction element.
* @param te transaction element * @param te transaction element
* @return NULL on last dereference * @return NULL on last dereference
 End of changes. 2 change blocks. 
0 lines changed or deleted 8 lines changed or added


 rpmts.h   rpmts.h 
skipping to change at line 1143 skipping to change at line 1143
rpmuint32_t tid = rpmtsGetTid(ts); rpmuint32_t tid = rpmtsGetTid(ts);
time_t ttid = tid; time_t ttid = tid;
rpmtsi tsi; rpmtsi tsi;
rpmte te; rpmte te;
if (fp == NULL) if (fp == NULL)
fp = stderr; fp = stderr;
fprintf(fp, _("=== Transaction at %-24.24s (0x%08x):\n"), ctime(&ttid), tid); fprintf(fp, _("=== Transaction at %-24.24s (0x%08x):\n"), ctime(&ttid), tid);
tsi = rpmtsiInit(ts); tsi = rpmtsiInit(ts);
while ((te = rpmtsiNext(tsi, 0)) != NULL) while ((te = rpmtsiNext(tsi, (rpmElementType)0)) != NULL)
fprintf(fp, "t%s> %s\n", (rpmteType(te) == TR_ADDED ? "I" : "E"), fprintf(fp, "t%s> %s\n", (rpmteType(te) == TR_ADDED ? "I" : "E"),
rpmteNEVRA(te)); rpmteNEVRA(te));
tsi = rpmtsiFree(tsi); tsi = rpmtsiFree(tsi);
return 0; return 0;
} }
#endif /* defined(_RPMTS_PRINT) */ #endif /* defined(_RPMTS_PRINT) */
#endif /* !defined(SWIG) */ #endif /* !defined(SWIG) */
#ifdef __cplusplus #ifdef __cplusplus
} }
 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,8,0,_) #define RPMLIB_VERSION RPMLIB_VERSION_ENCODE(5,4,r,9,0,_)
#define RPMLIB_TIMESTAMP RPMLIB_TIMESTAMP_ENCODE(2012,3,2,0,0) #define RPMLIB_TIMESTAMP RPMLIB_TIMESTAMP_ENCODE(2012,4,2,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


 rpmzlog.h   rpmzlog.h 
skipping to change at line 64 skipping to change at line 64
* Set up log (call from main thread before other threads launched). * Set up log (call from main thread before other threads launched).
*/ */
/*@newref@*/ /*@newref@*/
rpmzLog rpmzLogNew(/*@null@*/ struct timeval *tv) rpmzLog rpmzLogNew(/*@null@*/ struct timeval *tv)
/*@globals fileSystem, internalState @*/ /*@globals fileSystem, internalState @*/
/*@modifies fileSystem, internalState @*/; /*@modifies fileSystem, internalState @*/;
/** /**
* Add entry to trace log. * Add entry to trace log.
*/ */
void rpmzLogAdd(/*@null@*/ rpmzLog zlog, char *fmt, ...) void rpmzLogAdd(/*@null@*/ rpmzLog zlog, const char *fmt, ...)
/*@globals fileSystem, internalState @*/ /*@globals fileSystem, internalState @*/
/*@modifies zlog, fileSystem, internalState @*/; /*@modifies zlog, fileSystem, internalState @*/;
/** /**
* Release a reference to the log data. * Release a reference to the log data.
*/ */
/*@null@*/ /*@null@*/
rpmzLog rpmzLogFree(/*@killref@*/ /*@null@*/ rpmzLog zlog) rpmzLog rpmzLogFree(/*@killref@*/ /*@null@*/ rpmzLog zlog)
/*@globals fileSystem, internalState @*/ /*@globals fileSystem, internalState @*/
/*@modifies zlog, fileSystem, internalState @*/; /*@modifies zlog, fileSystem, internalState @*/;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 yarn.h   yarn.h 
skipping to change at line 114 skipping to change at line 114
yarnPrefix - a char pointer to a string that will be the prefix for any error yarnPrefix - a char pointer to a string that will be the prefix for any error
messages that these routines generate before exiting -- if not chan ged messages that these routines generate before exiting -- if not chan ged
by the application, "yarn" will be used by the application, "yarn" will be used
yarnAbort - an external function that will be executed when there is an yarnAbort - an external function that will be executed when there is an
internal yarn error, due to out of memory or misuse -- this functio n internal yarn error, due to out of memory or misuse -- this functio n
may exit to abort the application, or if it returns, the yarn error may exit to abort the application, or if it returns, the yarn error
handler will exit (set to NULL by default for no action) handler will exit (set to NULL by default for no action)
*/ */
#ifdef __cplusplus
extern "C" {
#endif
/*@unchecked@*/ /*@observer@*/ /*@unchecked@*/ /*@observer@*/
extern const char *yarnPrefix; extern const char *yarnPrefix;
/*@-redecl@*/ /*@-redecl@*/
/*@mayexit@*/ /*@mayexit@*/
extern void (*yarnAbort)(int) extern void (*yarnAbort)(int)
/*@globals internalState @*/ /*@globals internalState @*/
/*@modifies internalState @*/; /*@modifies internalState @*/;
/*@=redecl@*/ /*@=redecl@*/
/*@-globuse@*/ /*@-globuse@*/
skipping to change at line 150 skipping to change at line 154
yarnThread yarnJoin(/*@only@*/ yarnThread ally) yarnThread yarnJoin(/*@only@*/ yarnThread ally)
/*@globals fileSystem, internalState @*/ /*@globals fileSystem, internalState @*/
/*@modifies ally, fileSystem, internalState @*/; /*@modifies ally, fileSystem, internalState @*/;
int yarnJoinAll(void) int yarnJoinAll(void)
/*@globals fileSystem, internalState @*/ /*@globals fileSystem, internalState @*/
/*@modifies fileSystem, internalState @*/; /*@modifies fileSystem, internalState @*/;
void yarnDestruct(/*@only@*/ yarnThread off_course) void yarnDestruct(/*@only@*/ yarnThread off_course)
/*@globals fileSystem, internalState @*/ /*@globals fileSystem, internalState @*/
/*@modifies off_course, fileSystem, internalState @*/; /*@modifies off_course, fileSystem, internalState @*/;
typedef struct yarnLock_s * yarnLock;
yarnLock yarnNewLock(long) yarnLock yarnNewLock(long)
/*@globals fileSystem, internalState @*/ /*@globals fileSystem, internalState @*/
/*@modifies fileSystem, internalState @*/; /*@modifies fileSystem, internalState @*/;
void yarnPossess(yarnLock bolt) void yarnPossess(yarnLock bolt)
/*@globals fileSystem, internalState @*/ /*@globals fileSystem, internalState @*/
/*@modifies bolt, fileSystem, internalState @*/; /*@modifies bolt, fileSystem, internalState @*/;
void yarnRelease(yarnLock bolt) void yarnRelease(yarnLock bolt)
/*@globals fileSystem, internalState @*/ /*@globals fileSystem, internalState @*/
/*@modifies bolt, fileSystem, internalState @*/; /*@modifies bolt, fileSystem, internalState @*/;
typedef enum yarnTwistOP_e { TO, BY } yarnTwistOP; typedef enum yarnTwistOP_e { TO, BY } yarnTwistOP;
skipping to change at line 177 skipping to change at line 180
void yarnWaitFor(yarnLock bolt, yarnWaitOP op, long) void yarnWaitFor(yarnLock bolt, yarnWaitOP op, long)
/*@globals fileSystem, internalState @*/ /*@globals fileSystem, internalState @*/
/*@modifies bolt, fileSystem, internalState @*/; /*@modifies bolt, fileSystem, internalState @*/;
long yarnPeekLock(yarnLock bolt) long yarnPeekLock(yarnLock bolt)
/*@*/; /*@*/;
/*@only@*/ /*@null@*/ /*@only@*/ /*@null@*/
yarnLock yarnFreeLock(/*@only@*/ yarnLock bolt) yarnLock yarnFreeLock(/*@only@*/ yarnLock bolt)
/*@globals fileSystem, internalState @*/ /*@globals fileSystem, internalState @*/
/*@modifies bolt, fileSystem, internalState @*/; /*@modifies bolt, fileSystem, internalState @*/;
#ifdef __cplusplus
}
#endif
#endif /* _H_YARN_ */ #endif /* _H_YARN_ */
 End of changes. 3 change blocks. 
1 lines changed or deleted 8 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/