summaryrefslogtreecommitdiff
path: root/notes.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-01-12 20:59:09 -0500
committerJunio C Hamano <gitster@pobox.com>2015-01-13 10:05:48 -0800
commit8c53f0719b04e0b6328c2e175e3c5d2dc8a0c282 (patch)
tree85489f2b619c708e7583929d30991ac6d336532f /notes.c
parenteaa541eb59aefa2c5e9e160c36a259d372c25711 (diff)
downloadgit-8c53f0719b04e0b6328c2e175e3c5d2dc8a0c282.tar.gz
use xstrdup_or_null to replace ternary conditionals
This replaces "x ? xstrdup(x) : NULL" with xstrdup_or_null(x). The change is fairly mechanical, with the exception of resolve_refdup, which can eliminate a temporary variable. There are still a few hits grepping for "?.*xstrdup", but these are of slightly different forms and cannot be converted (e.g., "x ? xstrdup(x->foo) : NULL"). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'notes.c')
-rw-r--r--notes.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/notes.c b/notes.c
index 5fe691dbcd..ee5f0e71f3 100644
--- a/notes.c
+++ b/notes.c
@@ -1006,7 +1006,7 @@ void init_notes(struct notes_tree *t, const char *notes_ref,
t->root = (struct int_node *) xcalloc(1, sizeof(struct int_node));
t->first_non_note = NULL;
t->prev_non_note = NULL;
- t->ref = notes_ref ? xstrdup(notes_ref) : NULL;
+ t->ref = xstrdup_or_null(notes_ref);
t->combine_notes = combine_notes;
t->initialized = 1;
t->dirty = 0;