summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Hattendorf <ianh@axosoft.com>2020-02-06 09:22:46 -0700
committerIan Hattendorf <ianh@axosoft.com>2020-02-06 09:22:46 -0700
commit1697e90f90162a41e2c98cb7354fc69b0b7ec630 (patch)
tree18997f66d9bdaba54c0a58a817bef82617db3ce5
parent5b2cd75587826148c2c2d189371fe49847f06ec9 (diff)
downloadlibgit2-1697e90f90162a41e2c98cb7354fc69b0b7ec630.tar.gz
winhttp: variable and switch case scoping
-rw-r--r--src/transports/winhttp.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/transports/winhttp.c b/src/transports/winhttp.c
index 9d3f05d0b..98e80ab7e 100644
--- a/src/transports/winhttp.c
+++ b/src/transports/winhttp.c
@@ -864,31 +864,28 @@ static int do_send_request(winhttp_stream *s, size_t len, bool chunked)
static int send_request(winhttp_stream *s, size_t len, bool chunked)
{
- int request_failed = 1, cert_valid, client_cert_requested, error, attempts = 0;
+ int request_failed = 1, error, attempts = 0;
DWORD ignore_flags, send_request_error;
git_error_clear();
while (request_failed && attempts++ < 3) {
+ int cert_valid = 1;
+ int client_cert_requested = 0;
request_failed = 0;
- cert_valid = 1;
- client_cert_requested = 0;
if ((error = do_send_request(s, len, chunked)) < 0) {
send_request_error = GetLastError();
request_failed = 1;
switch (send_request_error) {
- case ERROR_WINHTTP_SECURE_FAILURE: {
+ case ERROR_WINHTTP_SECURE_FAILURE:
cert_valid = 0;
break;
- }
- case ERROR_WINHTTP_CLIENT_AUTH_CERT_NEEDED: {
+ case ERROR_WINHTTP_CLIENT_AUTH_CERT_NEEDED:
client_cert_requested = 1;
break;
- }
- default: {
+ default:
git_error_set(GIT_ERROR_OS, "failed to send request");
return -1;
- }
}
}