summaryrefslogtreecommitdiff
path: root/apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-05-02 10:06:00 -0700
committerJunio C Hamano <gitster@pobox.com>2022-05-02 10:06:04 -0700
commit2b0a58d164b0642be3eeb476fecd28114445cdd5 (patch)
tree2759549fcdd5d3ce4c9776f67937b4b75c07070f /apply.c
parentd516b2db0af2221bd6b13e7347abdcb5830b2829 (diff)
parentafe8a9070bc62db9cfde1e30147178c40d391d93 (diff)
downloadgit-2b0a58d164b0642be3eeb476fecd28114445cdd5.tar.gz
Merge branch 'ep/maint-equals-null-cocci' for maint-2.35
* ep/maint-equals-null-cocci: tree-wide: apply equals-null.cocci contrib/coccinnelle: add equals-null.cocci
Diffstat (limited to 'apply.c')
-rw-r--r--apply.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apply.c b/apply.c
index 7ffadc3b17..267126132d 100644
--- a/apply.c
+++ b/apply.c
@@ -3267,11 +3267,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;
@@ -3311,7 +3311,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;
}