diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-02-01 17:09:49 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-02-01 17:09:49 +0000 |
| commit | abada90e3f84dc703b8ddc9efcbed8a946fadead (patch) | |
| tree | 2c6f9dccd510ea97cb927a7bd635422efaae547a /cpp/src/Freeze/Util.cpp | |
| parent | removing trace message (diff) | |
| download | ice-abada90e3f84dc703b8ddc9efcbed8a946fadead.tar.bz2 ice-abada90e3f84dc703b8ddc9efcbed8a946fadead.tar.xz ice-abada90e3f84dc703b8ddc9efcbed8a946fadead.zip | |
Expanded tabs into spaces
Diffstat (limited to 'cpp/src/Freeze/Util.cpp')
| -rw-r--r-- | cpp/src/Freeze/Util.cpp | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/cpp/src/Freeze/Util.cpp b/cpp/src/Freeze/Util.cpp index c29f3845f9e..20782bfeca4 100644 --- a/cpp/src/Freeze/Util.cpp +++ b/cpp/src/Freeze/Util.cpp @@ -16,75 +16,75 @@ using namespace std; void Freeze::handleDbException(const DbException& dx, - const char* file, int line) + const char* file, int line) { throw DatabaseException(file, line, dx.what()); } void Freeze::handleDbException(const DbException& dx, - Key& key, Dbt& dbKey, - const char* file, int line) + Key& key, Dbt& dbKey, + const char* file, int line) { bool bufferSmallException = #if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR == 2) - (dx.get_errno() == ENOMEM); + (dx.get_errno() == ENOMEM); #else (dx.get_errno() == DB_BUFFER_SMALL || dx.get_errno() == ENOMEM); -#endif - +#endif + if(bufferSmallException && (dbKey.get_size() > dbKey.get_ulen())) { - // - // Keep the old key size in case it's used as input - // - size_t oldKeySize = key.size(); + // + // Keep the old key size in case it's used as input + // + size_t oldKeySize = key.size(); - key.resize(dbKey.get_size()); - initializeOutDbt(key, dbKey); - dbKey.set_size(static_cast<u_int32_t>(oldKeySize)); + key.resize(dbKey.get_size()); + initializeOutDbt(key, dbKey); + dbKey.set_size(static_cast<u_int32_t>(oldKeySize)); } else { - handleDbException(dx, file, line); + handleDbException(dx, file, line); } } void Freeze::handleDbException(const DbException& dx, - Key& key, Dbt& dbKey, - Value& value, Dbt& dbValue, - const char* file, int line) + Key& key, Dbt& dbKey, + Value& value, Dbt& dbValue, + const char* file, int line) { bool bufferSmallException = #if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR == 2) - (dx.get_errno() == ENOMEM); + (dx.get_errno() == ENOMEM); #else (dx.get_errno() == DB_BUFFER_SMALL || dx.get_errno() == ENOMEM); -#endif +#endif - bool resized = false; + bool resized = false; if(bufferSmallException) { - if(dbKey.get_size() > dbKey.get_ulen()) - { - size_t oldKeySize = key.size(); - key.resize(dbKey.get_size()); - initializeOutDbt(key, dbKey); - dbKey.set_size(static_cast<u_int32_t>(oldKeySize)); - resized = true; - } - - if(dbValue.get_size() > dbValue.get_ulen()) - { - value.resize(dbValue.get_size()); - initializeOutDbt(value, dbValue); - resized = true; - } + if(dbKey.get_size() > dbKey.get_ulen()) + { + size_t oldKeySize = key.size(); + key.resize(dbKey.get_size()); + initializeOutDbt(key, dbKey); + dbKey.set_size(static_cast<u_int32_t>(oldKeySize)); + resized = true; + } + + if(dbValue.get_size() > dbValue.get_ulen()) + { + value.resize(dbValue.get_size()); + initializeOutDbt(value, dbValue); + resized = true; + } } if(!resized) { - handleDbException(dx, file, line); + handleDbException(dx, file, line); } } |