mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-25 13:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup Operator padding

Browse source
This commit is contained in:
Schmoozerd 2012-07-20 17:38:23 +02:00
parent 9141299127
commit e32b9953a1
264 changed files with 6715 additions and 6715 deletions
Download patch file Download diff file Expand all files Collapse all files

80
src/shared/Database/DBCFileLoader.cpp
View file

@ -35,35 +35,35 @@ bool DBCFileLoader::Load(const char* filename, const char* fmt)
if (data)
{
delete [] data;
data=NULL;
data = NULL;
}
FILE* f=fopen(filename,"rb");
FILE* f = fopen(filename, "rb");
if (!f)return false;
if (fread(&header,4,1,f)!=1) // Number of records
if (fread(&header, 4, 1, f) != 1) // Number of records
return false;
EndianConvert(header);
if (header!=0x43424457)
if (header != 0x43424457)
return false; //'WDBC'
if (fread(&recordCount,4,1,f)!=1) // Number of records
if (fread(&recordCount, 4, 1, f) != 1) // Number of records
return false;
EndianConvert(recordCount);
if (fread(&fieldCount,4,1,f)!=1) // Number of fields
if (fread(&fieldCount, 4, 1, f) != 1) // Number of fields
return false;
EndianConvert(fieldCount);
if (fread(&recordSize,4,1,f)!=1) // Size of a record
if (fread(&recordSize, 4, 1, f) != 1) // Size of a record
return false;
EndianConvert(recordSize);
if (fread(&stringSize,4,1,f)!=1) // String size
if (fread(&stringSize, 4, 1, f) != 1) // String size
return false;
EndianConvert(stringSize);
@ -79,10 +79,10 @@ bool DBCFileLoader::Load(const char* filename, const char* fmt)
fieldsOffset[i] += 4;
}
data = new unsigned char[recordSize*recordCount+stringSize];
stringTable = data + recordSize*recordCount;
data = new unsigned char[recordSize * recordCount + stringSize];
stringTable = data + recordSize * recordCount;
if (fread(data,recordSize*recordCount+stringSize,1,f)!=1)
if (fread(data, recordSize * recordCount + stringSize, 1, f) != 1)
return false;
fclose(f);
@ -100,10 +100,10 @@ DBCFileLoader::~DBCFileLoader()
DBCFileLoader::Record DBCFileLoader::getRecord(size_t id)
{
assert(data);
return Record(*this, data + id*recordSize);
return Record(*this, data + id * recordSize);
}
uint32 DBCFileLoader::GetFormatRecordSize(const char* format,int32* index_pos)
uint32 DBCFileLoader::GetFormatRecordSize(const char* format, int32* index_pos)
{
uint32 recordsize = 0;
int32 i = -1;
@ -121,10 +121,10 @@ uint32 DBCFileLoader::GetFormatRecordSize(const char* format,int32* index_pos)
recordsize += sizeof(char*);
break;
case FT_SORT:
i=x;
i = x;
break;
case FT_IND:
i=x;
i = x;
recordsize += sizeof(uint32);
break;
case FT_BYTE:
@ -162,27 +162,27 @@ char* DBCFileLoader::AutoProduceData(const char* format, uint32& records, char**
*/
typedef char* ptr;
if (strlen(format)!=fieldCount)
if (strlen(format) != fieldCount)
return NULL;
//get struct size and index pos
int32 i;
uint32 recordsize=GetFormatRecordSize(format,&i);
uint32 recordsize = GetFormatRecordSize(format, &i);
if (i>=0)
if (i >= 0)
{
uint32 maxi=0;
uint32 maxi = 0;
//find max index
for (uint32 y=0; y<recordCount; y++)
for (uint32 y = 0; y < recordCount; y++)
{
uint32 ind=getRecord(y).getUInt(i);
if (ind>maxi)maxi=ind;
uint32 ind = getRecord(y).getUInt(i);
if (ind > maxi)maxi = ind;
}
++maxi;
records=maxi;
indexTable=new ptr[maxi];
memset(indexTable,0,maxi*sizeof(ptr));
records = maxi;
indexTable = new ptr[maxi];
memset(indexTable, 0, maxi * sizeof(ptr));
}
else
{
@ -190,38 +190,38 @@ char* DBCFileLoader::AutoProduceData(const char* format, uint32& records, char**
indexTable = new ptr[recordCount];
}
char* dataTable= new char[recordCount*recordsize];
char* dataTable = new char[recordCount * recordsize];
uint32 offset=0;
uint32 offset = 0;
for (uint32 y =0; y < recordCount; ++y)
for (uint32 y = 0; y < recordCount; ++y)
{
if (i >= 0)
{
indexTable[getRecord(y).getUInt(i)]=&dataTable[offset];
indexTable[getRecord(y).getUInt(i)] = &dataTable[offset];
}
else
indexTable[y]=&dataTable[offset];
indexTable[y] = &dataTable[offset];
for (uint32 x = 0; x < fieldCount; ++x)
{
switch (format[x])
{
case FT_FLOAT:
*((float*)(&dataTable[offset]))=getRecord(y).getFloat(x);
*((float*)(&dataTable[offset])) = getRecord(y).getFloat(x);
offset += sizeof(float);
break;
case FT_IND:
case FT_INT:
*((uint32*)(&dataTable[offset]))=getRecord(y).getUInt(x);
*((uint32*)(&dataTable[offset])) = getRecord(y).getUInt(x);
offset += sizeof(uint32);
break;
case FT_BYTE:
*((uint8*)(&dataTable[offset]))=getRecord(y).getUInt8(x);
*((uint8*)(&dataTable[offset])) = getRecord(y).getUInt8(x);
offset += sizeof(uint8);
break;
case FT_STRING:
*((char**)(&dataTable[offset]))=NULL; // will be replaces non-empty or "" strings in AutoProduceStrings
*((char**)(&dataTable[offset])) = NULL; // will be replaces non-empty or "" strings in AutoProduceStrings
offset += sizeof(char*);
break;
case FT_LOGIC:
@ -243,15 +243,15 @@ char* DBCFileLoader::AutoProduceData(const char* format, uint32& records, char**
char* DBCFileLoader::AutoProduceStrings(const char* format, char* dataTable)
{
if (strlen(format)!=fieldCount)
if (strlen(format) != fieldCount)
return NULL;
char* stringPool= new char[stringSize];
memcpy(stringPool,stringTable,stringSize);
char* stringPool = new char[stringSize];
memcpy(stringPool, stringTable, stringSize);
uint32 offset=0;
uint32 offset = 0;
for (uint32 y =0; y < recordCount; ++y)
for (uint32 y = 0; y < recordCount; ++y)
{
for (uint32 x = 0; x < fieldCount; ++x)
{
@ -274,7 +274,7 @@ char* DBCFileLoader::AutoProduceStrings(const char* format, char* dataTable)
if (!*slot || !** slot)
{
const char* st = getRecord(y).getString(x);
*slot=stringPool+(st-(const char*)stringTable);
*slot = stringPool + (st - (const char*)stringTable);
}
offset += sizeof(char*);
break;