aboutsummaryrefslogtreecommitdiffstats
path: root/util/system/error.cpp
diff options
context:
space:
mode:
authorMaxim Yurchuk <maxim-yurchuk@ydb.tech>2024-11-20 17:37:57 +0000
committerGitHub <noreply@github.com>2024-11-20 17:37:57 +0000
commitf76323e9b295c15751e51e3443aa47a36bee8023 (patch)
tree4113c8cad473a33e0f746966e0cf087252fa1d7a /util/system/error.cpp
parent753ecb8d410a4cb459c26f3a0082fb2d1724fe63 (diff)
parenta7b9a6afea2a9d7a7bfac4c5eb4c1a8e60adb9e6 (diff)
downloadydb-f76323e9b295c15751e51e3443aa47a36bee8023.tar.gz
Merge pull request #11788 from ydb-platform/mergelibs-241120-1113
Library import 241120-1113
Diffstat (limited to 'util/system/error.cpp')
-rw-r--r--util/system/error.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/util/system/error.cpp b/util/system/error.cpp
index 164921af9e..52b1bbb104 100644
--- a/util/system/error.cpp
+++ b/util/system/error.cpp
@@ -24,13 +24,15 @@ int LastSystemError() {
#if defined(_win_)
int ret = GetLastError();
- if (ret)
+ if (ret) {
return ret;
+ }
ret = WSAGetLastError();
- if (ret)
+ if (ret) {
return ret;
+ }
// when descriptors number are over maximum, errno set in this variable
ret = *(_errno());
return ret;
@@ -68,8 +70,9 @@ static char* Strip(char* s) {
size_t len = strlen(s);
const char* ptr = s;
Strip(ptr, len);
- if (ptr != s)
+ if (ptr != s) {
memmove(s, ptr, len);
+ }
s[len] = 0;
return s;
}