summaryrefslogtreecommitdiff
path: root/grep.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 /grep.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 'grep.c')
-rw-r--r--grep.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/grep.c b/grep.c
index 99217dc04f..f48a648a0d 100644
--- a/grep.c
+++ b/grep.c
@@ -1646,8 +1646,8 @@ void grep_source_init(struct grep_source *gs, enum grep_source_type type,
const void *identifier)
{
gs->type = type;
- gs->name = name ? xstrdup(name) : NULL;
- gs->path = path ? xstrdup(path) : NULL;
+ gs->name = xstrdup_or_null(name);
+ gs->path = xstrdup_or_null(path);
gs->buf = NULL;
gs->size = 0;
gs->driver = NULL;