Cleanup and applying code style to some Database files.

--HG--
branch : trunk

1 files changed, 25 insertions, 21 deletions

diff --git a/src/shared/Database/DBCFileLoader.cpp b/src/shared/Database/DBCFileLoader.cpp
index 3ec0c1cb7d4..bad87a36fce 100644
--- a/src/shared/Database/DBCFileLoader.cpp
+++ b/src/shared/Database/DBCFileLoader.cpp
@@ -32,40 +32,41 @@ DBCFileLoader::DBCFileLoader()
 
 bool DBCFileLoader::Load(const char *filename, const char *fmt)
 {
-
     uint32 header;
-    if(data)
+    if (data)
     {
         delete [] data;
-        data=NULL;
+        data = NULL;
     }
 
-    FILE * f=fopen(filename,"rb");
-    if(!f)return false;
+    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)
-        return false;                                       //'WDBC'
 
-    if(fread(&recordCount,4,1,f)!=1)                        // Number of records
+    if (header!=0x43424457)
+        return false;                                        //'WDBC'
+
+    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);
@@ -84,18 +85,20 @@ bool DBCFileLoader::Load(const char *filename, const char *fmt)
     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);
+
     return true;
 }
 
 DBCFileLoader::~DBCFileLoader()
 {
-    if(data)
+    if (data)
         delete [] data;
-    if(fieldsOffset)
+
+    if (fieldsOffset)
         delete [] fieldsOffset;
 }
 
@@ -110,6 +113,7 @@ uint32 DBCFileLoader::GetFormatRecordSize(const char * format,int32* index_pos)
     uint32 recordsize = 0;
     int32 i = -1;
     for (uint32 x=0; format[x]; ++x)
+    {
         switch(format[x])
         {
             case FT_FLOAT:
@@ -130,8 +134,9 @@ uint32 DBCFileLoader::GetFormatRecordSize(const char * format,int32* index_pos)
                 recordsize += 1;
                 break;
         }
+    }
 
-    if(index_pos)
+    if (index_pos)
         *index_pos = i;
 
     return recordsize;
@@ -151,14 +156,14 @@ 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);
 
-    if(i>=0)
+    if (i>=0)
     {
         uint32 maxi=0;
         //find max index
@@ -190,9 +195,7 @@ char* DBCFileLoader::AutoProduceData(const char* format, uint32& records, char**
     for (uint32 y =0; y<recordCount; ++y)
     {
         if(i>=0)
-        {
             indexTable[getRecord(y).getUInt(i)]=&dataTable[offset];
-        }
         else
             indexTable[y]=&dataTable[offset];
 
@@ -220,6 +223,7 @@ char* DBCFileLoader::AutoProduceData(const char* format, uint32& records, char**
             }
         }
     }
+
     sqlDataTable = dataTable + offset;
 
     return dataTable;
@@ -227,7 +231,7 @@ 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];