BUG: [ 1038897 ] Weird comment in DiffWrapper.cpp

  cosmetic: removing obsolete comment, improving existing comments

diff --git a/Src/DiffWrapper.cpp b/Src/DiffWrapper.cpp
index 5457b3c..44ea837 100644 (file)
--- a/Src/DiffWrapper.cpp
+++ b/Src/DiffWrapper.cpp
@@ -1142,7 +1142,12 @@ public:
 };
 
 
-/* WinMerge moved block code */
+/*
+ WinMerge moved block code
+ This is called by diffutils code, by diff_2_files routine
+ read_files earlier computed the hash chains ("equivs" file variable) and freed them,
+ but the equivs numerics are still available in each line
+*/
 extern "C" void moved_block_analysis(struct change ** pscript, struct file_data fd[])
 {
        // Hash all altered lines
@@ -1397,21 +1402,6 @@ extern "C" void moved_block_analysis(struct change ** pscript, struct file_data
 
 }
 
-/*
-read_files
- creates and destroys the hash table of lines (equivs & buckets)
-
-It is called from diff_2_files
- which subsequently builds the script chain (of blocks)
-
-So we need to (optionally) keep the hash table around after
- read_files so diff_2_files can pass it to the new
- block moved routine
-
-
-
-
-*/
 void cleanup_script(struct change ** pscript)
 {
        struct change * script = *pscript;

diff --git a/Src/readme.txt b/Src/readme.txt
index d115974..dbcfdae 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -4,6 +4,9 @@
   Src: LocationView.cpp
  PATCH: [ 1152967 ] Fix re_match_2 declaration warnings
   Src/diffutils/lib: REGEX.C
+ BUG: [ 1038897 ] Weird comment in DiffWrapper.cpp
+  cosmetic: removing obsolete comment, improving existing comments
+  Src: DiffWrapper.cpp
 
 2005-02-26 Jochen
  PATCH: [ 1152256 ] UniFile may fail to read last line