diff options
Diffstat (limited to 'desktop/source/deployment/misc/db.cxx')
-rw-r--r-- | desktop/source/deployment/misc/db.cxx | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/desktop/source/deployment/misc/db.cxx b/desktop/source/deployment/misc/db.cxx index 6ba2c25bc92c..ce403181ab50 100644 --- a/desktop/source/deployment/misc/db.cxx +++ b/desktop/source/deployment/misc/db.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,8 +43,8 @@ namespace berkeleydbproxy { static void raise_error(int dberr, const char * where); static inline int check_error(int dberr, const char * where) - { - if (dberr) raise_error(dberr,where); + { + if (dberr) raise_error(dberr,where); return dberr; } } @@ -57,9 +57,9 @@ char *DbEnv::strerror(int error) { //---------------------------------------------------------------------------- -Db::Db(DbEnv* pDbenv,u_int32_t flags) +Db::Db(DbEnv* pDbenv,u_int32_t flags) : m_pDBP(0) -{ +{ db_internal::check_error( db_create(&m_pDBP,pDbenv ? pDbenv->m_pDBENV:0,flags),"Db::Db" ); } @@ -71,7 +71,7 @@ Db::~Db() // should not happen // TODO: add assert } - + } @@ -79,27 +79,27 @@ int Db::close(u_int32_t flags) { int error = m_pDBP->close(m_pDBP,flags); m_pDBP = 0; - return db_internal::check_error(error,"Db::close"); + return db_internal::check_error(error,"Db::close"); } -int Db::open(DB_TXN *txnid, +int Db::open(DB_TXN *txnid, const char *file, - const char *database, - DBTYPE type, - u_int32_t flags, + const char *database, + DBTYPE type, + u_int32_t flags, int mode) { int err = m_pDBP->open(m_pDBP,txnid,file,database,type,flags,mode); return db_internal::check_error( err,"Db::open" ); } - + int Db::get(DB_TXN *txnid, Dbt *key, Dbt *data, u_int32_t flags) { int err = m_pDBP->get(m_pDBP,txnid,key,data,flags); // these are non-exceptional outcomes - if (err != DB_NOTFOUND && err != DB_KEYEMPTY) + if (err != DB_NOTFOUND && err != DB_KEYEMPTY) db_internal::check_error( err,"Db::get" ); return err; @@ -118,7 +118,7 @@ int Db::cursor(DB_TXN *txnid, Dbc **cursorp, u_int32_t flags) { DBC * dbc = 0; int error = m_pDBP->cursor(m_pDBP,txnid,&dbc,flags); - + if (!db_internal::check_error(error,"Db::cursor")) *cursorp = new Dbc(dbc); @@ -132,7 +132,7 @@ int Db::sync(u_int32_t flags) { int err; DB *db = m_pDBP; - + if (!db) { db_internal::check_error(EINVAL,"Db::sync"); return (EINVAL); @@ -148,7 +148,7 @@ int Db::del(Dbt *key, u_int32_t flags) { DB *db = m_pDBP; int err; - + if ((err = db->del(db, 0, key, flags)) != 0) { // DB_NOTFOUND is a "normal" return, so should not be // thrown as an error @@ -168,7 +168,7 @@ Dbc::Dbc(DBC * dbc) { } -Dbc::~Dbc() +Dbc::~Dbc() { } @@ -184,16 +184,16 @@ int Dbc::get(Dbt *key, Dbt *data, u_int32_t flags) int err = m_pDBC->c_get(m_pDBC,key,data,flags); // these are non-exceptional outcomes - if (err != DB_NOTFOUND && err != DB_KEYEMPTY) + if (err != DB_NOTFOUND && err != DB_KEYEMPTY) db_internal::check_error( err, "Dbcursor::get" ); - + return err; } //---------------------------------------------------------------------------- Dbt::Dbt() -{ +{ using namespace std; DBT * thispod = this; memset(thispod, 0, sizeof *thispod); @@ -219,7 +219,7 @@ Dbt::Dbt(const Dbt & other) Dbt& Dbt::operator = (const Dbt & other) { - if (this != &other) + if (this != &other) { using namespace std; const DBT *otherpod = &other; @@ -229,12 +229,12 @@ Dbt& Dbt::operator = (const Dbt & other) return *this; } -Dbt::~Dbt() +Dbt::~Dbt() { } void * Dbt::get_data() const -{ +{ return this->data; } @@ -244,23 +244,23 @@ void Dbt::set_data(void *value) } u_int32_t Dbt::get_size() const -{ +{ return this->size; } void Dbt::set_size(u_int32_t value) { - this->size = value; + this->size = value; } //---------------------------------------------------------------------------- void db_internal::raise_error(int dberr, const char * where) { if (!where) where = "<unknown>"; - + const char * dberrmsg = db_strerror(dberr); if (!dberrmsg || !*dberrmsg) dberrmsg = "<unknown DB error>"; - + rtl::OString msg = where; msg += ": "; msg += dberrmsg; |