summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2019-01-25 09:06:27 +0000
committerGitHub <noreply@github.com>2019-01-25 09:06:27 +0000
commit5524a4675868bea91c9525497d7b8a3f044c05f1 (patch)
tree6294db635e8e16e8629b8679feec7b0c27615049
parent80be19b90e4d5654e2bb347247270d210a6215e6 (diff)
parentbff7aed23bb6c40ff0c3aa5e4f115c78b9405126 (diff)
downloadlibgit2-5524a4675868bea91c9525497d7b8a3f044c05f1.tar.gz
Merge pull request #4957 from csware/deprecated
Don't use deprecated constants
-rw-r--r--src/streams/socket.c2
-rw-r--r--src/transports/winhttp.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/streams/socket.c b/src/streams/socket.c
index cfd183a45..1c48a0ea8 100644
--- a/src/streams/socket.c
+++ b/src/streams/socket.c
@@ -38,7 +38,7 @@ static void net_set_error(const char *str)
git_error_set(GIT_ERROR_NET, "%s: %s", str, win32_error);
git__free(win32_error);
} else {
- git_error_set(GITERR_NET, "%s", str);
+ git_error_set(GIT_ERROR_NET, "%s", str);
}
}
#else
diff --git a/src/transports/winhttp.c b/src/transports/winhttp.c
index d87823298..f922cb480 100644
--- a/src/transports/winhttp.c
+++ b/src/transports/winhttp.c
@@ -719,7 +719,7 @@ static void CALLBACK winhttp_status(
else if ((status & WINHTTP_CALLBACK_STATUS_FLAG_SECURITY_CHANNEL_ERROR))
git_error_set(GIT_ERROR_NET, "security libraries could not be loaded");
else
- git_error_set(GITERR_NET, "unknown security error %lu", status);
+ git_error_set(GIT_ERROR_NET, "unknown security error %lu", status);
}
static int winhttp_connect(
@@ -1142,7 +1142,7 @@ replay:
}
if (HTTP_STATUS_OK != status_code) {
- git_error_set(GITERR_NET, "request failed with status code: %lu", status_code);
+ git_error_set(GIT_ERROR_NET, "request failed with status code: %lu", status_code);
return -1;
}