aboutsummaryrefslogtreecommitdiffstats
path: root/util/system/error.cpp
diff options
context:
space:
mode:
authorAlexander Smirnov <alex@ydb.tech>2024-11-20 11:14:58 +0000
committerAlexander Smirnov <alex@ydb.tech>2024-11-20 11:14:58 +0000
commit31773f157bf8164364649b5f470f52dece0a4317 (patch)
tree33d0f7eef45303ab68cf08ab381ce5e5e36c5240 /util/system/error.cpp
parent2c7938962d8689e175574fc1e817c05049f27905 (diff)
parenteff600952d5dfe17942f38f510a8ac2b203bb3a5 (diff)
downloadydb-31773f157bf8164364649b5f470f52dece0a4317.tar.gz
Merge branch 'rightlib' into mergelibs-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;
}