diff options
author | Sergey Vojtovich <svoj@mariadb.org> | 2016-04-20 18:20:31 +0400 |
---|---|---|
committer | Sergey Vojtovich <svoj@mariadb.org> | 2016-04-20 18:20:31 +0400 |
commit | 072ca71d26487817d025ee97955e6360c3c5c086 (patch) | |
tree | fbf90bde96cca7b2270317b7c7086b50c979b526 /storage/spider | |
parent | f8adeccd78bff80725a95b73447e34a5f4528179 (diff) | |
download | mariadb-git-072ca71d26487817d025ee97955e6360c3c5c086.tar.gz |
MDEV-9281 - Debian: the Lintian complains about "shlib-calls-exit" in handlersocket.so
MDEV-9278 - Debian: the Lintian complains about "shlib-calls-exit" in ha_spider.so
Handlersocket handles errors in a way that it aborts program execution. In most
cases it is done via abort(). One exception was host/service resolution failure,
which was aborted with exit().
As a workaround replaced this exit() with abort() for symmetry with other error
handling.
Diffstat (limited to 'storage/spider')
-rw-r--r-- | storage/spider/hs_client/fatal.cpp | 20 | ||||
-rw-r--r-- | storage/spider/hs_client/fatal.hpp | 2 | ||||
-rw-r--r-- | storage/spider/hs_client/socket.cpp | 2 |
3 files changed, 1 insertions, 23 deletions
diff --git a/storage/spider/hs_client/fatal.cpp b/storage/spider/hs_client/fatal.cpp index bec031153e4..260a2e75372 100644 --- a/storage/spider/hs_client/fatal.cpp +++ b/storage/spider/hs_client/fatal.cpp @@ -26,26 +26,6 @@ const int opt_syslog = LOG_ERR | LOG_PID | LOG_CONS; */ void -fatal_exit(const String& message) -{ - fprintf(stderr, "FATAL_EXIT: %s\n", message.ptr()); -/* - syslog(opt_syslog, "FATAL_EXIT: %s", message.ptr()); -*/ - _exit(1); -} - -void -fatal_exit(const char *message) -{ - fprintf(stderr, "FATAL_EXIT: %s\n", message); -/* - syslog(opt_syslog, "FATAL_EXIT: %s", message); -*/ - _exit(1); -} - -void fatal_abort(const String& message) { fprintf(stderr, "FATAL_COREDUMP: %s\n", message.ptr()); diff --git a/storage/spider/hs_client/fatal.hpp b/storage/spider/hs_client/fatal.hpp index a75c56bddad..e1190ae49c1 100644 --- a/storage/spider/hs_client/fatal.hpp +++ b/storage/spider/hs_client/fatal.hpp @@ -22,8 +22,6 @@ namespace dena { -void fatal_exit(const String& message); -void fatal_exit(const char *message); void fatal_abort(const String& message); void fatal_abort(const char *message); diff --git a/storage/spider/hs_client/socket.cpp b/storage/spider/hs_client/socket.cpp index 2082d1f024e..c61b39d140f 100644 --- a/storage/spider/hs_client/socket.cpp +++ b/storage/spider/hs_client/socket.cpp @@ -67,7 +67,7 @@ socket_args::set(const config& conf) message.append(node); message.q_append(":", sizeof(":") - 1); message.append(port); - fatal_exit(message); + fatal_abort(message); } } } |