summaryrefslogtreecommitdiff
path: root/refs.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-01-13 01:59:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-01-13 18:05:48 (GMT)
commit8c53f0719b04e0b6328c2e175e3c5d2dc8a0c282 (patch)
tree85489f2b619c708e7583929d30991ac6d336532f /refs.c
parenteaa541eb59aefa2c5e9e160c36a259d372c25711 (diff)
downloadgit-8c53f0719b04e0b6328c2e175e3c5d2dc8a0c282.zip
git-8c53f0719b04e0b6328c2e175e3c5d2dc8a0c282.tar.gz
git-8c53f0719b04e0b6328c2e175e3c5d2dc8a0c282.tar.bz2
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 'refs.c')
-rw-r--r--refs.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/refs.c b/refs.c
index ffd45e9..32dce4e 100644
--- a/refs.c
+++ b/refs.c
@@ -1529,8 +1529,7 @@ const char *resolve_ref_unsafe(const char *refname, unsigned char *sha1, int rea
char *resolve_refdup(const char *ref, unsigned char *sha1, int reading, int *flag)
{
- const char *ret = resolve_ref_unsafe(ref, sha1, reading, flag);
- return ret ? xstrdup(ret) : NULL;
+ return xstrdup_or_null(resolve_ref_unsafe(ref, sha1, reading, flag));
}
/* The argument to filter_refs */