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
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/