xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits

ramsay-jones · gitster · commit 5cd6978a9cfe · 2016-03-04T15:51:06.000-08:00
Commit 307ab20 ("xdiff: PATIENCE/HISTOGRAM are not independent option bits", 19-02-2012) introduced the XDF_DIFF_ALG() macro to access the flag bits used to represent the diff algorithm requested. In addition, code which had used explicit manipulation of the flag bits was changed to use the macros. However, one example of direct manipulation remains. Update this code to use the XDF_DIFF_ALG() macro. Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c
@@ -304,7 +304,7 @@ int xdl_prepare_env(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
 		return -1;
 	}
 
-	if (!(xpp->flags & XDF_HISTOGRAM_DIFF))
+	if (XDF_DIFF_ALG(xpp->flags) != XDF_HISTOGRAM_DIFF)
 		xdl_free_classifier(&cf);
 
 	return 0;

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ int xdl_prepare_env(mmfile_t mf1, mmfile_t mf2, xpparam_t const *xpp,`
`304`	`304`	`return -1;`
`305`	`305`	`}`
`306`	`306`
`307`		`- if (!(xpp->flags & XDF_HISTOGRAM_DIFF))`
	`307`	`+ if (XDF_DIFF_ALG(xpp->flags) != XDF_HISTOGRAM_DIFF)`
`308`	`308`	`xdl_free_classifier(&cf);`
`309`	`309`
`310`	`310`	`return 0;`