[PATCH] xdiff: optimise for no whitespace difference when ignoring whitespace.
- From
Dylan Reid <dgreid@gmail.com>
- Date
- Jul 5, 2010, 06:06 UTC
- Message-ID
- <1278310017-24299-1-git-send-email-dgreid@gmail.com>
Invert the order of the memcmp and flag check are done in xdl_recmatch, as it makes the common case (there is no whitespace difference) faster. It costs the case where lines are the same length and contain whitespace differences, but the common case is more than 20% faster.
Signed-off-by: Dylan Reid <dgreid@gmail.com> --- xdiff/xutils.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/xdiff/xutils.c b/xdiff/xutils.c index bc12f29..dc97a21 100644 --- a/xdiff/xutils.c +++ b/xdiff/xutils.c @@ -190,8 +190,10 @@ int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags) { int i1, i2; - if (!(flags & XDF_WHITESPACE_FLAGS)) - return s1 == s2 && !memcmp(l1, l2, s1); + if (s1 == s2 && !memcmp(l1, l2, s1)) + return 1; + else if (!(flags & XDF_WHITESPACE_FLAGS)) + return 0; i1 = 0; i2 = 0;
-- 1.7.1