diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-05-21 01:26:59 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-05-21 01:26:59 +0300 |
| commit | 538dc459a0331c48b893c9f6ca0be5917860bb99 (patch) | |
| tree | d8b7cf10c62573f767116c14f7ffd0d9e1d8ec32 /xdiff | |
| parent | acdeb10f91da939135fbacb847792ae237450d7d (diff) | |
| parent | 72a4ea71e5f29e4078363e87e4471128ff713a62 (diff) | |
Merge branch 'ep/maint-equals-null-cocci'
Introduce and apply coccinelle rule to discourage an explicit
comparison between a pointer and NULL, and applies the clean-up to
the maintenance track.
* ep/maint-equals-null-cocci:
tree-wide: apply equals-null.cocci
tree-wide: apply equals-null.cocci
contrib/coccinnelle: add equals-null.cocci
Diffstat (limited to 'xdiff')
| -rw-r--r-- | xdiff/xemit.c | 2 | ||||
| -rw-r--r-- | xdiff/xprepare.c | 2 | ||||
| -rw-r--r-- | xdiff/xutils.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/xdiff/xemit.c b/xdiff/xemit.c index 1cbf2b9829..c4ccd68d47 100644 --- a/xdiff/xemit.c +++ b/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; diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c index 4527a4a07c..105752758f 100644 --- a/xdiff/xprepare.c +++ b/xdiff/xprepare.c @@ -188,7 +188,7 @@ static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_ memset(rhash, 0, hsize * sizeof(xrecord_t *)); nrec = 0; - if ((cur = blk = xdl_mmfile_first(mf, &bsize)) != NULL) { + if ((cur = blk = xdl_mmfile_first(mf, &bsize))) { for (top = blk + bsize; cur < top; ) { prev = cur; hav = xdl_hash_record(&cur, top, xpp->flags); diff --git a/xdiff/xutils.c b/xdiff/xutils.c index cfa6e2220f..115b2b1640 100644 --- a/xdiff/xutils.c +++ b/xdiff/xutils.c @@ -122,7 +122,7 @@ long xdl_guess_lines(mmfile_t *mf, long sample) { long nl = 0, size, tsize = 0; char const *data, *cur, *top; - if ((cur = data = xdl_mmfile_first(mf, &size)) != NULL) { + if ((cur = data = xdl_mmfile_first(mf, &size))) { for (top = data + size; nl < sample && cur < top; ) { nl++; if (!(cur = memchr(cur, '\n', top - cur))) |