Changeset 782 for git/branches/dmik/xdiff/xprepare.c

Timestamp:

Jun 23, 2014, 9:45:51 PM (11 years ago)

Author:

dmik

Message:

git: Merge version 2.0.0 from vendor to dmik branch.

Location:

git/branches/dmik

Files:

• . (modified) (1 prop)
• xdiff/xprepare.c (modified) (4 diffs)

git/branches/dmik/xdiff/xprepare.c ¶

@@ -182 +182 @@
                 goto abort;
 
-        if (xpp->flags & XDF_HISTOGRAM_DIFF)
+        if (XDF_DIFF_ALG(xpp->flags) == XDF_HISTOGRAM_DIFF)
                 hbits = hsize = 0;
         else {
@@ -210 +210 @@
                         recs[nrec++] = crec;
 
-                        if (!(xpp->flags & XDF_HISTOGRAM_DIFF) &&
-                                xdl_classify_record(pass, cf, rhash, hbits, crec) < 0)
+                        if ((XDF_DIFF_ALG(xpp->flags) != XDF_HISTOGRAM_DIFF) &&
+                            xdl_classify_record(pass, cf, rhash, hbits, crec) < 0)
                                 goto abort;
                 }
@@ -274 +274 @@
          * xdl_prepare_ctx().
          */
-        sample = xpp->flags & XDF_HISTOGRAM_DIFF ? XDL_GUESS_NLINES2 : XDL_GUESS_NLINES1;
+        sample = (XDF_DIFF_ALG(xpp->flags) == XDF_HISTOGRAM_DIFF
+                  ? XDL_GUESS_NLINES2 : XDL_GUESS_NLINES1);
 
         enl1 = xdl_guess_lines(mf1, sample) + 1;
         enl2 = xdl_guess_lines(mf2, sample) + 1;
 
-        if (!(xpp->flags & XDF_HISTOGRAM_DIFF) &&
-                xdl_init_classifier(&cf, enl1 + enl2 + 1, xpp->flags) < 0) {
-
-                return -1;
-        }
+        if (XDF_DIFF_ALG(xpp->flags) != XDF_HISTOGRAM_DIFF &&
+            xdl_init_classifier(&cf, enl1 + enl2 + 1, xpp->flags) < 0)
+                return -1;
 
         if (xdl_prepare_ctx(1, mf1, enl1, xpp, &cf, &xe->xdf1) < 0) {
@@ -297 +296 @@
         }
 
-        if (!(xpp->flags & XDF_PATIENCE_DIFF) &&
-                        !(xpp->flags & XDF_HISTOGRAM_DIFF) &&
-                        xdl_optimize_ctxs(&cf, &xe->xdf1, &xe->xdf2) < 0) {
+        if ((XDF_DIFF_ALG(xpp->flags) != XDF_PATIENCE_DIFF) &&
+            (XDF_DIFF_ALG(xpp->flags) != XDF_HISTOGRAM_DIFF) &&
+            xdl_optimize_ctxs(&cf, &xe->xdf1, &xe->xdf2) < 0) {
 
                 xdl_free_ctx(&xe->xdf2);