diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-05-20 15:26:59 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-05-20 15:26:59 -0700 |
commit | 538dc459a0331c48b893c9f6ca0be5917860bb99 (patch) | |
tree | d8b7cf10c62573f767116c14f7ffd0d9e1d8ec32 /apply.c | |
parent | acdeb10f91da939135fbacb847792ae237450d7d (diff) | |
parent | 72a4ea71e5f29e4078363e87e4471128ff713a62 (diff) | |
download | git-538dc459a0331c48b893c9f6ca0be5917860bb99.tar.gz |
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 'apply.c')
-rw-r--r-- | apply.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -3274,11 +3274,11 @@ static struct patch *in_fn_table(struct apply_state *state, const char *name) { struct string_list_item *item; - if (name == NULL) + if (!name) return NULL; item = string_list_lookup(&state->fn_table, name); - if (item != NULL) + if (item) return (struct patch *)item->util; return NULL; @@ -3318,7 +3318,7 @@ static void add_to_fn_table(struct apply_state *state, struct patch *patch) * This should cover the cases for normal diffs, * file creations and copies */ - if (patch->new_name != NULL) { + if (patch->new_name) { item = string_list_insert(&state->fn_table, patch->new_name); item->util = patch; } |