folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename _dbConfig and _dbiIndex structs to common foo_s style 

- No functional changes, just renaming to be in line with everything
  else (for better or worse)
This commit is contained in:
Panu Matilainen 2011-04-20 13:23:57 +03:00
parent 0f112aa9f9
commit 9ae37ce58a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/backend/db3.c
View File

@ -117,7 +117,7 @@ static int db_init(rpmdb rdb, const char * dbhome)
DB_ENV *dbenv = NULL;
int rc, xx;
int retry_open = 2;
struct _dbConfig * cfg = &rdb->cfg;
struct dbConfig_s * cfg = &rdb->cfg;
/* This is our setup, thou shall not have other setups before us */
uint32_t eflags = (DB_CREATE|DB_INIT_MPOOL|DB_INIT_CDB);

6
lib/backend/dbconfig.c
View File

@ -14,8 +14,8 @@
#include "lib/rpmdb_internal.h"
#include "debug.h"
static struct _dbiIndex staticdbi;
static struct _dbConfig staticcfg;
static struct dbiIndex_s staticdbi;
static struct dbConfig_s staticcfg;
static int db_eflags;
/** \ingroup dbi
@ -223,7 +223,7 @@ dbiIndex dbiNew(rpmdb rdb, rpmDbiTagVal rpmtag)
/* XXX FIXME: Get environment configuration out of here! */
if (rdb->db_dbenv == NULL) {
struct _dbConfig * cfg = &rdb->cfg;
struct dbConfig_s * cfg = &rdb->cfg;
*cfg = staticcfg; /* structure assignment */
/* Throw in some defaults if configuration didn't set any */
if (!cfg->db_mmapsize) cfg->db_mmapsize = 16 * 1024 * 1024;

8
lib/backend/dbi.h
View File

@ -7,9 +7,9 @@ enum rpmdbFlags {
RPMDB_FLAG_VERIFYONLY = (1 << 2),
};
typedef struct _dbiIndex * dbiIndex;
typedef struct dbiIndex_s * dbiIndex;
struct _dbConfig {
struct dbConfig_s {
int db_mmapsize; /*!< (10Mb) */
int db_cachesize; /*!< (128Kb) */
int db_verbose;
@ -45,7 +45,7 @@ struct rpmdb_s {
/* dbenv and related parameters */
void * db_dbenv; /*!< Berkeley DB_ENV handle. */
struct _dbConfig cfg;
struct dbConfig_s cfg;
int db_remove_env;
struct rpmop_s db_getops;
@ -70,7 +70,7 @@ enum dbiFlags_e {
/** \ingroup dbi
* Describes an index database (implemented on Berkeley db functionality).
*/
struct _dbiIndex {
struct dbiIndex_s {
const char * dbi_file; /*!< file component of path */
int dbi_oflags; /*!< db->open flags */