aboutsummaryrefslogtreecommitdiffstats
path: root/util/system/err.cpp
diff options
context:
space:
mode:
authorAnton Samokhvalov <pg83@yandex.ru>2022-02-10 16:45:17 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:45:17 +0300
commitd3a398281c6fd1d3672036cb2d63f842d2cb28c5 (patch)
treedd4bd3ca0f36b817e96812825ffaf10d645803f2 /util/system/err.cpp
parent72cb13b4aff9bc9cf22e49251bc8fd143f82538f (diff)
downloadydb-d3a398281c6fd1d3672036cb2d63f842d2cb28c5.tar.gz
Restoring authorship annotation for Anton Samokhvalov <pg83@yandex.ru>. Commit 2 of 2.
Diffstat (limited to 'util/system/err.cpp')
-rw-r--r--util/system/err.cpp108
1 files changed, 54 insertions, 54 deletions
diff --git a/util/system/err.cpp b/util/system/err.cpp
index 9580d7ad5c..5573ea1ee9 100644
--- a/util/system/err.cpp
+++ b/util/system/err.cpp
@@ -1,79 +1,79 @@
#include "defaults.h"
-#include "progname.h"
-#include "compat.h"
-#include "error.h"
+#include "progname.h"
+#include "compat.h"
+#include "error.h"
-#include <util/generic/scope.h>
+#include <util/generic/scope.h>
-#include <util/stream/printf.h>
-#include <util/stream/output.h>
+#include <util/stream/printf.h>
+#include <util/stream/output.h>
-void vwarnx(const char* fmt, va_list args) {
- Cerr << GetProgramName() << ": ";
+void vwarnx(const char* fmt, va_list args) {
+ Cerr << GetProgramName() << ": ";
- if (fmt) {
- Printf(Cerr, fmt, args);
- }
+ if (fmt) {
+ Printf(Cerr, fmt, args);
+ }
- Cerr << '\n';
-}
+ Cerr << '\n';
+}
+
+void vwarn(const char* fmt, va_list args) {
+ int curErrNo = errno;
+ auto curErrText = LastSystemErrorText();
-void vwarn(const char* fmt, va_list args) {
- int curErrNo = errno;
- auto curErrText = LastSystemErrorText();
+ Y_DEFER {
+ errno = curErrNo;
+ };
- Y_DEFER {
- errno = curErrNo;
- };
+ Cerr << GetProgramName() << ": ";
- Cerr << GetProgramName() << ": ";
+ if (fmt) {
+ Printf(Cerr, fmt, args);
+ Cerr << ": ";
+ }
- if (fmt) {
- Printf(Cerr, fmt, args);
- Cerr << ": ";
- }
-
- Cerr << curErrText << '\n';
+ Cerr << curErrText << '\n';
}
-void warn(const char* fmt, ...) {
- va_list args;
+void warn(const char* fmt, ...) {
+ va_list args;
- va_start(args, fmt);
- vwarn(fmt, args);
- va_end(args);
+ va_start(args, fmt);
+ vwarn(fmt, args);
+ va_end(args);
}
-void warnx(const char* fmt, ...) {
- va_list args;
+void warnx(const char* fmt, ...) {
+ va_list args;
- va_start(args, fmt);
- vwarnx(fmt, args);
- va_end(args);
+ va_start(args, fmt);
+ vwarnx(fmt, args);
+ va_end(args);
}
-void verr(int status, const char* fmt, va_list args) {
- vwarn(fmt, args);
- exit(status);
+void verr(int status, const char* fmt, va_list args) {
+ vwarn(fmt, args);
+ exit(status);
}
-void err(int status, const char* fmt, ...) {
- va_list args;
-
- va_start(args, fmt);
- verr(status, fmt, args);
- va_end(args);
+void err(int status, const char* fmt, ...) {
+ va_list args;
+
+ va_start(args, fmt);
+ verr(status, fmt, args);
+ va_end(args);
}
-void verrx(int status, const char* fmt, va_list args) {
- vwarnx(fmt, args);
- exit(status);
+void verrx(int status, const char* fmt, va_list args) {
+ vwarnx(fmt, args);
+ exit(status);
}
-void errx(int status, const char* fmt, ...) {
- va_list args;
-
- va_start(args, fmt);
- verrx(status, fmt, args);
- va_end(args);
+void errx(int status, const char* fmt, ...) {
+ va_list args;
+
+ va_start(args, fmt);
+ verrx(status, fmt, args);
+ va_end(args);
}