From: Ramsay Jones Date: Fri, 4 Mar 2016 23:09:36 +0000 (+0000) Subject: xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits X-Git-Tag: v2.8.2~17^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5cd6978a9cfef58de061a9525f3678ade479564d;p=thirdparty%2Fgit.git xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits Commit 307ab20b3 ("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 Signed-off-by: Junio C Hamano --- diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c index 63a22c630e..5ffcf996f0 100644 --- 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;