diff options
author | Edward Thomson <ethomson@edwardthomson.com> | 2023-05-11 21:44:17 +0100 |
---|---|---|
committer | Edward Thomson <ethomson@edwardthomson.com> | 2023-05-11 21:44:17 +0100 |
commit | 027630ddd42e5ab4f4f5a221f38a3fd5bda4e3d4 (patch) | |
tree | 88ed972824502635c4c77cdfd1b5429f1d6fab0c /deps/xdiff/xemit.c | |
parent | a821455ee430d28d0032b91ba89b414b4b724464 (diff) | |
download | libgit2-ethomson/xdiff.tar.gz |
xdiff: update to xdiff from git 2.40.1ethomson/xdiff
Diffstat (limited to 'deps/xdiff/xemit.c')
-rw-r--r-- | deps/xdiff/xemit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/deps/xdiff/xemit.c b/deps/xdiff/xemit.c index 1cbf2b982..75f0fe498 100644 --- a/deps/xdiff/xemit.c +++ b/deps/xdiff/xemit.c @@ -65,7 +65,7 @@ xdchange_t *xdl_get_hunk(xdchange_t **xscr, xdemitconf_t const *xecfg) *xscr = xch; } - if (*xscr == NULL) + if (!*xscr) return NULL; lxch = *xscr; @@ -95,7 +95,7 @@ xdchange_t *xdl_get_hunk(xdchange_t **xscr, xdemitconf_t const *xecfg) } -static long def_ff(const char *rec, long len, char *buf, long sz, void *priv) +static long def_ff(const char *rec, long len, char *buf, long sz) { if (len > 0 && (isalpha((unsigned char)*rec) || /* identifier? */ @@ -117,7 +117,7 @@ static long match_func_rec(xdfile_t *xdf, xdemitconf_t const *xecfg, long ri, const char *rec; long len = xdl_get_rec(xdf, ri, &rec); if (!xecfg->find_func) - return def_ff(rec, len, buf, sz, xecfg->find_func_priv); + return def_ff(rec, len, buf, sz); return xecfg->find_func(rec, len, buf, sz, xecfg->find_func_priv); } |