From 72a4ea71e5f29e4078363e87e4471128ff713a62 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 2 May 2022 10:09:21 -0700 Subject: [PATCH] tree-wide: apply equals-null.cocci Signed-off-by: Junio C Hamano --- reftable/stack_test.c | 2 +- reftable/tree.c | 4 ++-- reftable/writer.c | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/reftable/stack_test.c b/reftable/stack_test.c index f4c743db80..e2c7014303 100644 --- a/reftable/stack_test.c +++ b/reftable/stack_test.c @@ -35,7 +35,7 @@ static int count_dir_entries(const char *dirname) DIR *dir = opendir(dirname); int len = 0; struct dirent *d; - if (dir == NULL) + if (!dir) return 0; while ((d = readdir(dir))) { diff --git a/reftable/tree.c b/reftable/tree.c index 82db7995dd..b8899e060a 100644 --- a/reftable/tree.c +++ b/reftable/tree.c @@ -16,7 +16,7 @@ struct tree_node *tree_search(void *key, struct tree_node **rootp, int insert) { int res; - if (*rootp == NULL) { + if (!*rootp) { if (!insert) { return NULL; } else { @@ -50,7 +50,7 @@ void infix_walk(struct tree_node *t, void (*action)(void *arg, void *key), void tree_free(struct tree_node *t) { - if (t == NULL) { + if (!t) { return; } if (t->left) { diff --git a/reftable/writer.c b/reftable/writer.c index 35c8649c9b..ea483955e8 100644 --- a/reftable/writer.c +++ b/reftable/writer.c @@ -181,7 +181,7 @@ static void writer_index_hash(struct reftable_writer *w, struct strbuf *hash) struct tree_node *node = tree_search(&want, &w->obj_index_tree, &obj_index_tree_node_compare, 0); struct obj_index_tree_node *key = NULL; - if (node == NULL) { + if (!node) { struct obj_index_tree_node empty = OBJ_INDEX_TREE_NODE_INIT; key = reftable_malloc(sizeof(struct obj_index_tree_node)); *key = empty; @@ -220,7 +220,7 @@ static int writer_add_record(struct reftable_writer *w, strbuf_reset(&w->last_key); strbuf_addbuf(&w->last_key, &key); - if (w->block_writer == NULL) { + if (!w->block_writer) { writer_reinit_block_writer(w, reftable_record_type(rec)); } @@ -258,7 +258,7 @@ int reftable_writer_add_ref(struct reftable_writer *w, struct reftable_ref_record copy = *ref; int err = 0; - if (ref->refname == NULL) + if (!ref->refname) return REFTABLE_API_ERROR; if (ref->update_index < w->min_update_index || ref->update_index > w->max_update_index) @@ -329,7 +329,7 @@ int reftable_writer_add_log(struct reftable_writer *w, if (log->value_type == REFTABLE_LOG_DELETION) return reftable_writer_add_log_verbatim(w, log); - if (log->refname == NULL) + if (!log->refname) return REFTABLE_API_ERROR; input_log_message = log->value.update.message; @@ -531,7 +531,7 @@ static int writer_finish_public_section(struct reftable_writer *w) uint8_t typ = 0; int err = 0; - if (w->block_writer == NULL) + if (!w->block_writer) return 0; typ = block_writer_type(w->block_writer); @@ -680,7 +680,7 @@ static int writer_flush_nonempty_block(struct reftable_writer *w) static int writer_flush_block(struct reftable_writer *w) { - if (w->block_writer == NULL) + if (!w->block_writer) return 0; if (w->block_writer->entries == 0) return 0;