[PATCH v3 19/22] transport_anonymize_url: use xstrfmt
- From
Jeff King <peff@peff.net>
- Date
- Feb 22, 2016, 22:45 UTC
- Message-ID
- <20160222224504.GS10075@sigill.intra.peff.net>
- In-Reply-To
- <20160222224059.GA3857@sigill.intra.peff.net>
This function uses xcalloc and two memcpy calls to concatenate two strings. We can do this as an xstrfmt one-liner, and then it is more clear that we are allocating the correct amount of memory.
Signed-off-by: Jeff King <peff@peff.net> --- transport.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/transport.c b/transport.c index 3b4e644..ac857a9 100644 --- a/transport.c +++ b/transport.c @@ -1021,7 +1021,7 @@ int transport_disconnect(struct transport *transport) */ char *transport_anonymize_url(const char *url) { - char *anon_url, *scheme_prefix, *anon_part; + char *scheme_prefix, *anon_part; size_t anon_len, prefix_len = 0; anon_part = strchr(url, '@'); @@ -1055,10 +1055,8 @@ char *transport_anonymize_url(const char *url) goto literal_copy; prefix_len = scheme_prefix - url + 3; } - anon_url = xcalloc(1, 1 + prefix_len + anon_len); - memcpy(anon_url, url, prefix_len); - memcpy(anon_url + prefix_len, anon_part, anon_len); - return anon_url; + return xstrfmt("%.*s%.*s", (int)prefix_len, url, + (int)anon_len, anon_part); literal_copy: return xstrdup(url); }
-- 2.7.2.645.g4e1306c