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

Style.

Browse Source
This commit is contained in:
robocop 2008-12-21 06:12:41 +00:00
parent f8af66385d
commit 78df1ae72d
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jrd/IntlUtil.cpp
View File

@ -147,8 +147,8 @@ bool IntlUtil::parseSpecificAttributes(Jrd::CharSet* cs, ULONG len, const UCHAR*
if (uSize == 2 &&
((*(USHORT*) uc >= 'A' && *(USHORT*) uc <= 'Z') ||
(*(USHORT*) uc >= 'a' && *(USHORT*) uc <= 'z') ||
*(USHORT*) uc == '-' || *(USHORT*) uc == '_'))
(*(USHORT*) uc >= 'a' && *(USHORT*) uc <= 'z') ||
*(USHORT*) uc == '-' || *(USHORT*) uc == '_'))
{
if (!readAttributeChar(cs, &p, end, &size, true))
return false;
@ -195,7 +195,7 @@ bool IntlUtil::parseSpecificAttributes(Jrd::CharSet* cs, ULONG len, const UCHAR*
if (uSize != 2 || *(USHORT*)uc != ';')
{
if (!(size == cs->getSpaceLength() &&
memcmp(p, cs->getSpace(), cs->getSpaceLength()) == 0))
memcmp(p, cs->getSpace(), cs->getSpaceLength()) == 0))
{
endNoSpace = p + size;
}
@ -649,7 +649,7 @@ bool IntlUtil::readAttributeChar(Jrd::CharSet* cs, const UCHAR** s, const UCHAR*
static void unicodeDestroy(texttype* tt)
{
delete [] const_cast<ASCII*>(tt->texttype_name);
delete[] const_cast<ASCII*>(tt->texttype_name);
delete static_cast<TextTypeImpl*>(tt->texttype_impl);
}

4
src/jrd/ini.h
View File

@ -40,9 +40,9 @@
#define NAME(name, id) id,
typedef enum nam_i { nam_MIN,
enum name_ids { nam_MIN,
#include "../jrd/names.h"
nam_MAX} name_ids;
nam_MAX};
#undef NAME

6
src/utilities/install/install.cpp
View File

@ -454,7 +454,7 @@ USHORT GetVersion(const TEXT* filename, DWORD& verMS, DWORD& verLS,
if (! GetFileVersionInfo(const_cast<TEXT*>(filename), 0, rsize, hver))
{
ULONG werr = GetLastError();
delete [] hver;
delete[] hver;
CloseHandle(hfile);
return (*err_handler) (werr, "GetFileVersionInfo()");
}
@ -465,14 +465,14 @@ USHORT GetVersion(const TEXT* filename, DWORD& verMS, DWORD& verLS,
if (! VerQueryValue(hver, "\\", (void**)&ffi, &uiUnused))
{
ULONG werr = GetLastError();
delete [] hver;
delete[] hver;
return (*err_handler) (werr, "VerQueryValue()");
}
verMS = ffi->dwFileVersionMS;
verLS = ffi->dwFileVersionLS;
delete [] hver;
delete[] hver;
return FB_SUCCESS;
}