firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 14:03:07 +01:00
Code Issues

Misc

Browse Source
This commit is contained in:
asfernandes 2009-02-11 01:32:09 +00:00
parent 1bb0e9db9b
commit 7ba3e7d0e5
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/classes/objects_array.h
View File

@ -376,7 +376,7 @@ namespace Firebird
{
private:
Array<Value, Storage> values;
SortedArray <Value*, InlineStorage<Value*, 8>, const Key*, KeyOfValue, Cmp> pointers;
SortedArray<Value*, InlineStorage<Value*, 8>, const Key*, KeyOfValue, Cmp> pointers;
void checkPointers(const Value* oldBegin)
{
@ -607,6 +607,7 @@ namespace Firebird
fb_assert(values.getCount() == pointers.getCount());
return values.getCount();
}
size_t getCapacity() const
{
return values.getCapacity();
@ -618,11 +619,11 @@ namespace Firebird
values.clear();
}
PointersArray& operator=(const PointersArray& L)
PointersArray& operator=(const PointersArray& o)
{
values = L.values;
pointers = L.pointers;
checkPointers(L.values.begin());
values = o.values;
pointers = o.pointers;
checkPointers(o.values.begin());
return *this;
}

2
src/jrd/btr.cpp
View File

@ -2926,7 +2926,7 @@ static CONTENTS delete_node(thread_db* tdbb, WIN *window, UCHAR *pointer)
IndexJumpInfo jumpInfo;
pointer = BTreeNode::getPointerFirstNode(page, &jumpInfo);
// We going to rebuild jump nodes. In the end of this process we will either have
// We are going to rebuild jump nodes. In the end of this process we will either have
// the same jump nodes as before or one jump node less. jumpInfo.firstNodeOffset
// by its definition is a good upper estimate for summary size of all existing
// jump nodes data length's.

8
src/jrd/extds/ExtDS.cpp
View File

@ -1220,13 +1220,13 @@ void Statement::doSetInParams(thread_db* tdbb, int count, const string* const* n
jrd_nod** jrdVar = params;
GenericMap<Pair<NonPooled<jrd_nod*, dsc*> > > paramDescs(getPool());
const jrd_req *request = tdbb->getRequest();
const jrd_req* request = tdbb->getRequest();
for (int i = 0; i < count; i++, jrdVar++)
{
dsc *src = NULL;
dsc &dst = m_inDescs[i * 2];
dsc &null = m_inDescs[i * 2 + 1];
dsc* src = NULL;
dsc& dst = m_inDescs[i * 2];
dsc& null = m_inDescs[i * 2 + 1];
if (!paramDescs.get(*jrdVar, src))
{

2
src/jrd/os/win32/config_root.cpp
View File

@ -74,7 +74,7 @@ bool getBinFromHInstance(PathName& root)
return false;
}
char *filename = root.getBuffer(MAX_PATH);
char* filename = root.getBuffer(MAX_PATH);
GetModuleFileName(hDllInst, filename, MAX_PATH);
root.recalculate_length();

4
src/jrd/trace/TraceConfigStorage.cpp
View File

@ -58,7 +58,7 @@ using namespace Firebird;
namespace Jrd {
void checkFileError(const char *filename, const char* operation, ISC_STATUS iscError)
void checkFileError(const char* filename, const char* operation, ISC_STATUS iscError)
{
if (errno == 0)
return;
@ -66,7 +66,7 @@ void checkFileError(const char *filename, const char* operation, ISC_STATUS iscE
#ifdef WIN_NT
// we can't use SYS_ERR(errno) on Windows as errno codes is not
// the same as GetLastError() codes
const char *strErr = strerror(errno);
const char* strErr = strerror(errno);
ERR_post(Arg::Gds(isc_io_error) << Arg::Str(operation) << Arg::Str(filename) <<
Arg::Gds(iscError) << Arg::Str(strErr));