[Winmerge-svn] SF.net SVN: winmerge:[6932] trunk/Src/CompareEngines
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
Menu
▾
▴
[Winmerge-svn] SF.net SVN: winmerge:[6932] trunk/Src/CompareEngines
|
From: <ki...@us...> - 2009-07-26 14:04:38
|
Revision: 6932
http://winmerge.svn.sourceforge.net/winmerge/?rev=6932&view=rev
Author: kimmov
Date: 2009-07-26 14:04:31 +0000 (Sun, 26 Jul 2009)
Log Message:
-----------
Astyle formatting.
Modified Paths:
--------------
trunk/Src/CompareEngines/ByteComparator.cpp
trunk/Src/CompareEngines/ByteComparator.h
trunk/Src/CompareEngines/ByteCompare.cpp
trunk/Src/CompareEngines/ByteCompare.h
trunk/Src/CompareEngines/DiffUtils.cpp
trunk/Src/CompareEngines/DiffUtils.h
trunk/Src/CompareEngines/TimeSizeCompare.cpp
trunk/Src/CompareEngines/TimeSizeCompare.h
Modified: trunk/Src/CompareEngines/ByteComparator.cpp
===================================================================
--- trunk/Src/CompareEngines/ByteComparator.cpp 2009-07-26 14:03:45 UTC (rev 6931)
+++ trunk/Src/CompareEngines/ByteComparator.cpp 2009-07-26 14:04:31 UTC (rev 6932)
@@ -1,4 +1,4 @@
-/**
+/**
* @file ByteComparator.cpp
*
* @brief Implements ByteComparator class.
@@ -27,7 +27,7 @@
*/
static inline bool iseolch(TCHAR ch)
{
- return ch=='\n' || ch=='\r';
+ return ch == '\n' || ch == '\r';
}
/**
@@ -38,7 +38,7 @@
*/
static inline bool iswsch(TCHAR ch)
{
- return ch==' ' || ch=='\t';
+ return ch == ' ' || ch == '\t';
}
/**
@@ -53,7 +53,7 @@
* @param [in] offset Byte offset in whole file (among several buffers).
*/
static void TextScan(FileTextStats & stats, LPCSTR ptr, LPCSTR end, bool eof,
- bool crflag, __int64 offset)
+ bool crflag, __int64 offset)
{
LPCSTR start = ptr; // remember for recording zero-byte offsets
@@ -70,7 +70,7 @@
++stats.ncrs;
}
}
- for ( ; ptr < end; ++ptr)
+ for (; ptr < end; ++ptr)
{
char ch = *ptr;
if (ch == 0)
@@ -83,7 +83,7 @@
}
else if (ch == '\r')
{
- if (ptr+1 < end)
+ if (ptr + 1 < end)
{
if (ptr[1] == '\n')
{
@@ -122,17 +122,17 @@
*/
ByteComparator::ByteComparator(const QuickCompareOptions * options)
// settings
-: m_ignore_case(options->m_bIgnoreCase)
-, m_ignore_eol_diff(options->m_bIgnoreEOLDifference)
-, m_ignore_blank_lines(options->m_bIgnoreBlankLines)
+ : m_ignore_case(options->m_bIgnoreCase)
+ , m_ignore_eol_diff(options->m_bIgnoreEOLDifference)
+ , m_ignore_blank_lines(options->m_bIgnoreBlankLines)
// state
-, m_wsflag(false)
-, m_eol0(false)
-, m_eol1(false)
-, m_cr0(false)
-, m_cr1(false)
-, m_bol0(true)
-, m_bol1(true)
+ , m_wsflag(false)
+ , m_eol0(false)
+ , m_eol1(false)
+ , m_cr0(false)
+ , m_cr1(false)
+ , m_bol0(true)
+ , m_bol1(true)
{
if (options->m_ignoreWhitespace == WHITESPACE_IGNORE_CHANGE)
m_ignore_space_change = true;
@@ -186,16 +186,16 @@
// skip over all whitespace
while (ptr0 < end0 && iswsch(*ptr0))
{
- m_bol0=false;
+ m_bol0 = false;
++ptr0;
}
// skip over all whitespace
while (ptr1 < end1 && iswsch(*ptr1))
{
- m_bol1=false;
+ m_bol1 = false;
++ptr1;
}
- if ( (ptr0 == end0 && !eof0) || (ptr1 == end1 && !eof1) )
+ if ((ptr0 == end0 && !eof0) || (ptr1 == end1 && !eof1))
{
goto need_more;
}
@@ -203,9 +203,9 @@
if (m_ignore_space_change)
{
// Skip over whitespace change
- // Also skip whitespace on one side if
+ // Also skip whitespace on one side if
// either end of line or end of file on other
-
+
// Handle case of whitespace on side0
// (First four cases)
if (ptr0 < end0 && iswsch(*ptr0))
@@ -218,16 +218,16 @@
{
// whitespace on both sides
m_wsflag = true;
- m_bol0=false;
+ m_bol0 = false;
++ptr0;
- m_bol1=false;
+ m_bol1 = false;
++ptr1;
}
else if (iseolch(*ptr1))
{
// whitespace on side 0 (end of line on side 1)
m_wsflag = true;
- m_bol0=false;
+ m_bol0 = false;
++ptr0;
}
}
@@ -243,7 +243,7 @@
{
// Whitespace on side0, eof on side1
m_wsflag = true;
- m_bol0=false;
+ m_bol0 = false;
++ptr0;
}
}
@@ -268,7 +268,7 @@
{
// whitespace on side 1 (eol on side 0)
m_wsflag = true;
- m_bol1=false;
+ m_bol1 = false;
++ptr1;
}
}
@@ -284,7 +284,7 @@
{
// Whitespace on side1, eof on side0
m_wsflag = true;
- m_bol1=false;
+ m_bol1 = false;
++ptr1;
}
}
@@ -296,16 +296,16 @@
// skip over consecutive whitespace
while (ptr0 < end0 && iswsch(*ptr0))
{
- m_bol0=false;
+ m_bol0 = false;
++ptr0;
}
// skip over consecutive whitespace
while (ptr1 < end1 && iswsch(*ptr1))
{
- m_bol1=false;
+ m_bol1 = false;
++ptr1;
}
- if ( (ptr0 == end0 && !eof0) || (ptr1 == end1 && !eof1) )
+ if ((ptr0 == end0 && !eof0) || (ptr1 == end1 && !eof1))
{
// if run out of buffer on either side
// must fetch more, to continue skipping whitespace
@@ -330,7 +330,7 @@
// m_bol1 not used because m_ignore_eol_diff
++ptr1;
}
- if ( (ptr0 == end0 && !eof0) || (ptr1 == end1 && !eof1) )
+ if ((ptr0 == end0 && !eof0) || (ptr1 == end1 && !eof1))
{
goto need_more;
}
@@ -342,7 +342,7 @@
if (m_cr0 || m_cr1)
{
- // these flags mean possible split CR/LF
+ // these flags mean possible split CR/LF
goto need_more;
}
if (m_eol0 || m_eol1)
@@ -376,16 +376,16 @@
++ptr1;
}
}
- if ( (ptr0 == end0 && !eof0) || (ptr1 == end1 && !eof1) )
+ if ((ptr0 == end0 && !eof0) || (ptr1 == end1 && !eof1))
{
goto need_more;
}
}
}
- if ( ptr0 == end0 || ptr1 == end1)
+ if (ptr0 == end0 || ptr1 == end1)
{
- if ( ptr0 == end0 && ptr1 == end1)
+ if (ptr0 == end0 && ptr1 == end1)
{
if (!eof0 || !eof1)
goto need_more;
@@ -431,7 +431,7 @@
else
return NEED_MORE_0;
}
- else if(ptr1 == end1 && !eof1)
+ else if (ptr1 == end1 && !eof1)
{
return NEED_MORE_1;
}
Modified: trunk/Src/CompareEngines/ByteComparator.h
===================================================================
--- trunk/Src/CompareEngines/ByteComparator.h 2009-07-26 14:03:45 UTC (rev 6931)
+++ trunk/Src/CompareEngines/ByteComparator.h 2009-07-26 14:04:31 UTC (rev 6932)
@@ -1,4 +1,4 @@
-/**
+/**
* @file ByteComparator.h
*
* @brief Declaration file for ByteComparator class.
@@ -41,8 +41,8 @@
} COMP_RESULT;
COMP_RESULT CompareBuffers(FileTextStats & stats0, FileTextStats & stats1,
- const char* &ptr0, const char* &ptr1, const char* end0, const char* end1,
- bool eof0, bool eof1, __int64 offset0, __int64 offset1);
+ const char* &ptr0, const char* &ptr1, const char* end0, const char* end1,
+ bool eof0, bool eof1, __int64 offset0, __int64 offset1);
protected:
void HandleSide0Eol(char **ptr, const char *end, bool eof);
Modified: trunk/Src/CompareEngines/ByteCompare.cpp
===================================================================
--- trunk/Src/CompareEngines/ByteCompare.cpp 2009-07-26 14:03:45 UTC (rev 6931)
+++ trunk/Src/CompareEngines/ByteCompare.cpp 2009-07-26 14:04:31 UTC (rev 6932)
@@ -1,4 +1,4 @@
-/**
+/**
* @file ByteCompare.cpp
*
* @brief Implementation file for ByteCompare
@@ -31,9 +31,9 @@
* @brief Default constructor.
*/
ByteCompare::ByteCompare()
-: m_pOptions(NULL)
-, m_piAbortable(NULL)
-, m_inf(NULL)
+ : m_pOptions(NULL)
+ , m_piAbortable(NULL)
+ , m_inf(NULL)
{
}
@@ -102,7 +102,7 @@
}
-/**
+/**
* @brief Compare two specified files, byte-by-byte
* @param [in] bStopAfterFirstDiff Stop compare after we find first difference?
* @param [in] piAbortable Interface allowing to abort compare
@@ -127,7 +127,7 @@
bool eof[2]; // if we've finished file
// initialize our buffer pointers and end of file flags
- for (i=0; i<2; ++i)
+ for (i = 0; i < 2; ++i)
{
bfstart[i] = bfend[i] = 0;
eof[i] = false;
@@ -146,13 +146,13 @@
return DIFFCODE::CMPABORT;
// load or update buffers as appropriate
- for (i=0; i<2; ++i)
+ for (i = 0; i < 2; ++i)
{
- if (!eof[i] && bfstart[i]==countof(buff[i]))
+ if (!eof[i] && bfstart[i] == countof(buff[i]))
{
bfstart[i] = bfend[i] = 0;
}
- if (!eof[i] && bfend[i]<countof(buff[i])-1)
+ if (!eof[i] && bfend[i] < countof(buff[i]) - 1)
{
// Assume our blocks are in range of int
int space = RTL_NUMBER_OF(buff[i]) - (int) bfend[i];
@@ -186,7 +186,7 @@
// are these two buffers the same?
result = comparator.CompareBuffers(m_textStats[0], m_textStats[1],
- ptr0, ptr1, end0, end1, eof[0], eof[1], offset0, offset1);
+ ptr0, ptr1, end0, end1, eof[0], eof[1], offset0, offset1);
if (result == ByteComparator::RESULT_DIFF)
{
if (m_pOptions->m_bStopAfterFirstDiff)
@@ -212,7 +212,7 @@
const int m = (int)(ptr0 - &buff[0][0]);
const int l = (int)(end0 - ptr0);
//move uncompared data to begin of buff0
- memcpy( &buff[0][0], &buff[0][m], l );
+ memcpy(&buff[0][0], &buff[0][m], l);
bfstart[0] = 0;
bfstart[1] = ptr1 - orig1;
bfend[0] = l;
@@ -222,9 +222,9 @@
const int m = (int)(ptr1 - &buff[1][0]);
const int l = (int)(end1 - ptr1);
//move uncompared data to begin of buff1
- memcpy( &buff[1][0], &buff[1][m], l );
- bfstart[1]=0;
- bfstart[0]=ptr0 - orig0;
+ memcpy(&buff[1][0], &buff[1][m], l);
+ bfstart[1] = 0;
+ bfstart[0] = ptr0 - orig0;
bfend[1] = l;
}
else if (result == ByteComparator::NEED_MORE_BOTH)
@@ -243,7 +243,7 @@
const int m = (int)(ptr0 - orig0);
const int l = (int)(end0 - ptr0);
//move uncompared data to begin of buff0
- memcpy( &buff[0][0], &buff[0][m], l );
+ memcpy(&buff[0][0], &buff[0][m], l);
bfstart[0] = 0;
bfend[0] = l;
}
@@ -252,7 +252,7 @@
const int m = (int)(ptr1 - orig1);
const int l = (int)(end1 - ptr1);
//move uncompared data to begin of buff1
- memcpy( &buff[1][0], &buff[1][ m], l );
+ memcpy(&buff[1][0], &buff[1][ m], l);
bfstart[1] = 0;
bfend[1] = l;
}
@@ -264,8 +264,8 @@
// then the result is reliable.
if (eof[0] && eof[1])
{
- BOOL bBin0 = (m_textStats[0].nzeros>0);
- BOOL bBin1 = (m_textStats[1].nzeros>0);
+ BOOL bBin0 = (m_textStats[0].nzeros > 0);
+ BOOL bBin1 = (m_textStats[1].nzeros > 0);
if (bBin0 && bBin1)
diffcode |= DIFFCODE::BIN;
Modified: trunk/Src/CompareEngines/ByteCompare.h
===================================================================
--- trunk/Src/CompareEngines/ByteCompare.h 2009-07-26 14:03:45 UTC (rev 6931)
+++ trunk/Src/CompareEngines/ByteCompare.h 2009-07-26 14:04:31 UTC (rev 6932)
@@ -1,4 +1,4 @@
-/**
+/**
* @file ByteCompare.h
*
* @brief Declaration file for ByteCompare
Modified: trunk/Src/CompareEngines/DiffUtils.cpp
===================================================================
--- trunk/Src/CompareEngines/DiffUtils.cpp 2009-07-26 14:03:45 UTC (rev 6931)
+++ trunk/Src/CompareEngines/DiffUtils.cpp 2009-07-26 14:04:31 UTC (rev 6932)
@@ -1,4 +1,4 @@
-/**
+/**
* @file DiffUtils.cpp
*
* @brief Implementation file for DiffUtils class.
@@ -22,9 +22,9 @@
* @brief Default constructor.
*/
DiffUtils::DiffUtils()
- : m_pOptions(NULL)
- , m_pFilterList(NULL)
- , m_inf(NULL)
+ : m_pOptions(NULL)
+ , m_pFilterList(NULL)
+ , m_inf(NULL)
{
}
@@ -120,14 +120,14 @@
if (script && m_pFilterList && m_pFilterList->HasRegExps())
{
struct change *next = script;
- struct change *thisob=0, *end=0;
-
+ struct change *thisob = 0, *end = 0;
+
while (next)
{
/* Find a set of changes that belong together. */
thisob = next;
end = find_change(next);
-
+
/* Disconnect them from the rest of the changes,
making them a hunk, and remember the rest for next iteration. */
next = end->link;
@@ -136,21 +136,21 @@
debug_script(thisob);
#endif
- {
+ {
/* Determine range of line numbers involved in each file. */
- int first0=0, last0=0, first1=0, last1=0, deletes=0, inserts=0;
- analyze_hunk (thisob, &first0, &last0, &first1, &last1, &deletes, &inserts);
+ int first0 = 0, last0 = 0, first1 = 0, last1 = 0, deletes = 0, inserts = 0;
+ analyze_hunk(thisob, &first0, &last0, &first1, &last1, &deletes, &inserts);
if (deletes || inserts || thisob->trivial)
{
/* Print the lines that the first file has. */
- int trans_a0=0, trans_b0=0, trans_a1=0, trans_b1=0;
+ int trans_a0 = 0, trans_b0 = 0, trans_a1 = 0, trans_b1 = 0;
translate_range(&m_inf[0], first0, last0, &trans_a0, &trans_b0);
translate_range(&m_inf[1], first1, last1, &trans_a1, &trans_b1);
//Determine quantity of lines in this block for both sides
int QtyLinesLeft = (trans_b0 - trans_a0);
int QtyLinesRight = (trans_b1 - trans_a1);
-
+
// Match lines against regular expression filters
// Our strategy is that every line in both sides must
// match regexp before we mark difference as ignored.
@@ -172,7 +172,7 @@
// Free change script (which we don't want)
if (script != NULL)
{
- struct change *p,*e;
+ struct change *p, *e;
for (e = script; e; e = p)
{
if (!e->trivial)
@@ -180,7 +180,7 @@
else
++m_ntrivialdiffs;
p = e->link;
- free (e);
+ free(e);
}
if (m_ndiffs > 0)
code = code & ~DIFFCODE::SAME | DIFFCODE::DIFF;
@@ -196,11 +196,14 @@
code = code & ~DIFFCODE::TEXT;
switch (bin_file)
{
- case BINFILE_SIDE1: code |= DIFFCODE::BINSIDE1;
+ case BINFILE_SIDE1:
+ code |= DIFFCODE::BINSIDE1;
break;
- case BINFILE_SIDE2: code |= DIFFCODE::BINSIDE2;
+ case BINFILE_SIDE2:
+ code |= DIFFCODE::BINSIDE2;
break;
- case BINFILE_SIDE1 | BINFILE_SIDE2: code |= DIFFCODE::BIN;
+ case BINFILE_SIDE1 | BINFILE_SIDE2:
+ code |= DIFFCODE::BIN;
break;
default:
_RPTF1(_CRT_ERROR, "Invalid bin_file value: %d", bin_file);
@@ -231,9 +234,9 @@
bool DiffUtils::RegExpFilter(int StartPos, int EndPos, int FileNo)
{
if (m_pFilterList == NULL)
- {
+ {
_RPTF0(_CRT_ERROR, "DiffUtils::RegExpFilter() called when "
- "filterlist doesn't exist (=NULL)");
+ "filterlist doesn't exist (=NULL)");
return false;
}
@@ -276,14 +279,14 @@
* @return TRUE when compare succeeds, FALSE if error happened during compare.
*/
bool DiffUtils::Diff2Files(struct change ** diffs, int depth,
- int * bin_status, bool bMovedBlocks, int * bin_file)
+ int * bin_status, bool bMovedBlocks, int * bin_file)
{
bool bRet = true;
__try
{
- *diffs = diff_2_files (m_inf, depth, bin_status, bMovedBlocks, bin_file);
+ *diffs = diff_2_files(m_inf, depth, bin_status, bMovedBlocks, bin_file);
}
- __except (EXCEPTION_EXECUTE_HANDLER)
+ __except(EXCEPTION_EXECUTE_HANDLER)
{
*diffs = NULL;
bRet = false;
Modified: trunk/Src/CompareEngines/DiffUtils.h
===================================================================
--- trunk/Src/CompareEngines/DiffUtils.h 2009-07-26 14:03:45 UTC (rev 6931)
+++ trunk/Src/CompareEngines/DiffUtils.h 2009-07-26 14:04:31 UTC (rev 6932)
@@ -1,4 +1,4 @@
-/**
+/**
* @file DiffUtils.h
*
* @brief Declaration of DiffUtils class.
@@ -41,7 +41,7 @@
void GetDiffCounts(int & diffs, int & trivialDiffs);
void GetTextStats(int side, FileTextStats *stats);
bool Diff2Files(struct change ** diffs, int depth,
- int * bin_status, bool bMovedBlocks, int * bin_file);
+ int * bin_status, bool bMovedBlocks, int * bin_file);
void SetCodepage(int codepage) { m_codepage = codepage; }
protected:
Modified: trunk/Src/CompareEngines/TimeSizeCompare.cpp
===================================================================
--- trunk/Src/CompareEngines/TimeSizeCompare.cpp 2009-07-26 14:03:45 UTC (rev 6931)
+++ trunk/Src/CompareEngines/TimeSizeCompare.cpp 2009-07-26 14:04:31 UTC (rev 6932)
@@ -1,4 +1,4 @@
-/**
+/**
* @file TimeSizeCompare.cpp
*
* @brief Implementation file for TimeSizeCompare
@@ -15,7 +15,7 @@
{
TimeSizeCompare::TimeSizeCompare()
-: m_ignoreSmallDiff(false)
+ : m_ignoreSmallDiff(false)
{
}
@@ -32,7 +32,7 @@
m_ignoreSmallDiff = ignoreSmallDiff;
}
-/**
+/**
* @brief Compare two specified files, byte-by-byte
* @param [in] compMethod Compare method used.
* @param [in] di Diffitem info.
@@ -70,7 +70,7 @@
else
code = DIFFCODE::CMPERR;
}
-
+
// This is actual CMP_DATE_SIZE method..
// If file sizes differ mark them different
if (compMethod == CMP_DATE_SIZE)
Modified: trunk/Src/CompareEngines/TimeSizeCompare.h
===================================================================
--- trunk/Src/CompareEngines/TimeSizeCompare.h 2009-07-26 14:03:45 UTC (rev 6931)
+++ trunk/Src/CompareEngines/TimeSizeCompare.h 2009-07-26 14:04:31 UTC (rev 6932)
@@ -1,4 +1,4 @@
-/**
+/**
* @file TimeSizeCompare.h
*
* @brief Declaration file for TimeSizeCompare compare engine.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|