summaryrefslogtreecommitdiff
path: root/http.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2017-09-21 06:23:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-09-22 03:49:55 (GMT)
commitd0e9983980a25e0c398cc03342e5ad22ef85b8a8 (patch)
tree24205669b7ed2d0d34b20e28c4d06e3d93a773fa /http.c
parent8968b7b0a8bf265a6018682a854002421c2ea84c (diff)
downloadgit-d0e9983980a25e0c398cc03342e5ad22ef85b8a8.zip
git-d0e9983980a25e0c398cc03342e5ad22ef85b8a8.tar.gz
git-d0e9983980a25e0c398cc03342e5ad22ef85b8a8.tar.bz2
curl_trace(): eliminate switch fallthrough
Our trace handler is called by curl with a curl_infotype variable to interpret its data field. For most types we print the data and then break out of the switch. But for CURLINFO_TEXT, we print data and then fall through to the "default" case, which does the exact same thing (nothing!) that breaking out of the switch would. This is probably a leftover from an early iteration of the patch where the code after the switch _did_ do something interesting that was unique to the non-text case arms. But in its current form, this fallthrough is merely confusing (and causes gcc's -Wimplicit-fallthrough to complain). Let's make CURLINFO_TEXT like the other case arms, and push the default arm to the end where it's more obviously a catch-all. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'http.c')
-rw-r--r--http.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/http.c b/http.c
index 9e40a46..713525f 100644
--- a/http.c
+++ b/http.c
@@ -638,9 +638,7 @@ static int curl_trace(CURL *handle, curl_infotype type, char *data, size_t size,
switch (type) {
case CURLINFO_TEXT:
trace_printf_key(&trace_curl, "== Info: %s", data);
- default: /* we ignore unknown types by default */
- return 0;
-
+ break;
case CURLINFO_HEADER_OUT:
text = "=> Send header";
curl_dump_header(text, (unsigned char *)data, size, DO_FILTER);
@@ -665,6 +663,9 @@ static int curl_trace(CURL *handle, curl_infotype type, char *data, size_t size,
text = "<= Recv SSL data";
curl_dump_data(text, (unsigned char *)data, size);
break;
+
+ default: /* we ignore unknown types by default */
+ return 0;
}
return 0;
}